Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Tests/EventListener/PsrResponseListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
68 changes: 0 additions & 68 deletions Tests/Fixtures/App/Kernel44.php

This file was deleted.

4 changes: 1 addition & 3 deletions Tests/Functional/ControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Expand Down Expand Up @@ -50,6 +48,6 @@ public function testMessageAction()

protected static function getKernelClass(): string
{
return SymfonyKernel::VERSION_ID >= 50200 ? Kernel::class : Kernel44::class;
return Kernel::class;
}
}
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.1-dev"
"dev-main": "2.2-dev"
}
}
}