Merge pull request #152 from bearsunday/wokrs-without-annotation

Make it work without an annotation reader

.gitattributes

@@ -12,7 +12,6 @@
 /phpstan.neon                    export-ignore
 /psalm.xml                       export-ignore
 /phpunit.xml.dist                export-ignore
-/php-require-checker.config.json export-ignore
 
 # Configure diff output for .php and .phar files.
 *.php diff=php

.github/workflows/static-analysis.yml

@@ -123,7 +123,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           coverage: none
 
       - name: Get composer cache directory
@@ -133,7 +133,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer install --no-interaction --no-progress --prefer-dist
-          composer require --dev maglnet/composer-require-checker ^2.0
+          composer require --dev maglnet/composer-require-checker ^3.0
 
       - name: Run composer-require-checker
-        run: ./vendor/bin/composer-require-checker check --config-file=./php-require-checker.config.json ./composer.json
+        run: ./vendor/bin/composer-require-checker

composer.json

@@ -23,11 +23,11 @@
   "require": {
     "php": "^7.2 || ^8.0",
     "ext-json": "*",
-    "bear/resource": "^1.15",
+    "bear/resource": "^1.15.1",
     "doctrine/annotations": "^1.10",
     "doctrine/cache": "^1.10",
     "psr/log": "^1.1",
-    "ray/aop": "^2.10",
+    "ray/aop": "^2.10.1",
     "ray/di": "^2.11"
   },
   "require-dev": {

phpcs.xml

@@ -41,6 +41,8 @@
         <!-- /Base -->
         <!-- Option -->
         <exclude name="SlevomatCodingStandard.ControlStructures.EarlyExit.EarlyExitNotUsed"/>
+        <!-- PHP8 attribute -->
+        <exclude name="Squiz.WhiteSpace.FunctionSpacing.Before"/>
         <!-- /Option -->
         <!-- Exclude Fake files form Doctrine CS -->
         <exclude-pattern>*/tests/Fake/*</exclude-pattern>

src/Annotation/DefaultSchemeHost.php

@@ -5,6 +5,7 @@
 namespace BEAR\Sunday\Annotation;
 
 use Attribute;
+use Doctrine\Common\Annotations\NamedArgumentConstructorAnnotation;
 use Ray\Di\Di\Qualifier;
 
 /**
@@ -13,8 +14,13 @@
  * @Qualifier
  */
 #[Attribute(Attribute::TARGET_METHOD), Qualifier]
-final class DefaultSchemeHost
+final class DefaultSchemeHost implements NamedArgumentConstructorAnnotation
 {
-    /** @var string */
+    /** @var ?string */
     public $value;
+
+    public function __construct(?string $value = null)
+    {
+        $this->value = $value;
+    }
 }

tests/bootstrap.php

@@ -2,5 +2,13 @@
 
 declare(strict_types=1);
 
+use Koriym\Attributes\AttributeReader;
+use Ray\ServiceLocator\ServiceLocator;
+
 require dirname(__DIR__) . '/vendor/autoload.php';
 array_map('unlink', (array) glob(__DIR__ . '/tmp/*.php'));
+
+// no annotation in PHP 8
+if (PHP_MAJOR_VERSION >= 8) {
+    ServiceLocator::setReader(new AttributeReader());
+}