Move request provider code to a separate package + Raise PHP to 8.1

.github/workflows/build.yml

@@ -30,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3']

.github/workflows/composer-require-checker.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3']

.github/workflows/mutation.yml

@@ -28,6 +28,6 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.2']
+        ['8.3']
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/static.yml

@@ -29,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3']

composer.json

@@ -31,8 +31,9 @@
             "url": "https://github.com/sponsors/yiisoft"
         }
     ],
+    "minimum-stability": "dev",
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "psr/container": "^1.0|^2.0",
         "psr/http-message": "^1.0|^2.0",
         "psr/http-server-handler": "^1.0",
@@ -41,7 +42,8 @@
         "yiisoft/hydrator": "^1.0",
         "yiisoft/hydrator-validator": "^1.0",
         "yiisoft/middleware-dispatcher": "^5.1",
-        "yiisoft/validator": "^1.1"
+        "yiisoft/validator": "^1.1",
+        "yiisoft/request-provider": "^1.0"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.4",

config/di-web.php

@@ -4,20 +4,11 @@
 
 use Yiisoft\Definitions\Reference;
 use Yiisoft\Hydrator\Validator\ValidatingHydrator;
-use Yiisoft\Input\Http\Request\RequestProvider;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\RequestInputParametersResolver;
 
 /** @var array $params */
 
 return [
-    RequestProviderInterface::class => [
-        'class' => RequestProvider::class,
-        'reset' => function () {
-            /** @var RequestProvider $this */
-            $this->request = null;
-        },
-    ],
     RequestInputParametersResolver::class => [
         '__construct()' => [
             'hydrator' => Reference::to(ValidatingHydrator::class),

src/Attribute/Data/FromBodyResolver.php

@@ -10,7 +10,7 @@
 use Yiisoft\Hydrator\Attribute\Data\DataAttributeResolverInterface;
 use Yiisoft\Hydrator\AttributeHandling\Exception\UnexpectedAttributeException;
 use Yiisoft\Hydrator\DataInterface;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 use function is_array;
 

src/Attribute/Data/FromQueryResolver.php

@@ -10,7 +10,8 @@
 use Yiisoft\Hydrator\Attribute\Data\DataAttributeResolverInterface;
 use Yiisoft\Hydrator\AttributeHandling\Exception\UnexpectedAttributeException;
 use Yiisoft\Hydrator\DataInterface;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
+
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 use function is_array;
 

src/Attribute/Parameter/BodyResolver.php

@@ -10,7 +10,7 @@
 use Yiisoft\Hydrator\AttributeHandling\Exception\UnexpectedAttributeException;
 use Yiisoft\Hydrator\AttributeHandling\ParameterAttributeResolveContext;
 use Yiisoft\Hydrator\Result;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 use function is_array;
 

src/Attribute/Parameter/QueryResolver.php

@@ -10,7 +10,7 @@
 use Yiisoft\Hydrator\AttributeHandling\ParameterAttributeResolveContext;
 use Yiisoft\Hydrator\Attribute\Parameter\ParameterAttributeInterface;
 use Yiisoft\Hydrator\Result;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 /**
  * Resolver for {@see Query} attribute.

src/Attribute/Parameter/RequestResolver.php

@@ -10,7 +10,7 @@
 use Yiisoft\Hydrator\AttributeHandling\Exception\UnexpectedAttributeException;
 use Yiisoft\Hydrator\AttributeHandling\ParameterAttributeResolveContext;
 use Yiisoft\Hydrator\Result;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 /**
  * Resolver for {@see Request} attribute.

src/Attribute/Parameter/UploadedFilesResolver.php

@@ -10,7 +10,7 @@
 use Yiisoft\Hydrator\AttributeHandling\Exception\UnexpectedAttributeException;
 use Yiisoft\Hydrator\AttributeHandling\ParameterAttributeResolveContext;
 use Yiisoft\Hydrator\Result;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 /**
  * Resolver for {@see UploadedFiles} attribute.
@@ -21,7 +21,7 @@ final class UploadedFilesResolver implements ParameterAttributeResolverInterface
      * @param RequestProviderInterface $requestProvider The request provider.
      */
     public function __construct(
-        private RequestProviderInterface $requestProvider
+        private RequestProviderInterface $requestProvider,
     ) {
     }
 

tests/Attribute/Data/FromBodyTest.php

@@ -12,11 +12,11 @@
 use Yiisoft\Input\Http\Attribute\Data\FromBody;
 use Yiisoft\Input\Http\Attribute\Data\FromBodyResolver;
 use Yiisoft\Input\Http\Attribute\Data\FromQuery;
-use Yiisoft\Input\Http\Request\RequestProvider;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\Tests\Support\Input\FromBodyInput;
 use Yiisoft\Input\Http\Tests\Support\Input\FromBodyNestedInput;
 use Yiisoft\Input\Http\Tests\Support\TestHelper;
+use Yiisoft\RequestProvider\RequestProvider;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 final class FromBodyTest extends TestCase
 {

tests/Attribute/Data/FromQueryTest.php

@@ -12,11 +12,11 @@
 use Yiisoft\Input\Http\Attribute\Data\FromBody;
 use Yiisoft\Input\Http\Attribute\Data\FromQuery;
 use Yiisoft\Input\Http\Attribute\Data\FromQueryResolver;
-use Yiisoft\Input\Http\Request\RequestProvider;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\Tests\Support\Input\FromQueryInput;
 use Yiisoft\Input\Http\Tests\Support\Input\FromQueryNestedInput;
 use Yiisoft\Input\Http\Tests\Support\TestHelper;
+use Yiisoft\RequestProvider\RequestProvider;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 final class FromQueryTest extends TestCase
 {

tests/Attribute/Parameter/BodyTest.php

@@ -11,9 +11,9 @@
 use Yiisoft\Input\Http\Attribute\Parameter\Body;
 use Yiisoft\Input\Http\Attribute\Parameter\BodyResolver;
 use Yiisoft\Input\Http\Attribute\Parameter\Query;
-use Yiisoft\Input\Http\Request\RequestProvider;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\Tests\Support\TestHelper;
+use Yiisoft\RequestProvider\RequestProvider;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 final class BodyTest extends TestCase
 {

tests/Attribute/Parameter/QueryTest.php

@@ -11,9 +11,9 @@
 use Yiisoft\Input\Http\Attribute\Parameter\Body;
 use Yiisoft\Input\Http\Attribute\Parameter\Query;
 use Yiisoft\Input\Http\Attribute\Parameter\QueryResolver;
-use Yiisoft\Input\Http\Request\RequestProvider;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\Tests\Support\TestHelper;
+use Yiisoft\RequestProvider\RequestProvider;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 final class QueryTest extends TestCase
 {

tests/Attribute/Parameter/RequestTest.php

@@ -11,9 +11,9 @@
 use Yiisoft\Input\Http\Attribute\Parameter\Body;
 use Yiisoft\Input\Http\Attribute\Parameter\Request;
 use Yiisoft\Input\Http\Attribute\Parameter\RequestResolver;
-use Yiisoft\Input\Http\Request\RequestProvider;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\Tests\Support\TestHelper;
+use Yiisoft\RequestProvider\RequestProvider;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 final class RequestTest extends TestCase
 {

tests/Attribute/Parameter/UploadedFilesTest.php

@@ -12,9 +12,9 @@
 use Yiisoft\Input\Http\Attribute\Parameter\Body;
 use Yiisoft\Input\Http\Attribute\Parameter\UploadedFiles;
 use Yiisoft\Input\Http\Attribute\Parameter\UploadedFilesResolver;
-use Yiisoft\Input\Http\Request\RequestProvider;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\Tests\Support\TestHelper;
+use Yiisoft\RequestProvider\RequestProvider;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 
 final class UploadedFilesTest extends TestCase
 {

tests/ConfigTest.php

@@ -11,10 +11,10 @@
 use Yiisoft\Di\StateResetter;
 use Yiisoft\Hydrator\Hydrator;
 use Yiisoft\Hydrator\HydratorInterface;
-use Yiisoft\Input\Http\Request\RequestNotSetException;
-use Yiisoft\Input\Http\Request\RequestProvider;
-use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\RequestInputParametersResolver;
+use Yiisoft\RequestProvider\RequestNotSetException;
+use Yiisoft\RequestProvider\RequestProvider;
+use Yiisoft\RequestProvider\RequestProviderInterface;
 use Yiisoft\Validator\Validator;
 use Yiisoft\Validator\ValidatorInterface;
 
@@ -60,6 +60,7 @@ private function getContainerDefinitions(array|null $params = null): array
         }
 
         return array_merge(
+            require dirname(__DIR__) . '/vendor/yiisoft/request-provider/config/di-web.php',
             require dirname(__DIR__) . '/config/di-web.php',
             [
                 HydratorInterface::class => Hydrator::class,

tests/HydratorAttributeParametersResolverTest.php

@@ -11,9 +11,9 @@
 use Yiisoft\Input\Http\Attribute\Parameter\Query;
 use Yiisoft\Input\Http\Attribute\Parameter\QueryResolver;
 use Yiisoft\Input\Http\HydratorAttributeParametersResolver;
-use Yiisoft\Input\Http\Request\RequestProvider;
 use Yiisoft\Input\Http\Tests\Support\CallableTypeCaster;
 use Yiisoft\Input\Http\Tests\Support\TestHelper;
+use Yiisoft\RequestProvider\RequestProvider;
 
 final class HydratorAttributeParametersResolverTest extends TestCase
 {