From 49e3d6f092ed9b30ce256be0559e5f8fcbe242ba Mon Sep 17 00:00:00 2001 From: SonataCI Date: Sat, 7 Dec 2024 15:36:54 +0000 Subject: [PATCH 1/3] DevKit updates --- .github/workflows/test.yaml | 20 +++++++------------- rector.php | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6c3133ef4..b4a28df65 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -30,7 +30,6 @@ jobs: strategy: matrix: php-version: - - '8.0' - '8.1' - '8.2' - '8.3' @@ -39,30 +38,25 @@ jobs: symfony-require: [''] variant: [normal] include: - - php-version: '8.0' + - php-version: '8.1' dependencies: lowest allowed-to-fail: false variant: normal - php-version: '8.3' dependencies: highest allowed-to-fail: false - symfony-require: 5.4.* - variant: symfony/symfony:"5.4.*" - - php-version: '8.3' - dependencies: highest - allowed-to-fail: false - symfony-require: 6.3.* - variant: symfony/symfony:"6.3.*" + symfony-require: 6.4.* + variant: symfony/symfony:"6.4.*" - php-version: '8.3' dependencies: highest allowed-to-fail: false - symfony-require: 6.4.* - variant: symfony/symfony:"6.4.*" + symfony-require: 7.1.* + variant: symfony/symfony:"7.1.*" - php-version: '8.3' dependencies: highest allowed-to-fail: false - symfony-require: 7.0.* - variant: symfony/symfony:"7.0.*" + symfony-require: 7.2.* + variant: symfony/symfony:"7.2.*" steps: - name: Checkout diff --git a/rector.php b/rector.php index 744632387..d57c8f491 100644 --- a/rector.php +++ b/rector.php @@ -31,7 +31,7 @@ ]); $rectorConfig->sets([ - LevelSetList::UP_TO_PHP_80, + LevelSetList::UP_TO_PHP_81, PHPUnitSetList::PHPUNIT_90, PHPUnitSetList::PHPUNIT_CODE_QUALITY, ]); From eccf2baae26c52e757da411ef4e83fb036fd1d21 Mon Sep 17 00:00:00 2001 From: SonataCI Date: Sat, 7 Dec 2024 17:11:28 +0000 Subject: [PATCH 2/3] DevKit updates --- rector.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rector.php b/rector.php index d57c8f491..295ccef6c 100644 --- a/rector.php +++ b/rector.php @@ -19,6 +19,7 @@ use Rector\Config\RectorConfig; use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector; +use Rector\Php81\Rector\Property\ReadOnlyPropertyRector; use Rector\PHPUnit\CodeQuality\Rector\Class_\NarrowUnusedSetUpDefinedPropertyRector; use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector; use Rector\PHPUnit\Set\PHPUnitSetList; @@ -40,6 +41,7 @@ $rectorConfig->importShortClasses(false); $rectorConfig->skip([ ExceptionHandlerTypehintRector::class, + ReadOnlyPropertyRector::class, PreferPHPUnitThisCallRector::class, NarrowUnusedSetUpDefinedPropertyRector::class, ]); From f872f49e27ad91831606a6661d906ab6e2f5d85a Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sat, 7 Dec 2024 19:05:25 +0100 Subject: [PATCH 3/3] Fix --- tests/Functional/Frontend/ExceptionsTest.php | 4 ++-- tests/Functional/Frontend/PageTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Functional/Frontend/ExceptionsTest.php b/tests/Functional/Frontend/ExceptionsTest.php index d51b55071..ac1c5d7b8 100644 --- a/tests/Functional/Frontend/ExceptionsTest.php +++ b/tests/Functional/Frontend/ExceptionsTest.php @@ -16,8 +16,8 @@ use Doctrine\ORM\EntityManagerInterface; use Sonata\PageBundle\Tests\App\Entity\SonataPagePage; use Sonata\PageBundle\Tests\App\Entity\SonataPageSite; +use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\BrowserKit\AbstractBrowser; use Symfony\Component\BrowserKit\Cookie; use Symfony\Component\HttpFoundation\Session\SessionFactoryInterface; use Symfony\Component\Security\Core\User\OidcUser; @@ -97,7 +97,7 @@ private function prepareData(): void * Normally this would happen via an interactive login. * Part of this logic is also copied from AbstractBrowser::loginUser(). */ - private function becomeEditor(AbstractBrowser $client): void + private function becomeEditor(KernelBrowser $client): void { $sessionFactory = self::getContainer()->get('session.factory'); \assert($sessionFactory instanceof SessionFactoryInterface); diff --git a/tests/Functional/Frontend/PageTest.php b/tests/Functional/Frontend/PageTest.php index 485ad3c0e..e7455b5c4 100644 --- a/tests/Functional/Frontend/PageTest.php +++ b/tests/Functional/Frontend/PageTest.php @@ -18,8 +18,8 @@ use Sonata\PageBundle\Tests\App\Entity\SonataPageBlock; use Sonata\PageBundle\Tests\App\Entity\SonataPagePage; use Sonata\PageBundle\Tests\App\Entity\SonataPageSite; +use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\BrowserKit\AbstractBrowser; use Symfony\Component\BrowserKit\Cookie; use Symfony\Component\HttpFoundation\Session\SessionFactoryInterface; @@ -366,7 +366,7 @@ private function prepareGlobalPageData(): void * Normally this would happen via an interactive login. * Part of this logic is also copied from AbstractBrowser::loginUser(). */ - private function becomeEditor(AbstractBrowser $client): void + private function becomeEditor(KernelBrowser $client): void { $sessionFactory = self::getContainer()->get('session.factory'); \assert($sessionFactory instanceof SessionFactoryInterface);