Merge pull request #75 from phalcon/v5.0.0RC1

Update stubs of Phalcon v5.0.0-RC1

.github/workflows/main.yml

@@ -10,10 +10,10 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [7.4, 8.0]
+        php-versions: ["7.4", "8.0", "8.1"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup PHP, with composer and extensions
       uses: shivammathur/setup-php@v2
@@ -24,8 +24,9 @@ jobs:
     - name: Get Composer Cache Directory
       id: composer-cache
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
     - name: Cache dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

src/Acl/Adapter/AbstractAdapter.php

@@ -18,6 +18,7 @@
  */
 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
      *
@@ -93,7 +94,7 @@ public function getDefaultAction(): int
     }
 
     /**
-     * Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY)
+     * Sets the default access level (Phalcon\Acl\Enum::ALLOW or Phalcon\Acl\Enum::DENY)
      *
      * @param int $defaultAccess
      * @return void

src/Acl/Adapter/AdapterInterface.php

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

src/Acl/Adapter/Memory.php

@@ -84,6 +84,7 @@
  */
 class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
 {
+
     /**
      * Access
      *

src/Acl/Component.php

@@ -14,6 +14,7 @@
  */
 class Component implements \Phalcon\Acl\ComponentInterface
 {
+
     /**
      * Component description
      *

src/Acl/ComponentAwareInterface.php

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

src/Acl/ComponentInterface.php

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

src/Acl/Exception.php

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

src/Acl/Role.php

@@ -14,6 +14,7 @@
  */
 class Role implements \Phalcon\Acl\RoleInterface
 {
+
     /**
      * Role name
      *

src/Acl/RoleAwareInterface.php

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

src/Acl/RoleInterface.php

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

src/Annotations/Adapter/AbstractAdapter.php

@@ -20,6 +20,7 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Annotations\Adapter\AdapterInterface
 {
+
     /**
      * @var array
      */
@@ -41,23 +42,23 @@ public function get($className): Reflection
     }
 
     /**
-     * Returns the annotations found in a specific method
+     * Returns the annotations found in a specific constant
      *
      * @param string $className
-     * @param string $methodName
+     * @param string $constantName
      * @return Collection
      */
-    public function getMethod(string $className, string $methodName): Collection
+    public function getConstant(string $className, string $constantName): Collection
     {
     }
 
     /**
-     * Returns the annotations found in all the class' methods
+     * Returns the annotations found in all the class' constants
      *
      * @param string $className
      * @return array
      */
-    public function getMethods(string $className): array
+    public function getConstants(string $className): array
     {
     }
 
@@ -73,7 +74,7 @@ public function getProperty(string $className, string $propertyName): Collection
     }
 
     /**
-     * Returns the annotations found in all the class' methods
+     * Returns the annotations found in all the class' properties
      *
      * @param string $className
      * @return array
@@ -82,6 +83,27 @@ public function getProperties(string $className): array
     {
     }
 
+    /**
+     * Returns the annotations found in a specific method
+     *
+     * @param string $className
+     * @param string $methodName
+     * @return Collection
+     */
+    public function getMethod(string $className, string $methodName): Collection
+    {
+    }
+
+    /**
+     * Returns the annotations found in all the class' methods
+     *
+     * @param string $className
+     * @return array
+     */
+    public function getMethods(string $className): array
+    {
+    }
+
     /**
      * Returns the annotation reader
      *

src/Annotations/Adapter/AdapterInterface.php

@@ -18,6 +18,8 @@
  */
 interface AdapterInterface
 {
+
+
     /**
      * Parses or retrieves all the annotations found in a class
      *
@@ -27,21 +29,21 @@ interface AdapterInterface
     public function get(string $className): Reflection;
 
     /**
-     * Returns the annotations found in a specific method
+     * Returns the annotations found in a specific constant
      *
      * @param string $className
-     * @param string $methodName
+     * @param string $constantName
      * @return Collection
      */
-    public function getMethod(string $className, string $methodName): Collection;
+    public function getConstant(string $className, string $constantName): Collection;
 
     /**
-     * Returns the annotations found in all the class' methods
+     * Returns the annotations found in all the class' constants
      *
      * @param string $className
      * @return array
      */
-    public function getMethods(string $className): array;
+    public function getConstants(string $className): array;
 
     /**
      * Returns the annotations found in a specific property
@@ -60,6 +62,23 @@ public function getProperty(string $className, string $propertyName): Collection
      */
     public function getProperties(string $className): array;
 
+    /**
+     * Returns the annotations found in a specific method
+     *
+     * @param string $className
+     * @param string $methodName
+     * @return Collection
+     */
+    public function getMethod(string $className, string $methodName): Collection;
+
+    /**
+     * Returns the annotations found in all the class' methods
+     *
+     * @param string $className
+     * @return array
+     */
+    public function getMethods(string $className): array;
+
     /**
      * Returns the annotation reader
      *

src/Annotations/Adapter/Apcu.php

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

src/Annotations/Adapter/Memory.php

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

src/Annotations/Adapter/Stream.php

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

src/Annotations/Annotation.php

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

src/Annotations/AnnotationsFactory.php

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

src/Annotations/Collection.php

@@ -31,6 +31,7 @@
  */
 class Collection implements \Iterator, \Countable
 {
+
     /**
      * @var array
      */
@@ -62,7 +63,7 @@ public function count(): int
     /**
      * Returns the current annotation in the iterator
      *
-     * @return bool|Annotation
+     * @return mixed
      */
     public function current()
     {

src/Annotations/Exception.php

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

src/Annotations/Reader.php

@@ -16,6 +16,8 @@
  */
 class Reader implements \Phalcon\Annotations\ReaderInterface
 {
+
+
     /**
      * Reads annotations from the class docblocks, its methods and/or properties
      *

src/Annotations/ReaderInterface.php

@@ -14,8 +14,10 @@
  */
 interface ReaderInterface
 {
+
+
     /**
-     * Reads annotations from the class docblocks, its methods and/or properties
+     * Reads annotations from the class docblocks, its constants, properties and methods
      *
      * @param string $className
      * @return array

src/Annotations/Reflection.php

@@ -29,6 +29,7 @@
  */
 class Reflection
 {
+
     /**
      * @var array
      * TODO: Make always array
@@ -39,14 +40,20 @@ class Reflection
      * @var array
      * TODO: Make always array
      */
-    protected $methodAnnotations;
+    protected $constantAnnotations;
 
     /**
      * @var array
      * TODO: Make always array
      */
     protected $propertyAnnotations;
 
+    /**
+     * @var array
+     * TODO: Make always array
+     */
+    protected $methodAnnotations;
+
     /**
      * @var array
      */
@@ -71,11 +78,11 @@ public function getClassAnnotations()
     }
 
     /**
-     * Returns the annotations found in the methods' docblocks
+     * Returns the annotations found in the constants' docblocks
      *
      * @return array|bool|Collection[]
      */
-    public function getMethodsAnnotations()
+    public function getConstantsAnnotations()
     {
     }
 
@@ -88,6 +95,15 @@ public function getPropertiesAnnotations()
     {
     }
 
+    /**
+     * Returns the annotations found in the methods' docblocks
+     *
+     * @return array|bool|Collection[]
+     */
+    public function getMethodsAnnotations()
+    {
+    }
+
     /**
      * Returns the raw parsing intermediate definitions used to construct the
      * reflection