Merge pull request #78 from niden/master

v5.0.0 stable

src/Acl/Adapter/AbstractAdapter.php

@@ -18,14 +18,6 @@
  */
 abstract class AbstractAdapter extends AbstractEventsAware implements \Phalcon\Acl\Adapter\AdapterInterface, \Phalcon\Events\EventsAwareInterface
 {
-
-    /**
-     * Active access which the list is checking if some role can access it
-     *
-     * @var string|null
-     */
-    protected $activeAccess;
-
     /**
      * Access Granted
      *
@@ -34,19 +26,26 @@ abstract class AbstractAdapter extends AbstractEventsAware implements \Phalcon\A
     protected $accessGranted = false;
 
     /**
-     * Role which the list is checking if it's allowed to certain
-     * component/access
+     * Active access which the list is checking if some role can access it
      *
      * @var string|null
      */
-    protected $activeRole;
+    protected $activeAccess = null;
 
     /**
      * Component which the list is checking if some role can access it
      *
      * @var string|null
      */
-    protected $activeComponent;
+    protected $activeComponent = null;
+
+    /**
+     * Role which the list is checking if it's allowed to certain
+     * component/access
+     *
+     * @var string|null
+     */
+    protected $activeRole = null;
 
     /**
      * Default access
@@ -65,22 +64,21 @@ public function getActiveAccess(): ?string
     }
 
     /**
-     * Role which the list is checking if it's allowed to certain
-     *
-     * component/access
+     * Component which the list is checking if some role can access it
      *
      * @return string|null
      */
-    public function getActiveRole(): ?string
+    public function getActiveComponent(): ?string
     {
     }
 
     /**
-     * Component which the list is checking if some role can access it
+     * Role which the list is checking if it's allowed to certain
+     * component/access
      *
      * @return string|null
      */
-    public function getActiveComponent(): ?string
+    public function getActiveRole(): ?string
     {
     }
 

src/Acl/Adapter/AdapterInterface.php

@@ -17,8 +17,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Do a role inherit from another existing role
      *

src/Acl/Adapter/Memory.php

@@ -84,7 +84,6 @@
  */
 class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
 {
-
     /**
      * Access
      *
@@ -118,7 +117,7 @@ class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
      *
      * @var string|null
      */
-    protected $activeKey;
+    protected $activeKey = null;
 
     /**
      * Components
@@ -162,33 +161,6 @@ class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
      */
     protected $roleInherits;
 
-    /**
-     * Returns latest function used to acquire access
-     *
-     * @return mixed
-     */
-    public function getActiveFunction()
-    {
-    }
-
-    /**
-     * Returns number of additional arguments(excluding role and resource) for active function
-     *
-     * @return int
-     */
-    public function getActiveFunctionCustomArgumentsCount(): int
-    {
-    }
-
-    /**
-     * Returns latest key used to acquire access
-     *
-     * @return string|null
-     */
-    public function getActiveKey(): ?string
-    {
-    }
-
     /**
      * Phalcon\Acl\Adapter\Memory constructor
      */
@@ -350,6 +322,33 @@ public function dropComponentAccess(string $componentName, $accessList): void
     {
     }
 
+    /**
+     * Returns latest function used to acquire access
+     *
+     * @return mixed
+     */
+    public function getActiveFunction()
+    {
+    }
+
+    /**
+     * Returns number of additional arguments(excluding role and resource) for active function
+     *
+     * @return int
+     */
+    public function getActiveFunctionCustomArgumentsCount(): int
+    {
+    }
+
+    /**
+     * Returns latest key used to acquire access
+     *
+     * @return string|null
+     */
+    public function getActiveKey(): ?string
+    {
+    }
+
     /**
      * Return an array with every component registered in the list
      *

src/Acl/Component.php

@@ -14,7 +14,6 @@
  */
 class Component implements \Phalcon\Acl\ComponentInterface
 {
-
     /**
      * Component description
      *
@@ -30,39 +29,33 @@ class Component implements \Phalcon\Acl\ComponentInterface
     private $name;
 
     /**
-     * Component description
+     * Phalcon\Acl\Component constructor
      *
-     * @return string
+     * @param string $name
+     * @param string $description
      */
-    public function getDescription(): string
+    public function __construct(string $name, string $description = null)
     {
     }
 
     /**
-     * Component name
-     *
      * @return string
      */
-    public function getName(): string
+    public function __toString(): string
     {
     }
 
     /**
-     * Component name
-     *
      * @return string
      */
-    public function __toString(): string
+    public function getDescription(): string
     {
     }
 
     /**
-     * Phalcon\Acl\Component constructor
-     *
-     * @param string $name
-     * @param string $description
+     * @return string
      */
-    public function __construct(string $name, string $description = null)
+    public function getName(): string
     {
     }
 }

src/Acl/ComponentAwareInterface.php

@@ -14,8 +14,6 @@
  */
 interface ComponentAwareInterface
 {
-
-
     /**
      * Returns component name
      *

src/Acl/ComponentInterface.php

@@ -14,8 +14,6 @@
  */
 interface ComponentInterface
 {
-
-
     /**
      * Returns component description
      *

src/Acl/Exception.php

@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }

src/Acl/Role.php

@@ -14,55 +14,48 @@
  */
 class Role implements \Phalcon\Acl\RoleInterface
 {
-
     /**
-     * Role name
+     * Role description
      *
      * @var string
      */
-    private $name;
+    private $description;
 
     /**
-     * Role description
+     * Role name
      *
      * @var string
      */
-    private $description;
+    private $name;
 
     /**
-     * Role name
+     * Phalcon\Acl\Role constructor
      *
-     * @return string
+     * @param string $name
+     * @param string $description
      */
-    public function getName(): string
+    public function __construct(string $name, string $description = null)
     {
     }
 
     /**
-     * Role name
-     *
      * @return string
      */
     public function __toString(): string
     {
     }
 
     /**
-     * Role description
-     *
      * @return string
      */
     public function getDescription(): string
     {
     }
 
     /**
-     * Phalcon\Acl\Role constructor
-     *
-     * @param string $name
-     * @param string $description
+     * @return string
      */
-    public function __construct(string $name, string $description = null)
+    public function getName(): string
     {
     }
 }

src/Acl/RoleAwareInterface.php

@@ -14,8 +14,6 @@
  */
 interface RoleAwareInterface
 {
-
-
     /**
      * Returns role name
      *

src/Acl/RoleInterface.php

@@ -14,8 +14,6 @@
  */
 interface RoleInterface
 {
-
-
     /**
      * Returns the role name
      *

src/Annotations/Adapter/AbstractAdapter.php

@@ -20,7 +20,6 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Annotations\Adapter\AdapterInterface
 {
-
     /**
      * @var array
      */

src/Annotations/Adapter/AdapterInterface.php

@@ -18,8 +18,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Parses or retrieves all the annotations found in a class
      *

src/Annotations/Adapter/Apcu.php

@@ -22,7 +22,6 @@
  */
 class Apcu extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
-
     /**
      * @var string
      */

src/Annotations/Adapter/Memory.php

@@ -17,7 +17,6 @@
  */
 class Memory extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
-
     /**
      * @var mixed
      */

src/Annotations/Adapter/Stream.php

@@ -28,7 +28,6 @@
  */
 class Stream extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
-
     /**
      * @var string
      */

src/Annotations/Annotation.php

@@ -14,7 +14,6 @@
  */
 class Annotation
 {
-
     /**
      * Annotation Arguments
      *

src/Annotations/AnnotationsFactory.php

@@ -18,8 +18,6 @@
  */
 class AnnotationsFactory extends AbstractFactory
 {
-
-
     /**
      * AdapterFactory constructor.
      *

src/Annotations/Collection.php

@@ -31,7 +31,6 @@
  */
 class Collection implements \Iterator, \Countable
 {
-
     /**
      * @var array
      */