Merge pull request #31 from ruudboon/4.x

Updated stubs to RC.3

src/Phalcon/acl/adapter/AbstractAdapter.php → src/Phalcon/Acl/Adapter/AbstractAdapter.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl\Adapter;
 
 use Phalcon\Events\ManagerInterface;
@@ -94,7 +101,7 @@ public function getDefaultAction(): int
     /**
      * Returns the internal event manager
      *
-     * @return \Phalcon\Events\ManagerInterface
+     * @return ManagerInterface
      */
     public function getEventsManager(): ManagerInterface
     {
@@ -104,6 +111,7 @@ public function getEventsManager(): ManagerInterface
      * Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY)
      *
      * @param int $defaultAccess
+     * @return void
      */
     public function setDefaultAction(int $defaultAccess)
     {
@@ -113,6 +121,7 @@ public function setDefaultAction(int $defaultAccess)
      * Sets the events manager
      *
      * @param \Phalcon\Events\ManagerInterface $eventsManager
+     * @return void
      */
     public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager)
     {

src/Phalcon/acl/adapter/AdapterInterface.php → src/Phalcon/Acl/Adapter/AdapterInterface.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl\Adapter;
 
 /**
@@ -55,6 +62,7 @@ public function addComponentAccess(string $componentName, $accessList): bool;
      * @param string $componentName
      * @param mixed $access
      * @param mixed $func
+     * @return void
      */
     public function allow(string $roleName, string $componentName, $access, $func = null);
 
@@ -65,6 +73,7 @@ public function allow(string $roleName, string $componentName, $access, $func =
      * @param string $componentName
      * @param mixed $access
      * @param mixed $func
+     * @return void
      */
     public function deny(string $roleName, string $componentName, $access, $func = null);
 
@@ -73,6 +82,7 @@ public function deny(string $roleName, string $componentName, $access, $func = n
      *
      * @param string $componentName
      * @param mixed $accessList
+     * @return void
      */
     public function dropComponentAccess(string $componentName, $accessList);
 
@@ -117,14 +127,14 @@ public function getNoArgumentsDefaultAction(): int;
     /**
      * Return an array with every role registered in the list
      *
-     * @return array|\Phalcon\Acl\RoleInterface[]
+     * @return array
      */
     public function getRoles(): array;
 
     /**
      * Return an array with every component registered in the list
      *
-     * @return array|\Phalcon\Acl\ComponentInterface[]
+     * @return array
      */
     public function getComponents(): array;
 
@@ -159,6 +169,7 @@ public function isRole(string $roleName): bool;
      * Sets the default access level (Phalcon\Ac\Enuml::ALLOW or Phalcon\Acl\Enum::DENY)
      *
      * @param int $defaultAccess
+     * @return void
      */
     public function setDefaultAction(int $defaultAccess);
 
@@ -168,6 +179,7 @@ public function setDefaultAction(int $defaultAccess);
      * accessKey
      *
      * @param int $defaultAccess
+     * @return void
      */
     public function setNoArgumentsDefaultAction(int $defaultAccess);
 }

src/Phalcon/acl/adapter/Memory.php → src/Phalcon/Acl/Adapter/Memory.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl\Adapter;
 
 use Phalcon\Acl\Enum;
@@ -67,7 +74,7 @@
  * }
  * ```
  */
-class Memory extends AbstractAdapter
+class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
 {
     /**
      * Access
@@ -298,6 +305,7 @@ public function addRole($role, $accessInherits = null): bool
      * @param string $componentName
      * @param mixed $access
      * @param mixed $func
+     * @return void
      */
     public function allow(string $roleName, string $componentName, $access, $func = null)
     {
@@ -324,6 +332,7 @@ public function allow(string $roleName, string $componentName, $access, $func =
      * @param string $componentName
      * @param mixed $access
      * @param mixed $func
+     * @return void
      */
     public function deny(string $roleName, string $componentName, $access, $func = null)
     {
@@ -334,6 +343,7 @@ public function deny(string $roleName, string $componentName, $access, $func = n
      *
      * @param string $componentName
      * @param mixed $accessList
+     * @return void
      */
     public function dropComponentAccess(string $componentName, $accessList)
     {
@@ -352,7 +362,7 @@ public function getNoArgumentsDefaultAction(): int
     /**
      * Return an array with every role registered in the list
      *
-     * @return array|\Phalcon\Acl\RoleInterface[]
+     * @return array
      */
     public function getRoles(): array
     {
@@ -361,7 +371,7 @@ public function getRoles(): array
     /**
      * Return an array with every component registered in the list
      *
-     * @return array|\Phalcon\Acl\ComponentInterface[]
+     * @return array
      */
     public function getComponents(): array
     {
@@ -414,6 +424,7 @@ public function isComponent(string $componentName): bool
      * accessKey
      *
      * @param int $defaultAccess
+     * @return void
      */
     public function setNoArgumentsDefaultAction(int $defaultAccess)
     {
@@ -427,6 +438,7 @@ public function setNoArgumentsDefaultAction(int $defaultAccess)
      * @param mixed $access
      * @param mixed $action
      * @param mixed $func
+     * @return void
      */
     private function allowOrDeny(string $roleName, string $componentName, $access, $action, $func = null)
     {

src/Phalcon/acl/Component.php → src/Phalcon/Acl/Component.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl;
 
 /**

src/Phalcon/acl/ComponentAware.php → src/Phalcon/Acl/ComponentAware.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl;
 
 /**

src/Phalcon/acl/ComponentInterface.php → src/Phalcon/Acl/ComponentInterface.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl;
 
 /**

src/Phalcon/Acl/Enum.php

@@ -0,0 +1,22 @@
+<?php
+
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+namespace Phalcon\Acl;
+
+/**
+ * Constants for Phalcon\Acl\Adapter adapters
+ */
+class Enum
+{
+
+    const ALLOW = 1;
+
+
+    const DENY = 0;
+}

src/Phalcon/factory/Exception.php → src/Phalcon/Acl/Exception.php

@@ -1,15 +1,17 @@
 <?php
 
-namespace Phalcon\Factory;
-
-/**
- * This file is part of the Phalcon Framework.
+/* This file is part of the Phalcon Framework.
  *
  * (c) Phalcon Team <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.
  */
+namespace Phalcon\Acl;
+
+/**
+ * Class for exceptions thrown by Phalcon\Acl
+ */
 class Exception extends \Phalcon\Exception
 {
 

src/Phalcon/acl/Role.php → src/Phalcon/Acl/Role.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl;
 
 /**

src/Phalcon/acl/RoleAware.php → src/Phalcon/Acl/RoleAware.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl;
 
 /**

src/Phalcon/acl/RoleInterface.php → src/Phalcon/Acl/RoleInterface.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Acl;
 
 /**

src/Phalcon/annotations/adapter/AbstractAdapter.php → src/Phalcon/Annotations/Adapter/AbstractAdapter.php

@@ -1,5 +1,12 @@
 <?php
 
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 namespace Phalcon\Annotations\Adapter;
 
 use Phalcon\Annotations\Collection;
@@ -27,7 +34,7 @@ abstract class AbstractAdapter implements \Phalcon\Annotations\Adapter\AdapterIn
      * Parses or retrieves all the annotations found in a class
      *
      * @param mixed $className
-     * @return \Phalcon\Annotations\Reflection
+     * @return Reflection
      */
     public function get($className): Reflection
     {
@@ -38,7 +45,7 @@ public function get($className): Reflection
      *
      * @param string $className
      * @param string $methodName
-     * @return \Phalcon\Annotations\Collection
+     * @return Collection
      */
     public function getMethod(string $className, string $methodName): Collection
     {
@@ -59,7 +66,7 @@ public function getMethods(string $className): array
      *
      * @param string $className
      * @param string $propertyName
-     * @return \Phalcon\Annotations\Collection
+     * @return Collection
      */
     public function getProperty(string $className, string $propertyName): Collection
     {
@@ -78,7 +85,7 @@ public function getProperties(string $className): array
     /**
      * Returns the annotation reader
      *
-     * @return \Phalcon\Annotations\ReaderInterface
+     * @return ReaderInterface
      */
     public function getReader(): ReaderInterface
     {