refactor: upgrade to PHP 8.1+, remove deprecated annotations

.github/workflows/continuous-integration.yml

@@ -9,5 +9,5 @@ jobs:
   ci:
     uses: ray-di/.github/.github/workflows/continuous-integration.yml@v1
     with:
-      old_stable: '["7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
+      old_stable: '["8.1", "8.2", "8.3"]'
       current_stable: 8.4

CHANGELOG.md

@@ -0,0 +1,23 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [1.4.0] - 2026-01-29
+
+### Added
+- PHP 8 Attribute support for `UploadFiles`.
+- Lazy Loading example in README.
+
+### Changed
+- Required PHP version increased to `^8.1`.
+- `HttpRequestProvider` now implements `Ray\Di\ProviderInterface` directly.
+- Updated `doctrine/coding-standard` to `^13.0`.
+
+### Deprecated
+- `Ray\HttpMessage\RequestProviderInterface` (Use `Ray\Di\ProviderInterface` instead).
+- `Ray\HttpMessage\HttpRequestRayProvider` (Use `Ray\HttpMessage\HttpRequestProvider` instead).
+
+### Removed
+- Support for PHP 7.3, 7.4, and 8.0.
+- Dependency on `doctrine/annotations` and `koriym/attributes`.
+- Direct dependency on `ray/aop`.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) <2018-2021> <Akihito Koriyama>
+Copyright (c) <2018-2026> <Akihito Koriyama>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -67,15 +67,35 @@ use Ray\HttpMessage\Annotation\UploadFiles;
 
 class Foo
 {
-    /**
-     * @UploadFiles
-     */
-    public function __construct(array $files)
-    {
+    public function __construct(
+        #[UploadFiles] array $files
+    ) {
         // retrieve file name
-        $file = $files['my-form']['details']['avatar'][0]
+        $file = $files['my-form']['details']['avatar'][0];
         /* @var UploadedFileInterface $file */
         $name = $file->getClientFilename(); // my-avatar3.png
     }
 }
 ````
+
+### Lazy Loading
+
+If you want to lazy load the `ServerRequest`, use `Ray\Di\Di\Set` attribute.
+
+```php
+use Ray\Di\Di\Set;
+use Ray\Di\ProviderInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class Foo
+{
+    public function __construct(
+        #[Set(ServerRequestInterface::class)] private ProviderInterface $requestProvider
+    ) {}
+
+    public function onGet()
+    {
+        $request = $this->requestProvider->get();
+    }
+}
+```

composer.json

@@ -9,15 +9,14 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.1",
         "psr/http-message": "^1.0 || ^2.0",
         "nyholm/psr7": "^1.0",
         "nyholm/psr7-server": "^1.0",
-        "ray/di": "^2.11",
-        "ray/aop": "^2.10.3"
+        "ray/di": "^2.11"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5.41 || ^9.5",
+        "phpunit/phpunit": "^9.5",
         "bamarni/composer-bin-plugin": "^1.4"
     },
     "autoload": {
@@ -34,21 +33,60 @@
         }
     },
     "scripts": {
-        "test": ["./vendor/bin/phpunit"],
-        "tests": ["@cs", "@test", "@sa"],
-        "coverage": ["php -dzend_extension=xdebug.so -dxdebug.mode=coverage ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage"],
-        "pcov": ["php -dextension=pcov.so -d pcov.enabled=1 ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage  --coverage-clover=coverage.xml"],
-        "cs": ["phpcs --standard=./phpcs.xml src tests"],
-        "cs-fix": ["./vendor/bin/phpcbf src tests"],
-        "clean": ["./vendor/bin/phpstan clear-result-cache", "./vendor/bin/psalm --clear-cache", "rm -rf tests/tmp/*.php"],
-        "sa": ["./vendor/bin/phpstan analyse -c phpstan.neon", "psalm --show-info=true"],
-        "metrics": ["./vendor/bin/phpmetrics --report-html=build/metrics --exclude=Exception --junit=build/junit.xml src"],
-        "phpmd": ["./vendor/bin/phpmd --exclude src/Annotation src text ./phpmd.xml"],
-        "build": ["@cs", "@sa", "@pcov", "@metrics"]
+        "test": [
+            "./vendor/bin/phpunit"
+        ],
+        "tests": [
+            "@cs",
+            "@test",
+            "@sa"
+        ],
+        "coverage": [
+            "php -dzend_extension=xdebug.so -dxdebug.mode=coverage ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage"
+        ],
+        "pcov": [
+            "php -dextension=pcov.so -d pcov.enabled=1 ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage  --coverage-clover=coverage.xml"
+        ],
+        "cs": [
+            "phpcs --standard=./phpcs.xml src tests"
+        ],
+        "cs-fix": [
+            "./vendor/bin/phpcbf src tests"
+        ],
+        "clean": [
+            "./vendor/bin/phpstan clear-result-cache",
+            "./vendor/bin/psalm --clear-cache",
+            "rm -rf tests/tmp/*.php"
+        ],
+        "sa": [
+            "./vendor/bin/phpstan analyse -c phpstan.neon",
+            "psalm --show-info=true"
+        ],
+        "metrics": [
+            "./vendor/bin/phpmetrics --report-html=build/metrics --exclude=Exception --junit=build/junit.xml src"
+        ],
+        "phpmd": [
+            "./vendor/bin/phpmd --exclude src/Annotation src text ./phpmd.xml"
+        ],
+        "build": [
+            "@cs",
+            "@sa",
+            "@pcov",
+            "@metrics"
+        ],
+        "post-install-cmd": [
+            "@composer bin all install --ansi --ignore-platform-reqs"
+        ],
+        "post-update-cmd": [
+            "@composer bin all install --ansi --ignore-platform-reqs"
+        ]
     },
     "config": {
         "allow-plugins": {
             "bamarni/composer-bin-plugin": true
+        },
+        "platform": {
+            "php": "8.1"
         }
     },
     "extra": {
@@ -57,4 +95,4 @@
             "bin-links": true
         }
     }
-}
+}

src/Annotation/UploadFiles.php

@@ -4,11 +4,6 @@
 use Attribute;
 use Ray\Di\Di\Qualifier;
 
-/**
- * @Annotation
- * @Target("METHOD")
- * @Qualifier
- */
 #[Attribute(Attribute::TARGET_METHOD), Qualifier]
 final class UploadFiles
 {

src/HttpRequestProvider.php

@@ -7,11 +7,16 @@
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7Server\ServerRequestCreator;
 use Psr\Http\Message\ServerRequestInterface;
+use Ray\Di\ProviderInterface;
 
-final class HttpRequestProvider implements RequestProviderInterface
+/**
+ * @implements ProviderInterface<ServerRequestInterface>
+ * @psalm-suppress DeprecatedInterface
+ */
+final class HttpRequestProvider implements ProviderInterface, RequestProviderInterface
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function get(): ServerRequestInterface
     {
@@ -21,7 +26,7 @@ public function get(): ServerRequestInterface
             $psr17Factory, // ServerRequestFactory
             $psr17Factory, // UriFactory
             $psr17Factory, // UploadedFileFactory
-            $psr17Factory  // StreamFactory
+            $psr17Factory,  // StreamFactory
         ))->fromGlobals();
     }
 }

src/HttpRequestRayProvider.php

@@ -7,11 +7,15 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Ray\Di\ProviderInterface;
 
-/** @implements ProviderInterface<ServerRequestInterface> */
+/**
+ * @implements ProviderInterface<ServerRequestInterface>
+ * @deprecated
+ * @codeCoverageIgnore
+ */
 final class HttpRequestRayProvider implements ProviderInterface
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function get()
     {

src/Psr7Module.php

@@ -15,8 +15,8 @@ class Psr7Module extends AbstractModule
     protected function configure()
     {
         $this->bind(RequestProviderInterface::class)->to(HttpRequestProvider::class);
-        $this->bind(ServerRequest::class)->toProvider(HttpRequestRayProvider::class);
-        $this->bind(ServerRequestInterface::class)->toProvider(HttpRequestRayProvider::class);
+        $this->bind(ServerRequest::class)->toProvider(HttpRequestProvider::class);
+        $this->bind(ServerRequestInterface::class)->toProvider(HttpRequestProvider::class);
         $this->bind(UriInterface::class)->toProvider(UriProvider::class);
         $this->bind()->annotatedWith(UploadFiles::class)->toProvider(UploadfilesProvider::class);
     }

src/RequestProviderInterface.php

@@ -6,6 +6,10 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 
+/**
+ * @deprecated
+ * @codeCoverageIgnore
+ */
 interface RequestProviderInterface
 {
     public function get(): ServerRequestInterface;

src/UploadfilesProvider.php

@@ -11,7 +11,7 @@
 final class UploadfilesProvider implements ProviderInterface
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function get()
     {

src/UriProvider.php

@@ -11,7 +11,7 @@
 final class UriProvider implements ProviderInterface
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function get()
     {

tests/Psr7HttpModuleTest.php

@@ -61,9 +61,7 @@ public function testPsr7UploadFilesTest(): void
         $this->assertSame('my-avatar3.png', $file->getClientFilename());
     }
 
-    /**
-     * @return array<string>tests/Psr7HttpModuleTest.php
-     */
+    /** @return array<string, string> */
     public function superGlobalsServer(): array
     {
         return [
@@ -75,9 +73,7 @@ public function superGlobalsServer(): array
         ];
     }
 
-    /**
-     * @return array<string, array<mixed>>
-     */
+    /** @return array<string, array<mixed>> */
     public function files(): array
     {
         return [

tests/bootstrap.php

@@ -1,11 +1,3 @@
 <?php
 
 declare(strict_types=1);
-
-use Koriym\Attributes\AttributeReader;
-use Ray\ServiceLocator\ServiceLocator;
-
-// no annotation in PHP 8
-if (PHP_MAJOR_VERSION >= 8) {
-    ServiceLocator::setReader(new AttributeReader());
-}

vendor-bin/tools/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "doctrine/coding-standard": "^8.2",
+        "doctrine/coding-standard": "^13.0",
         "phpmd/phpmd": "^2.9",
         "phpmetrics/phpmetrics": "^2.7",
         "phpstan/phpstan": "^1.10",
@@ -13,4 +13,4 @@
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
-}
+}