feature(attributes): added attributes support for models and controllers.

Author: noone-silent

.gitignore

@@ -1,9 +1,10 @@
-.env
-.php_cs.cache
-.php-cs-fixer.cache
 .idea/
 .local/
 tests/_output/
 tests/_support/_generated/
 vendor/
 *.sqlite*
+.env
+.php_cs.cache
+.php-cs-fixer.cache
+docker-compose.override.yml

src/Annotations/Adapter/Apcu.php

@@ -13,11 +13,22 @@
 
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Parser\Reflection;
 use Phalcon\Storage\Adapter\Apcu as StorageApcu;
 
 /**
  * Stores the parsed annotations in apcu.
  */
 class Apcu extends StorageApcu implements AdapterInterface
 {
+    /**
+     * @param string     $key
+     * @param mixed|null $defaultValue
+     *
+     * @return Reflection|mixed
+     */
+    public function get(string $key, mixed $defaultValue = null): mixed
+    {
+        return parent::get($key, $defaultValue);
+    }
 }

src/Annotations/Adapter/Libmemcached.php

@@ -13,6 +13,7 @@
 
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Parser\Reflection;
 use Phalcon\Storage\Adapter\Libmemcached as StorageLibmemcached;
 
 /**
@@ -21,4 +22,14 @@
  */
 class Libmemcached extends StorageLibmemcached implements AdapterInterface
 {
+    /**
+     * @param string     $key
+     * @param mixed|null $defaultValue
+     *
+     * @return Reflection|mixed
+     */
+    public function get(string $key, mixed $defaultValue = null): mixed
+    {
+        return parent::get($key, $defaultValue);
+    }
 }

src/Annotations/Adapter/Memory.php

@@ -13,6 +13,7 @@
 
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Parser\Reflection;
 use Phalcon\Storage\Adapter\Memory as StorageMemory;
 
 /**
@@ -21,4 +22,14 @@
  */
 class Memory extends StorageMemory implements AdapterInterface
 {
+    /**
+     * @param string     $key
+     * @param mixed|null $defaultValue
+     *
+     * @return Reflection|mixed
+     */
+    public function get(string $key, mixed $defaultValue = null): mixed
+    {
+        return parent::get($key, $defaultValue);
+    }
 }

src/Annotations/Adapter/Redis.php

@@ -13,11 +13,22 @@
 
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Parser\Reflection;
 use Phalcon\Storage\Adapter\Redis as StorageRedis;
 
 /**
  * Stores the parsed annotations in redis.
  */
 class Redis extends StorageRedis implements AdapterInterface
 {
+    /**
+     * @param string     $key
+     * @param mixed|null $defaultValue
+     *
+     * @return Reflection|mixed
+     */
+    public function get(string $key, mixed $defaultValue = null): mixed
+    {
+        return parent::get($key, $defaultValue);
+    }
 }

src/Annotations/Adapter/Stream.php

@@ -13,6 +13,7 @@
 
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Parser\Reflection;
 use Phalcon\Storage\Adapter\Stream as StorageStream;
 
 /**
@@ -21,4 +22,14 @@
  */
 class Stream extends StorageStream implements AdapterInterface
 {
+    /**
+     * @param string     $key
+     * @param mixed|null $defaultValue
+     *
+     * @return Reflection|mixed
+     */
+    public function get(string $key, mixed $defaultValue = null): mixed
+    {
+        return parent::get($key, $defaultValue);
+    }
 }

src/Annotations/Adapter/Weak.php

@@ -13,6 +13,7 @@
 
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Parser\Reflection;
 use Phalcon\Storage\Adapter\Weak as StorageWeak;
 
 /**
@@ -21,4 +22,14 @@
  */
 class Weak extends StorageWeak implements AdapterInterface
 {
+    /**
+     * @param string     $key
+     * @param mixed|null $defaultValue
+     *
+     * @return Reflection|mixed
+     */
+    public function get(string $key, mixed $defaultValue = null): mixed
+    {
+        return parent::get($key, $defaultValue);
+    }
 }

src/Annotations/Parser/Collection.php

@@ -13,8 +13,10 @@
 
 namespace Phalcon\Annotations\Parser;
 
-use Countable;
-use Iterator;
+use ArrayIterator;
+use Exception;
+use IteratorAggregate;
+use Traversable;
 
 /**
  * Represents a collection of annotations. This class allows to traverse a group
@@ -31,18 +33,15 @@
  *
  * // Get an specific annotation in the collection
  * $annotation = $classAnnotations->get("Cacheable");
+ *
+ * @template TKey of int
+ * @template TValue of Annotation
  *```
  */
-class Collection implements Iterator, Countable
+class Collection implements IteratorAggregate
 {
-    /**
-     * @var array
-     */
     protected array $annotations;
 
-    /**
-     * @var int
-     */
     protected int $position = 0;
 
     /**
@@ -52,32 +51,20 @@ class Collection implements Iterator, Countable
      */
     public function __construct(array $reflectionData = [])
     {
-        $annotations = [];
+        $this->annotations = [];
         foreach ($reflectionData as $annotationData) {
-            $annotations[] = new Annotation($annotationData);
+            $this->annotations[] = new Annotation($annotationData);
         }
-
-        $this->annotations = $annotations;
     }
 
-    /**
-     * Returns the number of annotations in the collection
-     *
-     * @return int
-     */
-    public function count(): int
+    public function getIterator(): Traversable
     {
-        return count($this->annotations);
+        return new ArrayIterator($this->annotations);
     }
 
-    /**
-     * Returns the current annotation in the iterator
-     *
-     * @return mixed
-     */
-    public function current(): mixed
+    public function getAnnotations(): Traversable
     {
-        return $this->annotations[$this->position] ?? false;
+        return new ArrayIterator($this->annotations);
     }
 
     /**
@@ -106,7 +93,7 @@ public function get(string $name): Annotation
      *
      * @param string $name
      *
-     * @return Annotation[]
+     * @return TValue[]
      */
     public function getAll(string $name): array
     {
@@ -120,16 +107,6 @@ public function getAll(string $name): array
         return $found;
     }
 
-    /**
-     * Returns the internal annotations as an array
-     *
-     * @return Annotation[]
-     */
-    public function getAnnotations(): array
-    {
-        return $this->annotations;
-    }
-
     /**
      * Check if an annotation exists in a collection
      *
@@ -147,44 +124,4 @@ public function has(string $name): bool
 
         return false;
     }
-
-    /**
-     * Returns the current position/key in the iterator
-     *
-     * @return int
-     */
-    public function key(): int
-    {
-        return $this->position;
-    }
-
-    /**
-     * Moves the internal iteration pointer to the next position
-     *
-     * @return void
-     */
-    public function next(): void
-    {
-        $this->position++;
-    }
-
-    /**
-     * Rewinds the internal iterator
-     *
-     * @return void
-     */
-    public function rewind(): void
-    {
-        $this->position = 0;
-    }
-
-    /**
-     * Check if the current annotation in the iterator is valid
-     *
-     * @return bool
-     */
-    public function valid(): bool
-    {
-        return isset($this->annotations[$this->position]);
-    }
 }

src/Annotations/Router/Connect.php

@@ -0,0 +1,27 @@
+<?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.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Annotations\Router;
+
+use Attribute;
+use Phalcon\Http\Message\Interfaces\RequestMethodInterface;
+
+#[Attribute(Attribute::TARGET_METHOD)]
+class Connect extends Route
+{
+    public function __construct(...$params)
+    {
+        $params['methods'] = RequestMethodInterface::METHOD_CONNECT;
+        parent::__construct(...$params);
+    }
+}

src/Annotations/Router/Delete.php

@@ -14,13 +14,14 @@
 namespace Phalcon\Annotations\Router;
 
 use Attribute;
+use Phalcon\Http\Message\Interfaces\RequestMethodInterface;
 
 #[Attribute(Attribute::TARGET_METHOD)]
 class Delete extends Route
 {
     public function __construct(...$params)
     {
-        $params['methods'] = 'DELETE';
+        $params['methods'] = RequestMethodInterface::METHOD_DELETE;
         parent::__construct(...$params);
     }
 }