Merge pull request #35 from ruudboon/4.x

Bumbed stubs to latest Phalcon

psalm.xml

@@ -22,7 +22,7 @@
         <ImplementedParamTypeMismatch errorLevel="info" />
         <MismatchingDocblockParamType errorLevel="info" />
         <UndefinedDocblockClass errorLevel="info" />
-        <PropertyNotSetInConstructor errorLevel="info" />
+        <PropertyNotSetInConstructor errorLevel="suppress" />
         <UndefinedClass errorLevel="info" />
         <OverriddenPropertyAccess errorLevel="info" />
         <InvalidPropertyAssignmentValue errorLevel="info" />

src/Phalcon/Acl/Adapter/AbstractAdapter.php

@@ -10,12 +10,11 @@
 namespace Phalcon\Acl\Adapter;
 
 use Phalcon\Events\ManagerInterface;
-use Phalcon\Events\EventsAwareInterface;
 
 /**
  * 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 +120,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

@@ -9,9 +9,6 @@
  */
 namespace Phalcon\Acl\Adapter;
 
-use Phalcon\Acl\ComponentInterface;
-use Phalcon\Acl\RoleInterface;
-
 /**
  * Interface for Phalcon\Acl adapters
  */
@@ -130,14 +127,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

@@ -10,15 +10,6 @@
 namespace Phalcon\Acl\Adapter;
 
 use Phalcon\Acl\Enum;
-use Phalcon\Acl\Role;
-use Phalcon\Acl\RoleInterface;
-use Phalcon\Acl\Component;
-use Phalcon\Acl\Exception;
-use Phalcon\Events\Manager as EventsManager;
-use Phalcon\Acl\RoleAware;
-use Phalcon\Acl\ComponentAware;
-use Phalcon\Acl\ComponentInterface;
-use ReflectionFunction;
 
 /**
  * Manages ACL lists in memory
@@ -83,7 +74,7 @@
  * }
  * ```
  */
-class Memory extends AbstractAdapter
+class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
 {
     /**
      * Access
@@ -371,7 +362,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 +371,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

@@ -9,16 +9,15 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
-use Phalcon\Annotations\Reader;
-use Phalcon\Annotations\Exception;
 use Phalcon\Annotations\Collection;
-use Phalcon\Annotations\Reflection;
+use Phalcon\Annotations\Reader;
 use Phalcon\Annotations\ReaderInterface;
+use Phalcon\Annotations\Reflection;
 
 /**
  * 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 +94,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

@@ -9,9 +9,9 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
-use Phalcon\Annotations\Reflection;
 use Phalcon\Annotations\Collection;
 use Phalcon\Annotations\ReaderInterface;
+use Phalcon\Annotations\Reflection;
 
 /**
  * This interface must be implemented by adapters in Phalcon\Annotations
@@ -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

@@ -9,8 +9,6 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
-use Phalcon\Annotations\Reflection;
-
 /**
  * Stores the parsed annotations in APCu. This adapter is suitable for production
  *
@@ -20,7 +18,7 @@
  * $annotations = new Apcu();
  * ```
  */
-class Apcu extends AbstractAdapter
+class Apcu extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
     /**
      * @var string
@@ -59,10 +57,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

@@ -9,13 +9,11 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
-use Phalcon\Annotations\Reflection;
-
 /**
  * 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 +35,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

@@ -9,10 +9,6 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
-use Phalcon\Annotations\Reflection;
-use Phalcon\Annotations\Exception;
-use RuntimeException;
-
 /**
  * Stores the parsed annotations in files. This adapter is suitable for production
  *
@@ -26,7 +22,7 @@
  * );
  * ```
  */
-class Stream extends AbstractAdapter
+class Stream extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
     /**
      * @var string
@@ -59,10 +55,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,9 +10,7 @@
 namespace Phalcon\Annotations;
 
 use Phalcon\Annotations\Adapter\AdapterInterface;
-use Phalcon\Config;
 use Phalcon\Factory\AbstractFactory;
-use Phalcon\Helper\Arr;
 
 /**
  * Factory to create annotations components
@@ -30,7 +28,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

@@ -9,9 +9,6 @@
  */
 namespace Phalcon\Annotations;
 
-use Countable;
-use Iterator;
-
 /**
  * Represents a collection of annotations. This class allows to traverse a group
  * of annotations easily
@@ -29,7 +26,7 @@
  * $annotation = $classAnnotations->get("Cacheable");
  * ```
  */
-class Collection implements Iterator, Countable
+class Collection implements \Iterator, \Countable
 {
     /**
      * @var array

src/Phalcon/Annotations/Reader.php

@@ -9,12 +9,10 @@
  */
 namespace Phalcon\Annotations;
 
-use ReflectionClass;
-
 /**
  * Parses docblocks returning an array with the found annotations
  */
-class Reader implements ReaderInterface
+class Reader implements \Phalcon\Annotations\ReaderInterface
 {
 
     /**

src/Phalcon/Application/AbstractApplication.php

@@ -11,13 +11,12 @@
 
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\Injectable;
-use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
 
 /**
  * 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 +42,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 +124,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

@@ -9,12 +9,10 @@
  */
 namespace Phalcon\Assets\Asset;
 
-use Phalcon\Assets\Asset as AssetBase;
-
 /**
  * Represents CSS assets
  */
-class Css extends AssetBase
+class Css extends \Phalcon\Assets\Asset
 {
 
     /**

src/Phalcon/Assets/Asset/Js.php

@@ -9,12 +9,10 @@
  */
 namespace Phalcon\Assets\Asset;
 
-use Phalcon\Assets\Asset as AssetBase;
-
 /**
  * Represents Javascript assets
  */
-class Js extends AssetBase
+class Js extends \Phalcon\Assets\Asset
 {
 
     /**