diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed32dbf..5540fd5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,11 +10,8 @@ jobs: max-parallel: 10 fail-fast: false matrix: - php: ['7.4', '8.0', '8.1'] + php: ['8.0', '8.1', '8.2'] sf_version: ['5.2.*', '5.4.*', '6.0.*'] - exclude: - - php: 7.4 - sf_version: 6.0.* steps: - name: Set up PHP @@ -45,7 +42,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@2.7.0 with: - php-version: 7.4 + php-version: 8.0 coverage: pcov - name: Checkout code @@ -56,5 +53,5 @@ jobs: - name: Run tests env: - PHP_VERSION: 7.4 + PHP_VERSION: '8.0' run: ./vendor/bin/phpunit -v --coverage-text diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 1ced2e5..bddfbbd 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -26,7 +26,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@2.7.0 with: - php-version: 7.4 + php-version: 8.0 - name: Download dependencies run: composer update --no-interaction --prefer-dist --no-progress --no-suggest --dev diff --git a/composer.json b/composer.json index 9d36001..8f377a4 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } }, "require": { - "php": ">=7.4", + "php": ">=8.0", "bref/bref": "^1.2|^2.0", "symfony/filesystem": "^5.2|^6.0", "symfony/http-kernel": "^5.2|^6.0", @@ -36,6 +36,7 @@ "symfony/config": "^5.2|^6.0", "symfony/dependency-injection": "^5.2|^6.0", "symfony/framework-bundle": "^5.2|^6.0", + "symfony/phpunit-bridge": "^6.0", "symfony/process": "^5.2|^6.0" }, "config": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 8b3119c..30eac16 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,4 +14,11 @@ + + + + + + + diff --git a/src/BrefKernel.php b/src/BrefKernel.php index 7d5d4dd..fe3bd27 100644 --- a/src/BrefKernel.php +++ b/src/BrefKernel.php @@ -54,7 +54,7 @@ public function handle($request, $type = HttpKernelInterface::MASTER_REQUEST, $c * We also need to prepare the Cache dir in Kernel::boot in case we are in a Console or worker context * in which Kernel::handle is not called. */ - public function boot() + public function boot(): void { $this->prepareCacheDir(parent::getCacheDir(), $this->getCacheDir()); $this->ensureLogDir($this->getLogDir()); diff --git a/src/HandlerResolver.php b/src/HandlerResolver.php index f9363e8..5e00372 100644 --- a/src/HandlerResolver.php +++ b/src/HandlerResolver.php @@ -31,7 +31,7 @@ public function __construct() /** * {@inheritDoc} */ - public function get($id) + public function get($id): mixed { $isComposed = strpos($id, ':') !== false; diff --git a/tests/Functional/App/config/packages/framework.yaml b/tests/Functional/App/config/packages/framework.yaml index 6089f4b..486a35e 100644 --- a/tests/Functional/App/config/packages/framework.yaml +++ b/tests/Functional/App/config/packages/framework.yaml @@ -1,7 +1,7 @@ framework: secret: '%env(APP_SECRET)%' #csrf_protection: true - #http_method_override: true + http_method_override: false # Enables session support. Note that the session will ONLY be started if you read or write from it. # Remove or comment this section to explicitly disable session support.