Update requirements

.github/workflows/tests.yaml

@@ -11,12 +11,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        php: ['7.4', '8.0', '8.1']
         composer-flags: ['--prefer-stable']
         can-fail: [false]
         include:
           # Lowest supported versions
-          - php: '7.2'
+          - php: '7.4'
             composer-flags: '--prefer-stable --prefer-lowest'
             can-fail: false
           # Development versions

.gitignore

@@ -3,5 +3,5 @@ coverage
 /tests/Fixtures/var
 phpunit.xml
 composer.lock
-/.php_cs.cache
+/.php-cs-fixer.cache
 .phpunit.result.cache

.php_cs.dist → .php-cs-fixer.dist.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,14 +17,14 @@
 $header = <<<EOF
 PsrHttpMessageBundle by @ajgarlag
 
-Copyright (c) 2010-2021 Fabien Potencier
-Copyright (c) 2021 Antonio J. García Lagar
+Copyright (c) 2010-2022 Fabien Potencier
+Copyright (c) 2022 Antonio J. García Lagar
 
 For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 EOF;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,

CHANGELOG.md

@@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased](https://github.com/ajgarlag/psr-http-message-bundle/compare/1.2.1...main)
 
+### Added
+- Add Symfony 6 support
+
+### Removed
+- Remove PHP <7.4 support
+- Remove Symfony <5.4 support
+
 ## [1.2.1](https://github.com/ajgarlag/psr-http-message-bundle/compare/1.2.1...1.2.1) - 2021-03-21
 
 ### Added

composer.json

@@ -9,20 +9,22 @@
         }
     ],
     "require": {
+        "php": ">=7.4",
         "symfony/psr-http-message-bridge": "^1.1|^2.0",
         "psr/http-factory": "^1.0",
-        "symfony/dependency-injection": "^4.4.8|^5.2.4",
-        "symfony/framework-bundle": "^4.4|^5.0"
+        "symfony/dependency-injection": "^5.4|^6.0",
+        "symfony/framework-bundle": "^5.4|^6.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.18",
+        "friendsofphp/php-cs-fixer": "^3.8",
         "nyholm/psr7": "^1.1",
-        "sensio/framework-extra-bundle": "^5.3|^6.0",
-        "symfony/browser-kit": "^4.4|^5.0",
-        "symfony/monolog-bridge": "^4.0|^5.0",
+        "phpunit/phpunit": "^9.5",
+        "sensio/framework-extra-bundle": "^5.5.4|^6.2.6",
+        "symfony/browser-kit": "^5.4|^6.0",
+        "symfony/monolog-bridge": "^5.4|^6.0",
         "symfony/monolog-bundle": "^3.2",
-        "symfony/phpunit-bridge": "^4.4.11|^5.0.11",
-        "symfony/yaml": "^4.4|^5.0"
+        "symfony/phpunit-bridge": "^6.1",
+        "symfony/yaml": "^5.4|^6.0"
     },
     "conflict": {
         "sensio/framework-extra-bundle": "<5.3"
@@ -53,7 +55,7 @@
             "@php vendor/bin/php-cs-fixer fix --dry-run --ansi"
         ],
         "test": [
-            "@php vendor/bin/simple-phpunit --colors=always"
+            "@php vendor/bin/phpunit --colors=always"
         ]
     },
     "config": {

phpunit.xml.dist

@@ -9,7 +9,7 @@
     <php>
         <server name="KERNEL_CLASS" value="Tests\Fixtures\TestKernel" />
         <server name="KERNEL_DIR" value="tests/Fixtures/" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="/disabled/" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
     </php>
     <filter>
         <whitelist>
@@ -21,4 +21,7 @@
             </exclude>
         </whitelist>
     </filter>
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
 </phpunit>

src/AjgarlagPsrHttpMessageBundle.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/DependencyInjection/AjgarlagPsrHttpMessageExtension.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/DependencyInjection/Compiler/AssertDefinedPsr17Factories.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/DependencyInjection/Compiler/RegisterHttpMessageFactoriesPass.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -69,6 +69,6 @@ private function processHttpFoundationFactory(ContainerBuilder $container): void
 
         $container
                 ->register(HttpFoundationFactoryInterface::class, HttpFoundationFactory::class)
-            ;
+        ;
     }
 }

src/DependencyInjection/Compiler/RegisterNyholmPsr17FactoriesPass.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/DependencyInjection/Compiler/TagArgumentValueResolverPass.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/DependencyInjection/Compiler/TagViewEventListenerPass.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/DependencyInjection/Configuration.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/EventListener/PsrResponseListener.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -52,7 +52,7 @@ public function onKernelView(KernelEvent $event)
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             KernelEvents::VIEW => 'onKernelView',

src/Request/ArgumentValueResolver/Psr7ServerRequestResolver.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Resources/config/alias_ajgarlag_psr_http_message.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,24 +15,22 @@
 use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 
-require_once 'legacy-lt5.1.php';
-
 return static function (ContainerConfigurator $container) {
     $services = $container->services();
 
     $services->alias('ajgarlag_psr_http_message.psr7.http_message_factory', 'sensio_framework_extra.psr7.http_message_factory')
-        ->deprecate(...deprecate_build_arguments('ajgarlag/psr-http-message-bundle', '1.2', sprintf('The "%%alias_id%%" service alias is deprecated. Use "%s" instead.', HttpMessageFactoryInterface::class)))
+        ->deprecate('ajgarlag/psr-http-message-bundle', '1.2', sprintf('The "%%alias_id%%" service alias is deprecated. Use "%s" instead.', HttpMessageFactoryInterface::class))
     ;
 
     $services->alias('ajgarlag_psr_http_message.psr7.http_foundation_factory', 'sensio_framework_extra.psr7.http_foundation_factory')
-        ->deprecate(...deprecate_build_arguments('ajgarlag/psr-http-message-bundle', '1.2', sprintf('The "%%alias_id%%" service alias is deprecated. Use "%s" instead.', HttpFoundationFactoryInterface::class)))
+        ->deprecate('ajgarlag/psr-http-message-bundle', '1.2', sprintf('The "%%alias_id%%" service alias is deprecated. Use "%s" instead.', HttpFoundationFactoryInterface::class))
     ;
 
     $services->alias('ajgarlag_psr_http_message.psr7.argument_value_resolver.server_request', 'sensio_framework_extra.psr7.argument_value_resolver.server_request')
-        ->deprecate(...deprecate_build_arguments('ajgarlag/psr-http-message-bundle', '1.2', 'The "%%alias_id%%" service alias is deprecated.'))
+        ->deprecate('ajgarlag/psr-http-message-bundle', '1.2', 'The "%%alias_id%%" service alias is deprecated.')
     ;
 
     $services->alias('ajgarlag_psr_http_message.psr7.listener.response', 'sensio_framework_extra.psr7.listener.response')
-        ->deprecate(...deprecate_build_arguments('ajgarlag/psr-http-message-bundle', '1.2', 'The "%%alias_id%%" service alias is deprecated.'))
+        ->deprecate('ajgarlag/psr-http-message-bundle', '1.2', 'The "%%alias_id%%" service alias is deprecated.')
     ;
 };

src/Resources/config/alias_sensio_framework_extra.php

@@ -3,8 +3,8 @@
 /*
  * PsrHttpMessageBundle by @ajgarlag
  *
- * Copyright (c) 2010-2021 Fabien Potencier
- * Copyright (c) 2021 Antonio J. García Lagar
+ * Copyright (c) 2010-2022 Fabien Potencier
+ * Copyright (c) 2022 Antonio J. García Lagar
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,24 +15,22 @@
 use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 
-require_once 'legacy-lt5.1.php';
-
 return static function (ContainerConfigurator $container) {
     $services = $container->services();
 
     $services->alias('sensio_framework_extra.psr7.http_message_factory', 'ajgarlag_psr_http_message.psr7.http_message_factory')
-        ->deprecate(...deprecate_build_arguments('ajgarlag/psr-http-message-bundle', '1.1', sprintf('The "%%alias_id%%" service alias is deprecated. Use "%s" instead.', HttpMessageFactoryInterface::class)))
+        ->deprecate('ajgarlag/psr-http-message-bundle', '1.1', sprintf('The "%%alias_id%%" service alias is deprecated. Use "%s" instead.', HttpMessageFactoryInterface::class))
     ;
 
     $services->alias('sensio_framework_extra.psr7.http_foundation_factory', 'ajgarlag_psr_http_message.psr7.http_foundation_factory')
-        ->deprecate(...deprecate_build_arguments('ajgarlag/psr-http-message-bundle', '1.1', sprintf('The "%%alias_id%%" service alias is deprecated. Use "%s" instead.', HttpFoundationFactoryInterface::class)))
+        ->deprecate('ajgarlag/psr-http-message-bundle', '1.1', sprintf('The "%%alias_id%%" service alias is deprecated. Use "%s" instead.', HttpFoundationFactoryInterface::class))
     ;
 
     $services->alias('sensio_framework_extra.psr7.argument_value_resolver.server_request', 'ajgarlag_psr_http_message.psr7.argument_value_resolver.server_request')
-        ->deprecate(...deprecate_build_arguments('ajgarlag/psr-http-message-bundle', '1.1', 'The "%%alias_id%%" service alias is deprecated.'))
+        ->deprecate('ajgarlag/psr-http-message-bundle', '1.1', 'The "%%alias_id%%" service alias is deprecated.')
     ;
 
     $services->alias('sensio_framework_extra.psr7.listener.response', 'ajgarlag_psr_http_message.psr7.listener.response')
-        ->deprecate(...deprecate_build_arguments('ajgarlag/psr-http-message-bundle', '1.1', 'The "%%alias_id%%" service alias is deprecated.'))
+        ->deprecate('ajgarlag/psr-http-message-bundle', '1.1', 'The "%%alias_id%%" service alias is deprecated.')
     ;
 };