From b360b35715b26445ce27efa72ef04a7227f1afa8 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 20 Apr 2023 15:15:00 +0200 Subject: [PATCH] Drop support for Symfony 4 --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 5 ++ .../EventListener/PsrResponseListenerTest.php | 2 +- Tests/Fixtures/App/Kernel44.php | 68 ------------------- Tests/Functional/ControllerTest.php | 4 +- composer.json | 18 ++--- 6 files changed, 17 insertions(+), 82 deletions(-) delete mode 100644 Tests/Fixtures/App/Kernel44.php diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd976fa..6a67387 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.1.3', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] include: - php: '7.4' deps: lowest diff --git a/CHANGELOG.md b/CHANGELOG.md index 87816cc..06f1435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +# 2.2.0 (TBA) + +* Drop support for Symfony 4 +* Bump minimum version of PHP to 7.2 + # 2.1.3 (2022-09-05) * Ignore invalid HTTP headers when creating PSR7 objects diff --git a/Tests/EventListener/PsrResponseListenerTest.php b/Tests/EventListener/PsrResponseListenerTest.php index 9a94b20..3f6060c 100644 --- a/Tests/EventListener/PsrResponseListenerTest.php +++ b/Tests/EventListener/PsrResponseListenerTest.php @@ -48,6 +48,6 @@ public function testDoesNotConvertControllerResult() private function createEventMock($controllerResult): ViewEvent { - return new ViewEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST, $controllerResult); + return new ViewEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $controllerResult); } } diff --git a/Tests/Fixtures/App/Kernel44.php b/Tests/Fixtures/App/Kernel44.php deleted file mode 100644 index 31ac7a1..0000000 --- a/Tests/Fixtures/App/Kernel44.php +++ /dev/null @@ -1,68 +0,0 @@ -add('/server-request', PsrRequestController::class.'::serverRequestAction')->setMethods(['GET']); - $routes->add('/request', PsrRequestController::class.'::requestAction')->setMethods(['POST']); - $routes->add('/message', PsrRequestController::class.'::messageAction')->setMethods(['PUT']); - } - - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void - { - $container->loadFromExtension('framework', [ - 'secret' => 'for your eyes only', - 'test' => true, - 'http_method_override' => false, - ]); - - $container->register('nyholm.psr_factory', Psr17Factory::class); - $container->setAlias(ResponseFactoryInterface::class, 'nyholm.psr_factory'); - $container->setAlias(ServerRequestFactoryInterface::class, 'nyholm.psr_factory'); - $container->setAlias(StreamFactoryInterface::class, 'nyholm.psr_factory'); - $container->setAlias(UploadedFileFactoryInterface::class, 'nyholm.psr_factory'); - - $container->register(HttpFoundationFactoryInterface::class, HttpFoundationFactory::class)->setAutowired(true)->setAutoconfigured(true); - $container->register(HttpMessageFactoryInterface::class, PsrHttpFactory::class)->setAutowired(true)->setAutoconfigured(true); - $container->register(PsrResponseListener::class)->setAutowired(true)->setAutoconfigured(true); - $container->register(PsrServerRequestResolver::class)->setAutowired(true)->setAutoconfigured(true); - - $container->register('logger', NullLogger::class); - $container->register(PsrRequestController::class)->setPublic(true)->setAutowired(true); - } -} diff --git a/Tests/Functional/ControllerTest.php b/Tests/Functional/ControllerTest.php index 0b88405..ab8e11f 100644 --- a/Tests/Functional/ControllerTest.php +++ b/Tests/Functional/ControllerTest.php @@ -12,9 +12,7 @@ namespace Symfony\Bridge\PsrHttpMessage\Tests\Functional; use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\App\Kernel; -use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\App\Kernel44; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\HttpKernel\Kernel as SymfonyKernel; /** * @author Alexander M. Turek @@ -50,6 +48,6 @@ public function testMessageAction() protected static function getKernelClass(): string { - return SymfonyKernel::VERSION_ID >= 50200 ? Kernel::class : Kernel44::class; + return Kernel::class; } } diff --git a/composer.json b/composer.json index 0282307..07968ad 100644 --- a/composer.json +++ b/composer.json @@ -16,17 +16,17 @@ } ], "require": { - "php": ">=7.1", + "php": ">=7.2.5", "psr/http-message": "^1.0", - "symfony/http-foundation": "^4.4 || ^5.0 || ^6.0" + "symfony/http-foundation": "^5.4 || ^6.0" }, "require-dev": { - "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0", - "symfony/config": "^4.4 || ^5.0 || ^6.0", - "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0", - "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0", - "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0", - "symfony/phpunit-bridge": "^5.4@dev || ^6.0", + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/config": "^5.4 || ^6.0", + "symfony/event-dispatcher": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/http-kernel": "^5.4 || ^6.0", + "symfony/phpunit-bridge": "^6.2", "nyholm/psr7": "^1.1", "psr/log": "^1.1 || ^2 || ^3" }, @@ -41,7 +41,7 @@ }, "extra": { "branch-alias": { - "dev-main": "2.1-dev" + "dev-main": "2.2-dev" } } }