Merge pull request #93: AttributeReader by default

cycle · Jan 5, 2024 · af04e98 · af04e98
2 parents 9198a4d + 9a39d04
commit af04e98
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1','8.2']
+        php-version: ['8.1', '8.2', '8.3']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -36,11 +36,11 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies with composer
-        if: matrix.php-version != '8.3'
+        if: matrix.php-version != '8.4'
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
-      - name: Install dependencies with composer php 8.1
-        if: matrix.php-version == '8.3'
+      - name: Install dependencies with composer php 8.4
+        if: matrix.php-version == '8.4'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Execute Tests

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -12,5 +12,3 @@ jobs:
     with:
       os: >-
         ['ubuntu-latest']
-      php: >-
-        ['8.2']
diff --git a/src/ReaderFactory.php b/src/ReaderFactory.php
@@ -7,7 +7,6 @@
 use Doctrine\Common\Annotations\Reader as DoctrineReader;
 use Spiral\Attributes\AnnotationReader;
 use Spiral\Attributes\AttributeReader;
-use Spiral\Attributes\Composite\SelectiveReader;
 use Spiral\Attributes\ReaderInterface;
 
 final class ReaderFactory
@@ -17,10 +16,7 @@ public static function create(DoctrineReader|ReaderInterface $reader = null): Re
         return match (true) {
             $reader instanceof ReaderInterface => $reader,
             $reader instanceof DoctrineReader => new AnnotationReader($reader),
-            $reader === null => new SelectiveReader([
-                new AttributeReader(),
-                new AnnotationReader(),
-            ]),
+            $reader === null => new AttributeReader(),
         };
     }
 }
diff --git a/tests/Annotated/Unit/ReaderFactoryTest.php b/tests/Annotated/Unit/ReaderFactoryTest.php
@@ -8,16 +8,16 @@
 use Doctrine\Common\Annotations\AnnotationReader as DoctrineAnnotationReader;
 use PHPUnit\Framework\TestCase;
 use Spiral\Attributes\AnnotationReader;
+use Spiral\Attributes\AttributeReader;
 use Spiral\Attributes\Composite\MergeReader;
-use Spiral\Attributes\Composite\SelectiveReader;
 
 class ReaderFactoryTest extends TestCase
 {
     public function testCreateFromNull(): void
     {
         $reader = ReaderFactory::create(null);
 
-        $this->assertInstanceOf(SelectiveReader::class, $reader);
+        $this->assertInstanceOf(AttributeReader::class, $reader);
     }
 
     public function testCreateFromDoctrineReader(): void