Bumbed stubs to latest Phalcon

src/Phalcon/Acl/Adapter/AbstractAdapter.php

@@ -15,7 +15,7 @@
 /**
  * Adapter for Phalcon\Acl adapters
  */
-abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
+abstract class AbstractAdapter implements \Phalcon\Acl\Adapter\AdapterInterface, \Phalcon\Events\EventsAwareInterface
 {
     /**
      * Active access which the list is checking if some role can access it
@@ -121,10 +121,10 @@ public function setDefaultAction(int $defaultAccess)
     /**
      * Sets the events manager
      *
-     * @param ManagerInterface $eventsManager
+     * @param \Phalcon\Events\ManagerInterface $eventsManager
      * @return void
      */
-    public function setEventsManager(ManagerInterface $eventsManager)
+    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager)
     {
     }
 }

src/Phalcon/Acl/Adapter/AdapterInterface.php

@@ -130,14 +130,14 @@ public function getNoArgumentsDefaultAction(): int;
     /**
      * Return an array with every role registered in the list
      *
-     * @return array|RoleInterface[]
+     * @return array|\Phalcon\Acl\RoleInterface[]
      */
     public function getRoles(): array;
 
     /**
      * Return an array with every component registered in the list
      *
-     * @return array|ComponentInterface[]
+     * @return array|\Phalcon\Acl\ComponentInterface[]
      */
     public function getComponents(): array;
 

src/Phalcon/Acl/Adapter/Memory.php

@@ -83,7 +83,7 @@
  * }
  * ```
  */
-class Memory extends AbstractAdapter
+class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
 {
     /**
      * Access
@@ -371,7 +371,7 @@ public function getNoArgumentsDefaultAction(): int
     /**
      * Return an array with every role registered in the list
      *
-     * @return array|RoleInterface[]
+     * @return array|\Phalcon\Acl\RoleInterface[]
      */
     public function getRoles(): array
     {
@@ -380,7 +380,7 @@ public function getRoles(): array
     /**
      * Return an array with every component registered in the list
      *
-     * @return array|ComponentInterface[]
+     * @return array|\Phalcon\Acl\ComponentInterface[]
      */
     public function getComponents(): array
     {

src/Phalcon/Acl/Component.php

@@ -12,7 +12,7 @@
 /**
  * This class defines component entity and its description
  */
-class Component implements ComponentInterface
+class Component implements \Phalcon\Acl\ComponentInterface
 {
     /**
      * Component description

src/Phalcon/Acl/Role.php

@@ -12,7 +12,7 @@
 /**
  * This class defines role entity and its description
  */
-class Role implements RoleInterface
+class Role implements \Phalcon\Acl\RoleInterface
 {
     /**
      * Role name

src/Phalcon/Annotations/Adapter/AbstractAdapter.php

@@ -18,7 +18,7 @@
 /**
  * This is the base class for Phalcon\Annotations adapters
  */
-abstract class AbstractAdapter implements AdapterInterface
+abstract class AbstractAdapter implements \Phalcon\Annotations\Adapter\AdapterInterface
 {
     /**
      * @var array
@@ -95,9 +95,9 @@ public function getReader(): ReaderInterface
     /**
      * Sets the annotations parser
      *
-     * @param ReaderInterface $reader
+     * @param \Phalcon\Annotations\ReaderInterface $reader
      */
-    public function setReader(ReaderInterface $reader)
+    public function setReader(\Phalcon\Annotations\ReaderInterface $reader)
     {
     }
 }

src/Phalcon/Annotations/Adapter/AdapterInterface.php

@@ -71,7 +71,7 @@ public function getReader(): ReaderInterface;
     /**
      * Sets the annotations parser
      *
-     * @param ReaderInterface $reader
+     * @param \Phalcon\Annotations\ReaderInterface $reader
      */
-    public function setReader(ReaderInterface $reader);
+    public function setReader(\Phalcon\Annotations\ReaderInterface $reader);
 }

src/Phalcon/Annotations/Adapter/Apcu.php

@@ -20,7 +20,7 @@
  * $annotations = new Apcu();
  * ```
  */
-class Apcu extends AbstractAdapter
+class Apcu extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
     /**
      * @var string
@@ -59,10 +59,10 @@ public function read(string $key)
      * Writes parsed annotations to APCu
      *
      * @param string $key
-     * @param Reflection $data
+     * @param \Phalcon\Annotations\Reflection $data
      * @return bool
      */
-    public function write(string $key, Reflection $data): bool
+    public function write(string $key, \Phalcon\Annotations\Reflection $data): bool
     {
     }
 }

src/Phalcon/Annotations/Adapter/Memory.php

@@ -15,7 +15,7 @@
  * Stores the parsed annotations in memory. This adapter is the suitable
  * development/testing
  */
-class Memory extends AbstractAdapter
+class Memory extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
     /**
      * @var mixed
@@ -37,10 +37,10 @@ public function read(string $key)
      * Writes parsed annotations to memory
      *
      * @param string $key
-     * @param Reflection $data
+     * @param \Phalcon\Annotations\Reflection $data
      * @return void
      */
-    public function write(string $key, Reflection $data)
+    public function write(string $key, \Phalcon\Annotations\Reflection $data)
     {
     }
 }

src/Phalcon/Annotations/Adapter/Stream.php

@@ -26,7 +26,7 @@
  * );
  * ```
  */
-class Stream extends AbstractAdapter
+class Stream extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
     /**
      * @var string
@@ -59,10 +59,10 @@ public function read(string $key)
      * Writes parsed annotations to files
      *
      * @param string $key
-     * @param Reflection $data
+     * @param \Phalcon\Annotations\Reflection $data
      * @return void
      */
-    public function write(string $key, Reflection $data)
+    public function write(string $key, \Phalcon\Annotations\Reflection $data)
     {
     }
 }

src/Phalcon/Annotations/AnnotationsFactory.php

@@ -10,7 +10,6 @@
 namespace Phalcon\Annotations;
 
 use Phalcon\Annotations\Adapter\AdapterInterface;
-use Phalcon\Config;
 use Phalcon\Factory\AbstractFactory;
 use Phalcon\Helper\Arr;
 
@@ -30,7 +29,7 @@ public function __construct(array $services = array())
     }
 
     /**
-     * @param array|Config $config = [
+     * @param array|\Phalcon\Config $config = [
      *     'adapter' => 'apcu',
      *     'options' => [
      *         'prefix' => 'phalcon',

src/Phalcon/Annotations/Collection.php

@@ -29,7 +29,7 @@
  * $annotation = $classAnnotations->get("Cacheable");
  * ```
  */
-class Collection implements Iterator, Countable
+class Collection implements \Iterator, \Countable
 {
     /**
      * @var array

src/Phalcon/Annotations/Reader.php

@@ -14,7 +14,7 @@
 /**
  * Parses docblocks returning an array with the found annotations
  */
-class Reader implements ReaderInterface
+class Reader implements \Phalcon\Annotations\ReaderInterface
 {
 
     /**

src/Phalcon/Application/AbstractApplication.php

@@ -17,7 +17,7 @@
 /**
  * Base class for Phalcon\Cli\Console and Phalcon\Mvc\Application.
  */
-abstract class AbstractApplication extends Injectable implements EventsAwareInterface
+abstract class AbstractApplication extends Injectable implements \Phalcon\Events\EventsAwareInterface
 {
     /**
      * @var DiInterface
@@ -43,9 +43,9 @@ abstract class AbstractApplication extends Injectable implements EventsAwareInte
     /**
      * Phalcon\AbstractApplication constructor
      *
-     * @param DiInterface $container
+     * @param \Phalcon\Di\DiInterface $container
      */
-    public function __construct(DiInterface $container = null)
+    public function __construct(\Phalcon\Di\DiInterface $container = null)
     {
     }
 
@@ -125,10 +125,10 @@ public function setDefaultModule(string $defaultModule): AbstractApplication
     /**
      * Sets the events manager
      *
-     * @param ManagerInterface $eventsManager
+     * @param \Phalcon\Events\ManagerInterface $eventsManager
      * @return void
      */
-    public function setEventsManager(ManagerInterface $eventsManager)
+    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager)
     {
     }
 }

src/Phalcon/Assets/Asset.php

@@ -16,7 +16,7 @@
  * $asset = new \Phalcon\Assets\Asset("js", "javascripts/jquery.js");
  * ```
  */
-class Asset implements AssetInterface
+class Asset implements \Phalcon\Assets\AssetInterface
 {
     /**
      * @var array | null

src/Phalcon/Assets/Asset/Css.php

@@ -14,7 +14,7 @@
 /**
  * Represents CSS assets
  */
-class Css extends AssetBase
+class Css extends \Phalcon\Assets\Asset
 {
 
     /**

src/Phalcon/Assets/Asset/Js.php

@@ -14,7 +14,7 @@
 /**
  * Represents Javascript assets
  */
-class Js extends AssetBase
+class Js extends \Phalcon\Assets\Asset
 {
 
     /**

src/Phalcon/Assets/Collection.php

@@ -19,7 +19,7 @@
 /**
  * Represents a collection of assets
  */
-class Collection implements Countable, Iterator
+class Collection implements \Countable, \Iterator
 {
     /**
      * @var array

src/Phalcon/Assets/Filters/Cssmin.php

@@ -15,7 +15,7 @@
  * Minify the css - removes comments removes newlines and line feeds keeping
  * removes last semicolon from last property
  */
-class Cssmin implements FilterInterface
+class Cssmin implements \Phalcon\Assets\FilterInterface
 {
 
     /**

src/Phalcon/Assets/Filters/Jsmin.php

@@ -16,7 +16,7 @@
  * be removed. Tabs will be replaced with spaces. Carriage returns will be
  * replaced with linefeeds. Most spaces and linefeeds will be removed.
  */
-class Jsmin implements FilterInterface
+class Jsmin implements \Phalcon\Assets\FilterInterface
 {
 
     /**

src/Phalcon/Assets/Filters/None.php

@@ -14,7 +14,7 @@
 /**
  * Returns the content without make any modification to the original source
  */
-class None implements FilterInterface
+class None implements \Phalcon\Assets\FilterInterface
 {
 
     /**

src/Phalcon/Assets/Inline.php

@@ -16,7 +16,7 @@
  * $inline = new \Phalcon\Assets\Inline("js", "alert('hello world');");
  * ```
  */
-class Inline implements AssetInterface
+class Inline implements \Phalcon\Assets\AssetInterface
 {
     /**
      * @var array | null

src/Phalcon/Assets/Inline/Css.php

@@ -14,7 +14,7 @@
 /**
  * Represents an inlined CSS
  */
-class Css extends InlineBase
+class Css extends \Phalcon\Assets\Inline
 {
 
     /**

src/Phalcon/Assets/Inline/Js.php

@@ -14,7 +14,7 @@
 /**
  * Represents an inline JavaScript
  */
-class Js extends InlineBase
+class Js extends \Phalcon\Assets\Inline
 {
 
     /**

src/Phalcon/Cache.php

@@ -9,7 +9,6 @@
  */
 namespace Phalcon;
 
-use DateInterval;
 use Phalcon\Cache\Adapter\AdapterInterface;
 use Phalcon\Cache\Exception\Exception;
 use Phalcon\Cache\Exception\InvalidArgumentException;
@@ -20,7 +19,7 @@
  * This component offers caching capabilities for your application.
  * Phalcon\Cache implements PSR-16.
  */
-class Cache implements CacheInterface
+class Cache implements \Psr\SimpleCache\CacheInterface
 {
     /**
      * The adapter
@@ -44,7 +43,7 @@ public function getAdapter()
      *
      * @param AdapterInterface $adapter The cache adapter
      */
-    public function __construct(AdapterInterface $adapter)
+    public function __construct(\Phalcon\Cache\Adapter\AdapterInterface $adapter)
     {
     }
 
@@ -129,7 +128,7 @@ public function has($key): bool
      *
      * @param string                 $key   The key of the item to store.
      * @param mixed                  $value The value of the item to store. Must be serializable.
-     * @param null|int|DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
+     * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
      *                                      the driver supports TTL then the library may set a default value
      *                                      for it or let the driver take care of that.
      *
@@ -145,7 +144,7 @@ public function set($key, $value, $ttl = null): bool
      * Persists a set of key => value pairs in the cache, with an optional TTL.
      *
      * @param iterable               $values A list of key => value pairs for a multiple-set operation.
-     * @param null|int|DateInterval $ttl    Optional. The TTL value of this item. If no value is sent and
+     * @param null|int|\DateInterval $ttl    Optional. The TTL value of this item. If no value is sent and
      *                                       the driver supports TTL then the library may set a default value
      *                                       for it or let the driver take care of that.
      *

src/Phalcon/Cache/Adapter/Apcu.php

@@ -15,7 +15,7 @@
 /**
  * Apcu adapter
  */
-class Apcu extends StorageApcu implements CacheAdapterInterface
+class Apcu extends \Phalcon\Storage\Adapter\Apcu implements CacheAdapterInterface
 {
 
 }