Merge up 1.1 (#22)

* Task/support php parser 5 (#20)

* Support PHP-Parser 4.18 & 5

* Try testing both versions of php-parser

* Support proper target branches

* Add explicit test for #12 (#21)

Author: cspray

.github/workflows/php.yml

@@ -2,25 +2,30 @@ name: 'Unit Tests'
 
 on:
   push:
-    branches: [ main ]
+    branches: [ release-1.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ release-1.x ]
 
 jobs:
   build-test:
-
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        composer: [lowest, highest]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup PHP 8
         uses: shivammathur/setup-php@v2
         with:
           php-version: 8.1
-          tools: composer:v2
+          tools: none
           coverage: none
       - name: Composer Install
-        run: composer update --no-interaction --no-progress --ansi
+        uses: ramsey/composer-install@v2
+        with:
+          dependency-versions: ${{ matrix.composer }}
       - name: Unit Tests
         run: ./vendor/bin/pest --colors=always

composer.json

@@ -12,7 +12,7 @@
   ],
   "require": {
     "php": "^8.1",
-    "nikic/php-parser": "^v4.14",
+    "nikic/php-parser": "^v4.18 || ^5.0",
     "cspray/typiphy": "^0.3"
   },
   "require-dev": {

fixture_src/AliasedAttribute/FooClass.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);
+
+namespace Cspray\AnnotatedTargetFixture\AliasedAttribute;
+
+use Cspray\AnnotatedTargetFixture\ClassOnly as MyAttributeName;
+
+#[MyAttributeName('my aliased value')]
+class FooClass {
+
+}

fixture_src/AliasedAttributeFixture.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+
+namespace Cspray\AnnotatedTargetFixture;
+
+use Cspray\Typiphy\ObjectType;
+use function Cspray\Typiphy\objectType;
+
+final class AliasedAttributeFixture implements Fixture {
+
+    public function getPath() : string {
+        return __DIR__ . '/AliasedAttribute';
+    }
+
+    public function fooClass() : ObjectType {
+        return objectType(AliasedAttribute\FooClass::class);
+    }
+}

fixture_src/Fixtures.php

@@ -89,4 +89,8 @@ public static function targetAttributeInterface() : TargetAttributeInterfaceFixt
     public static function invalidSyntax() : BadPhpFileFixture {
         return new BadPhpFileFixture();
     }
+
+    public static function aliasedAttribute() : AliasedAttributeFixture {
+        return new AliasedAttributeFixture();
+    }
 }

src/PhpParserAnnotatedTargetParser.php

@@ -29,7 +29,7 @@ final class PhpParserAnnotatedTargetParser implements AnnotatedTargetParser {
     private readonly Parser $parser;
 
     public function __construct() {
-        $this->parser = (new ParserFactory())->create(ParserFactory::ONLY_PHP7);
+        $this->parser = (new ParserFactory())->createForNewestSupportedVersion();
     }
 
     public function parse(AnnotatedTargetParserOptions $options) : Generator {
@@ -39,7 +39,7 @@ public function parse(AnnotatedTargetParserOptions $options) : Generator {
         $data = new \stdClass();
         $data->targets = [];
         $nodeTraverser->addVisitor($this->getVisitor(
-            fn($target) => $data->targets[] = $target,
+            static fn($target) => $data->targets[] = $target,
             $options->getAttributeTypes()
         ));
 

tests/Unit/AliasedAttributeTest.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types=1);
+
+namespace Cspray\AnnotatedTarget\Unit;
+
+use Cspray\AnnotatedTargetFixture\ClassOnly;
+use Cspray\AnnotatedTargetFixture\Fixtures;
+use function Cspray\Typiphy\objectType;
+
+uses(AnnotatedTargetParserTestCase::class);
+
+beforeEach()->withFixtures(Fixtures::aliasedAttribute());
+
+it('counts parsed targets for single class')
+    ->expect(fn() => $this->getTargets())
+    ->toHaveCount(1);
+
+it('ensures all targets are correct type')
+    ->expect(fn() => $this->getTargets())
+    ->toContainOnlyAnnotatedTargets();
+
+it('ensures all targets share target reflection')
+    ->expect(fn() => $this->getTargets())
+    ->toShareTargetReflection();
+
+it('ensures all targets share attribute reflection')
+    ->expect(fn() => $this->getTargets())
+    ->toShareAttributeReflection();
+
+it('ensures all targets share attribute instance')
+    ->expect(fn() => $this->getTargets())
+    ->toShareAttributeInstance();
+
+it('includes target reflection class')
+    ->expect(fn() => $this->getTargets())
+    ->toContainTargetClass(Fixtures::aliasedAttribute()->fooClass());
+
+it('includes attribute reflection class')
+    ->expect(fn() => $this->getTargets())
+    ->toContainTargetClassWithAttribute(Fixtures::aliasedAttribute()->fooClass(), objectType(ClassOnly::class));
+
+it('includes attribute instance with correct value')
+    ->expect(fn() => $this->getTargets())
+    ->toContainTargetClassWithAttributeInstance(
+        Fixtures::aliasedAttribute()->fooClass(),
+        objectType(ClassOnly::class),
+        fn(ClassOnly $classOnly) => $classOnly->value === 'my aliased value'
+    );

tests/Unit/ClassOnlyAttributeGroupTest.php

@@ -4,7 +4,6 @@
 
 use Cspray\AnnotatedTargetFixture\ClassOnly;
 use Cspray\AnnotatedTargetFixture\Fixtures;
-use Cspray\AnnotatedTargetFixture\ParameterOnly;
 use Cspray\AnnotatedTargetFixture\RepeatableClassOnly;
 use function Cspray\Typiphy\objectType;