Drop support for Symfony 4

derrabus · derrabus · commit b360b35715b2 · 2023-04-20T15:20:01.000+02:00
diff --git 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
@@ -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
@@ -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
diff --git 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 <me@derrabus.de>
@@ -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
@@ -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"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@ public function testDoesNotConvertControllerResult()`
`48`	`48`
`49`	`49`	`private function createEventMock($controllerResult): ViewEvent`
`50`	`50`	`{`
`51`		`- return new ViewEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST, $controllerResult);`
	`51`	`+ return new ViewEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $controllerResult);`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@`
`12`	`12`	`namespace Symfony\Bridge\PsrHttpMessage\Tests\Functional;`
`13`	`13`
`14`	`14`	`use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\App\Kernel;`
`15`		`-use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\App\Kernel44;`
`16`	`15`	`use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;`
`17`		`-use Symfony\Component\HttpKernel\Kernel as SymfonyKernel;`
`18`	`16`
`19`	`17`	`/**`
`20`	`18`	`* @author Alexander M. Turek <me@derrabus.de>`
`@@ -50,6 +48,6 @@ public function testMessageAction()`
`50`	`48`
`51`	`49`	`protected static function getKernelClass(): string`
`52`	`50`	`{`
`53`		`- return SymfonyKernel::VERSION_ID >= 50200 ? Kernel::class : Kernel44::class;`
	`51`	`+ return Kernel::class;`
`54`	`52`	`}`
`55`	`53`	`}`