Merge pull request #1059 from spiral/annotations-require-dev

Remove doctrine/annotations

composer.json

@@ -139,8 +139,7 @@
         "spiral/validator": "^1.3",
         "google/protobuf": "^3.25",
         "symplify/monorepo-builder": "^10.2.7",
-        "vimeo/psalm": "^5.9",
-        "doctrine/annotations": "^1.12 || ^2.0"
+        "vimeo/psalm": "^5.9"
     },
     "autoload-dev": {
         "psr-4": {

src/AnnotatedRoutes/tests/App/Controller/HomeController.php

@@ -8,25 +8,15 @@
 
 class HomeController
 {
-    /**
-     * @Route(route="/", name="index", methods="GET")
-     */
+    #[Route(route: '/', name: 'index', methods: 'GET')]
     public function index(): string
     {
         return 'index';
     }
 
-    /**
-     * @Route(route="/", name="method", methods="POST")
-     */
+    #[Route(route: '/', name: 'method', methods: 'POST')]
     public function method(): string
     {
         return 'method';
     }
-
-    #[Route(route: '/attribute', name: 'attribute', methods: 'GET', group: 'test')]
-    public function attribute(): string
-    {
-        return 'attribute';
-    }
 }

src/AnnotatedRoutes/tests/App/Controller/NamelessRoutesController.php

@@ -8,26 +8,20 @@
 
 class NamelessRoutesController
 {
-    /**
-     * @Route(route="/nameless",  methods="GET")
-     */
-    public function index()
+    #[Route('/nameless', methods: 'GET')]
+    public function index(): string
     {
         return 'index';
     }
 
-    /**
-     * @Route(route="/nameless", methods="POST")
-     */
-    public function method()
+    #[Route(route: '/nameless', methods: 'POST')]
+    public function method(): string
     {
         return 'method';
     }
 
-    /**
-     * @Route(route="/nameless/route", methods={"GET", "POST"})
-     */
-    public function route()
+    #[Route(route: '/nameless/route', methods: ['GET', 'POST'])]
+    public function route(): string
     {
         return 'route';
     }

src/AnnotatedRoutes/tests/App/Controller/PageController.php

@@ -8,18 +8,14 @@
 
 final class PageController
 {
-    /**
-     * @Route("/page/<page>", name="page_get", methods="GET")
-     */
-    public function get($page)
+    #[Route('/page/<page>', name: 'page_get', methods: 'GET')]
+    public function get($page): string
     {
-        return 'page-'.$page;
+        return 'page-' . $page;
     }
 
-    /**
-     * @Route("/page/about", name="page_about", methods="GET", priority=-1)
-     */
-    public function about()
+    #[Route('/page/about', name: 'page_about', methods: 'GET', priority: -1)]
+    public function about(): string
     {
         return 'about';
     }

src/AnnotatedRoutes/tests/IntegrationTest.php

@@ -25,12 +25,6 @@ public function testRoute(): void
         $this->assertStringContainsString('index', $r->getBody()->__toString());
     }
 
-    public function testAttributeRoute(): void
-    {
-        $r = $this->get('/attribute');
-        $this->assertStringContainsString('attribute', $r->getBody()->__toString());
-    }
-
     public function testRoute2(): void
     {
         $r = $this->post('/');

src/Framework/Bootloader/Attributes/AttributesBootloader.php

@@ -39,7 +39,7 @@ public function init(EnvironmentInterface $env): void
             AttributesConfig::CONFIG,
             [
                 'annotations' => [
-                    'support' => $env->get('SUPPORT_ANNOTATIONS', true),
+                    'support' => $env->get('SUPPORT_ANNOTATIONS', false),
                 ],
                 'cache' => [
                     'storage' => $env->get('ATTRIBUTES_CACHE_STORAGE', null),
@@ -76,12 +76,14 @@ private function initReader(
         $supportAnnotations = $config->isAnnotationsReaderEnabled();
 
         if ($supportAnnotations) {
+            /** @psalm-suppress UndefinedClass */
             if (!\interface_exists(DoctrineReaderInterface::class)) {
                 throw new InitializationException(
                     'Doctrine annotations reader is not available, please install "doctrine/annotations" package',
                 );
             }
 
+            /** @psalm-suppress UndefinedClass, InvalidArgument */
             $reader = new SelectiveReader([
                 $reader,
                 new AnnotationReader(new DoctrineAnnotationReader()),

src/Framework/Bootloader/Attributes/AttributesConfig.php

@@ -18,7 +18,7 @@ final class AttributesConfig extends InjectableConfig
      */
     protected array $config = [
         'annotations' => [
-            'support' => true,
+            'support' => false,
         ],
         'cache' => [
             'storage' => null,

src/Queue/composer.json

@@ -51,7 +51,6 @@
         }
     },
     "require-dev": {
-        "doctrine/annotations": "^1.12 || ^2.0",
         "phpunit/phpunit": "^10.1",
         "mockery/mockery": "^1.5",
         "spiral/boot": "^3.12",

src/Queue/tests/Attribute/JobHandlerTest.php

@@ -9,9 +9,7 @@
 use Spiral\Attributes\Factory;
 use Spiral\Queue\Attribute\JobHandler;
 use Spiral\Tests\Queue\Attribute\Stub\ExtendedJobHandler;
-use Spiral\Tests\Queue\Attribute\Stub\JobHandlerAnnotation;
 use Spiral\Tests\Queue\Attribute\Stub\JobHandlerAttribute;
-use Spiral\Tests\Queue\Attribute\Stub\WithExtendedJobHandlerAnnotation;
 use Spiral\Tests\Queue\Attribute\Stub\WithExtendedJobHandlerAttribute;
 use Spiral\Tests\Queue\Attribute\Stub\WithoutJobHandler;
 
@@ -28,9 +26,7 @@ public function testJobHandler(string $class, ?JobHandler $expected): void
     public static function classesProvider(): \Traversable
     {
         yield [WithoutJobHandler::class, null];
-        yield [JobHandlerAnnotation::class, new JobHandler('test')];
         yield [JobHandlerAttribute::class, new JobHandler('test')];
-        yield [WithExtendedJobHandlerAnnotation::class, new ExtendedJobHandler()];
         yield [WithExtendedJobHandlerAttribute::class, new ExtendedJobHandler()];
     }
 }

src/Queue/tests/Attribute/RetryPolicyTest.php

@@ -9,12 +9,9 @@
 use Spiral\Attributes\Factory;
 use Spiral\Queue\Attribute\RetryPolicy;
 use Spiral\Tests\Queue\Attribute\Stub\ExtendedRetryPolicy;
-use Spiral\Tests\Queue\Attribute\Stub\WithDefaultRetryPolicyAnnotation;
 use Spiral\Tests\Queue\Attribute\Stub\WithDefaultRetryPolicyAttribute;
-use Spiral\Tests\Queue\Attribute\Stub\WithExtendedRetryPolicyAnnotation;
 use Spiral\Tests\Queue\Attribute\Stub\WithExtendedRetryPolicyAttribute;
 use Spiral\Tests\Queue\Attribute\Stub\WithoutRetryPolicy;
-use Spiral\Tests\Queue\Attribute\Stub\WithRetryPolicyAnnotation;
 use Spiral\Tests\Queue\Attribute\Stub\WithRetryPolicyAttribute;
 
 final class RetryPolicyTest extends TestCase
@@ -30,11 +27,8 @@ public function testRetryPolicy(string $class, ?RetryPolicy $expected): void
     public static function classesProvider(): \Traversable
     {
         yield [WithoutRetryPolicy::class, null];
-        yield [WithDefaultRetryPolicyAnnotation::class, new RetryPolicy()];
         yield [WithDefaultRetryPolicyAttribute::class, new RetryPolicy()];
-        yield [WithRetryPolicyAnnotation::class, new RetryPolicy(5, 3_000, 2.5)];
         yield [WithRetryPolicyAttribute::class, new RetryPolicy(5, 3_000, 2.5)];
         yield [WithExtendedRetryPolicyAttribute::class, new ExtendedRetryPolicy()];
-        yield [WithExtendedRetryPolicyAnnotation::class, new ExtendedRetryPolicy()];
     }
 }

src/Queue/tests/Attribute/SerializerTest.php

@@ -9,9 +9,7 @@
 use Spiral\Attributes\Factory;
 use Spiral\Queue\Attribute\Serializer;
 use Spiral\Tests\Queue\Attribute\Stub\ExtendedSerializer;
-use Spiral\Tests\Queue\Attribute\Stub\SerializerAnnotation;
 use Spiral\Tests\Queue\Attribute\Stub\SerializerAttribute;
-use Spiral\Tests\Queue\Attribute\Stub\WithExtendedSerializerAnnotation;
 use Spiral\Tests\Queue\Attribute\Stub\WithExtendedSerializerAttribute;
 use Spiral\Tests\Queue\Attribute\Stub\WithoutSerializer;
 
@@ -28,9 +26,7 @@ public function testSerializer(string $class, ?Serializer $expected): void
     public static function classesProvider(): \Traversable
     {
         yield [WithoutSerializer::class, null];
-        yield [SerializerAnnotation::class, new Serializer('test')];
         yield [SerializerAttribute::class, new Serializer('test')];
-        yield [WithExtendedSerializerAnnotation::class, new ExtendedSerializer()];
         yield [WithExtendedSerializerAttribute::class, new ExtendedSerializer()];
     }
 }

src/Queue/tests/Attribute/Stub/Queueable.php

@@ -6,9 +6,7 @@
 
 use Spiral\Queue\Attribute\Queueable as QueueableAttribute;
 
-/**
- * @QueueableAttribute
- */
+#[QueueableAttribute]
 final class Queueable
 {
 }

src/Queue/tests/Attribute/Stub/QueueableWithQueue.php

@@ -6,9 +6,7 @@
 
 use Spiral\Queue\Attribute\Queueable;
 
-/**
- * @Queueable(queue="test")
- */
+#[Queueable(queue: 'test')]
 final class QueueableWithQueue
 {
 }

tests/Framework/Bootloader/Attributes/AttributesBootloaderTest.php

@@ -4,24 +4,23 @@
 
 namespace Framework\Bootloader\Attributes;
 
-use Spiral\Attributes\Composite\SelectiveReader;
-use Spiral\Attributes\Internal\Instantiator\Facade;
+use Spiral\Attributes\AttributeReader;
 use Spiral\Attributes\Internal\Instantiator\InstantiatorInterface;
+use Spiral\Attributes\Internal\Instantiator\NamedArgumentsInstantiator;
 use Spiral\Attributes\ReaderInterface;
 use Spiral\Bootloader\Attributes\AttributesConfig;
-use Spiral\Bootloader\Attributes\Factory;
 use Spiral\Tests\Framework\BaseTestCase;
 
 final class AttributesBootloaderTest extends BaseTestCase
 {
     public function testReaderBinding(): void
     {
-        $this->assertContainerBoundAsSingleton(ReaderInterface::class, SelectiveReader::class);
+        $this->assertContainerBoundAsSingleton(ReaderInterface::class, AttributeReader::class);
     }
 
     public function testInstantiatorBinding(): void
     {
-        $this->assertContainerBoundAsSingleton(InstantiatorInterface::class, Facade::class);
+        $this->assertContainerBoundAsSingleton(InstantiatorInterface::class, NamedArgumentsInstantiator::class);
     }
 
     public function testIsCacheEnabledShouldBeFalse(): void

tests/Framework/Bootloader/Attributes/AttributesConfigTest.php

@@ -11,9 +11,9 @@ final class AttributesConfigTest extends TestCase
 {
     public function testIsAnnotationsReaderEnabled(): void
     {
-        $this->assertTrue((new AttributesConfig())->isAnnotationsReaderEnabled());
-        $this->assertFalse(
-            (new AttributesConfig(['annotations' => ['support' => false]]))->isAnnotationsReaderEnabled()
+        $this->assertFalse((new AttributesConfig())->isAnnotationsReaderEnabled());
+        $this->assertTrue(
+            (new AttributesConfig(['annotations' => ['support' => true]]))->isAnnotationsReaderEnabled()
         );
     }