From 27d5afc503f46ca0c8751961511509d2e07fcd8c Mon Sep 17 00:00:00 2001 From: Massimiliano Arione Date: Mon, 20 May 2024 17:30:16 +0200 Subject: [PATCH] fix deprecation --- .github/workflows/build.yaml | 15 ++++++------- composer.json | 22 +++++++++---------- .../KnpPaginatorExtension.php | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b670ae5..f82bbf2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,11 +6,11 @@ on: jobs: phpstan: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: PHPStan steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run PHPStan uses: docker://oskarstark/phpstan-ga env: @@ -18,11 +18,11 @@ jobs: with: args: analyse cs-fixer: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: PHP-CS-Fixer steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run PHP-CS-Fixer uses: docker://oskarstark/php-cs-fixer-ga tests: @@ -36,12 +36,11 @@ jobs: dependency: - '' symfony: - - '6.3.*' - '6.4.*' - '7.0.*' include: - php: '8.1' - symfony: '6.3.*' + symfony: '6.4.*' dependency: 'lowest' - php: '8.2' symfony: '7.0.*' @@ -52,7 +51,7 @@ jobs: name: PHPUnit PHP ${{ matrix.php }} ${{ matrix.dependency }} (Symfony ${{ matrix.symfony }}) steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -64,7 +63,7 @@ jobs: run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }} diff --git a/composer.json b/composer.json index 5c6e097..e9724da 100644 --- a/composer.json +++ b/composer.json @@ -18,20 +18,20 @@ "require": { "php": "^8.1", "knplabs/knp-components": "^4.1", - "symfony/config": "^6.3 || ^7.0", - "symfony/dependency-injection": "^6.3 || ^7.0", - "symfony/event-dispatcher": "^6.3 || ^7.0", - "symfony/http-foundation": "^6.3 || ^7.0", - "symfony/http-kernel": "^6.3 || ^7.0", - "symfony/routing": "^6.3 || ^7.0", - "symfony/translation": "^6.3 || ^7.0", + "symfony/config": "^6.4 || ^7.0", + "symfony/dependency-injection": "^6.4 || ^7.0", + "symfony/event-dispatcher": "^6.4 || ^7.0", + "symfony/http-foundation": "^6.4 || ^7.0", + "symfony/http-kernel": "^6.4 || ^7.0", + "symfony/routing": "^6.4 || ^7.0", + "symfony/translation": "^6.4 || ^7.0", "twig/twig": "^3.0" }, "require-dev": { - "phpstan/phpstan": "^1.9", - "phpunit/phpunit": "^9.5", - "symfony/expression-language": "^6.3 || ^7.0", - "symfony/templating": "^6.3 || ^7.0" + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^9.6", + "symfony/expression-language": "^6.4 || ^7.0", + "symfony/templating": "^6.4 || ^7.0" }, "autoload": { "psr-4": { diff --git a/src/DependencyInjection/KnpPaginatorExtension.php b/src/DependencyInjection/KnpPaginatorExtension.php index 4e4c1b0..04989d1 100644 --- a/src/DependencyInjection/KnpPaginatorExtension.php +++ b/src/DependencyInjection/KnpPaginatorExtension.php @@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\Extension\Extension; final class KnpPaginatorExtension extends Extension {