Fixed incomplete tests & added improvement

Author: divineniiquaye

tests/AnnotationLoaderTest.php

@@ -28,6 +28,7 @@
 use PHPUnit\Framework\TestCase;
 use Spiral\Attributes\AnnotationReader;
 use Spiral\Attributes\AttributeReader;
+use Spiral\Attributes\Composite\MergeReader;
 
 /**
  * AnnotationLoaderTest
@@ -36,6 +37,8 @@ class AnnotationLoaderTest extends TestCase
 {
     protected function setUp(): void
     {
+        require_once __DIR__ . '/Fixtures/Annotation/function.php';
+
         // doctrine/annotations ^1.0 compatibility.
         if (\method_exists(AnnotationRegistry::class, 'registerLoader')) {
             AnnotationRegistry::registerLoader('\\class_exists');
@@ -46,18 +49,18 @@ protected function setUp(): void
      * @dataProvider provideAnnotationLoader
      * @runInSeparateProcess
      */
-    public function testAttach($loader): void
+    public function testAnnotationListenerWithResource($loader): void
     {
         $annotation = new AnnotationLoader(new AnnotationReader(), $loader);
         $result     = $names = [];
 
-        $annotation->attachListener(new Fixtures\SampleListener());
-        $annotation->attach(...[
+        $annotation->listener(new Fixtures\SampleListener());
+        $annotation->resource(...[
             __DIR__ . '/Fixtures/Annotation/Valid',
             'non-existing-file.php',
         ]);
 
-        $this->assertCount(1, $founds = \iterator_to_array($annotation->load()));
+        $this->assertCount(1, $founds = $annotation->load());
 
         /** @var Fixtures\SampleCollector $found */
         foreach ($founds as $found) {
@@ -115,23 +118,23 @@ public function testAttach($loader): void
             ['handler' => \ReflectionMethod::class, 'priority' => 323],
             ['handler' => \ReflectionProperty::class, 'priority' => 0],
             ['handler' => \ReflectionProperty::class, 'priority' => 0],
-            ['handler' => Fixtures\Annotation\Valid\SingleClass::class, 'priority' => 0],
+            ['handler' => \ReflectionClass::class, 'priority' => 0],
         ], $result);
     }
 
     /**
      * @dataProvider provideAnnotationLoader
      * @runInSeparateProcess
      */
-    public function testAttachAttribute($loader): void
+    public function testAnnotationLoaderWithAttribute($loader): void
     {
         $annotation = new AnnotationLoader(new AttributeReader(), $loader);
         $result     = [];
 
-        $annotation->attachListener(new Fixtures\SampleListener());
-        $annotation->attach(__DIR__ . '/Fixtures/Annotation/Attribute');
+        $annotation->listener(new Fixtures\SampleListener());
+        $annotation->resource(__DIR__ . '/Fixtures/Annotation/Attribute');
 
-        $this->assertCount(1, $founds = \iterator_to_array($annotation->load()));
+        $this->assertCount(1, $founds = $annotation->load());
 
         /** @var Fixtures\SampleCollector $found */
         foreach ($founds as $found) {
@@ -159,6 +162,33 @@ public function testAttachAttribute($loader): void
         ], $result);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testAnnotationLoaderWithFunction(): void
+    {
+        $annotation = new AnnotationLoader(new MergeReader([new AnnotationReader(), new AttributeReader()]));
+        $result     = $names = [];
+
+        $annotation->listener(new Fixtures\SampleListener());
+        $annotation->resource('Biurad\\Annotations\\Tests\\Fixtures\\Valid\\annotated_function');
+
+        /** @var Fixtures\SampleCollector $found */
+        foreach ($annotation->load() as $found) {
+            $this->assertInstanceOf(Fixtures\SampleCollector::class, $found);
+
+            $collected = $found->getCollected();
+            $collected->ksort();
+
+            foreach ($collected as $name => $sample) {
+                $names[]  = $name;
+                $result[] = $sample;
+            }
+        }
+
+        $this->assertEquals(['attributed_function', 'function_property'], $names);
+    }
+
     public function provideAnnotationLoader(): array
     {
         return [

tests/Fixtures/Annotation/Valid/AbstractClass.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Biurad opensource projects.
+ *
+ * PHP version 7.2 and above required
+ *
+ * @author    Divine Niiquaye Ibok <divineibok@gmail.com>
+ * @copyright 2019 Biurad Group (https://biurad.com/)
+ * @license   https://opensource.org/licenses/BSD-3-Clause License
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Biurad\Annotations\Tests\Fixtures\Annotation\Valid;
+
+abstract class AbstractClass
+{
+    abstract public function method(): void;
+}

tests/Fixtures/Annotation/Valid/EmptyClass.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Biurad opensource projects.
+ *
+ * PHP version 7.2 and above required
+ *
+ * @author    Divine Niiquaye Ibok <divineibok@gmail.com>
+ * @copyright 2019 Biurad Group (https://biurad.com/)
+ * @license   https://opensource.org/licenses/BSD-3-Clause License
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Biurad\Annotations\Tests\Fixtures\Annotation\Valid;
+
+class EmptyClass
+{
+}

tests/Fixtures/Annotation/Valid/NoAnnotationClass.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Biurad opensource projects.
+ *
+ * PHP version 7.2 and above required
+ *
+ * @author    Divine Niiquaye Ibok <divineibok@gmail.com>
+ * @copyright 2019 Biurad Group (https://biurad.com/)
+ * @license   https://opensource.org/licenses/BSD-3-Clause License
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Biurad\Annotations\Tests\Fixtures\Annotation\Valid;
+
+class NoAnnotationClass
+{
+    protected $prop = null;
+
+    public function method(): void
+    {
+    }
+}

tests/Fixtures/Annotation/function.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Biurad opensource projects.
+ *
+ * PHP version 7.2 and above required
+ *
+ * @author    Divine Niiquaye Ibok <divineibok@gmail.com>
+ * @copyright 2019 Biurad Group (https://biurad.com/)
+ * @license   https://opensource.org/licenses/BSD-3-Clause License
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Biurad\Annotations\Tests\Fixtures\Valid;
+
+use Biurad\Annotations\Tests\Fixtures\Sample;
+
+/** @Sample(name="annotated_function") */
+#[Sample(name: 'attributed_function')]
+function annotated_function(
+    #[Sample('function_property', priority: 4)]
+    string $parameter
+): void {
+}

tests/Fixtures/Sample.php

@@ -21,7 +21,7 @@
  *  Annotation class for @Listener().
  *
  * @Annotation
- * @Target({"CLASS", "METHOD", "PROPERTY"})
+ * @Target({"CLASS", "METHOD", "FUNCTION", "PROPERTY"})
  */
 
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS_CONSTANT | \Attribute::TARGET_PARAMETER)]