Skip to content

Commit

Permalink
Fix Symfony 7.0 compatibility, remove Symfony 5.2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
1ed committed Nov 30, 2023
1 parent aaa3cc4 commit 214d364
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
php: ['8.0', '8.1', '8.2', '8.3']
sf_version: ['5.2.*', '5.4.*', '6.4.*', '7.0.*']
sf_version: ['5.4.*', '6.4.*', '7.0.*']

steps:
- name: Set up PHP
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
"require": {
"php": ">=8.0",
"bref/bref": "^1.2|^2.0",
"symfony/filesystem": "^5.2|^6.0|^7.0",
"symfony/http-kernel": "^5.2|^6.0|^7.0",
"symfony/psr-http-message-bridge": "^2.1",
"symfony/runtime": "^5.2|^6.0|^7.0"
"symfony/filesystem": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4|^6.0|^7.0",
"symfony/psr-http-message-bridge": "^2.1|^6.4|^7.0",
"symfony/runtime": "^5.4|^6.0|^7.0"
},
"require-dev": {
"mnapoli/hard-mode": "^0.3.0",
"phpstan/phpstan": "^1.3",
"phpunit/phpunit": "^8.5.22",
"symfony/config": "^5.2|^6.0|^7.0",
"symfony/dependency-injection": "^5.2|^6.0|^7.0",
"symfony/framework-bundle": "^5.2|^6.0|^7.0",
"symfony/config": "^5.4|^6.0|^7.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/framework-bundle": "^5.4|^6.0|^7.0",
"symfony/phpunit-bridge": "^6.0|^7.0",
"symfony/process": "^5.2|^6.0|^7.0"
"symfony/process": "^5.4|^6.0|^7.0"
},
"config": {
"sort-packages": true,
Expand Down
2 changes: 1 addition & 1 deletion src/BrefKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function getLogDir(): string
*
* @see https://github.com/brefphp/symfony-bridge/pull/37
*/
public function handle($request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
public function handle($request, $type = HttpKernelInterface::MAIN_REQUEST, $catch = true): Response
{
$this->prepareCacheDir(parent::getCacheDir(), $this->getCacheDir());

Expand Down
2 changes: 0 additions & 2 deletions tests/Functional/App/src/Command/PingCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#[AsCommand('app:ping')]
class PingCommand extends Command
{
protected static $defaultName = 'app:ping';

protected function execute(InputInterface $input, OutputInterface $output): int
{
$output->writeln('Ok');
Expand Down
2 changes: 0 additions & 2 deletions tests/Functional/App/src/Command/WriteToCacheCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
#[AsCommand('write-to-cache')]
class WriteToCacheCommand extends Command
{
protected static $defaultName = 'write-to-cache';

/** @var CacheInterface */
private $systemCache;

Expand Down

0 comments on commit 214d364

Please sign in to comment.