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

spiral · Jan 11, 2024 · 6b8c41e · 6b8c41e
1 parent e3390e9
commit 6b8c41e
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 113 deletions.
diff --git a/composer.json b/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",

diff --git a/tests/Attribute/JobHandlerTest.php b/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()];
     }
 }
diff --git a/tests/Attribute/RetryPolicyTest.php b/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()];
     }
 }
diff --git a/tests/Attribute/SerializerTest.php b/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()];
     }
 }
diff --git a/tests/Attribute/Stub/JobHandlerAnnotation.php b/tests/Attribute/Stub/JobHandlerAnnotation.php
diff --git a/tests/Attribute/Stub/Queueable.php b/tests/Attribute/Stub/Queueable.php
@@ -6,9 +6,7 @@
 
 use Spiral\Queue\Attribute\Queueable as QueueableAttribute;
 
-/**
- * @QueueableAttribute
- */
+#[QueueableAttribute]
 final class Queueable
 {
 }
diff --git a/tests/Attribute/Stub/QueueableWithQueue.php b/tests/Attribute/Stub/QueueableWithQueue.php
@@ -6,9 +6,7 @@
 
 use Spiral\Queue\Attribute\Queueable;
 
-/**
- * @Queueable(queue="test")
- */
+#[Queueable(queue: 'test')]
 final class QueueableWithQueue
 {
 }
diff --git a/tests/Attribute/Stub/SerializerAnnotation.php b/tests/Attribute/Stub/SerializerAnnotation.php
diff --git a/tests/Attribute/Stub/WithDefaultRetryPolicyAnnotation.php b/tests/Attribute/Stub/WithDefaultRetryPolicyAnnotation.php
diff --git a/tests/Attribute/Stub/WithExtendedJobHandlerAnnotation.php b/tests/Attribute/Stub/WithExtendedJobHandlerAnnotation.php
diff --git a/tests/Attribute/Stub/WithExtendedRetryPolicyAnnotation.php b/tests/Attribute/Stub/WithExtendedRetryPolicyAnnotation.php
diff --git a/tests/Attribute/Stub/WithExtendedSerializerAnnotation.php b/tests/Attribute/Stub/WithExtendedSerializerAnnotation.php
diff --git a/tests/Attribute/Stub/WithRetryPolicyAnnotation.php b/tests/Attribute/Stub/WithRetryPolicyAnnotation.php