Skip to content

Commit 0554ffb

Browse files
DevKit updates for 4.x branch (#1785)
* DevKit updates * DevKit updates * Fix --------- Co-authored-by: Vincent Langlet <[email protected]>
1 parent cb9bd75 commit 0554ffb

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

.github/workflows/test.yaml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
strategy:
3131
matrix:
3232
php-version:
33-
- '8.0'
3433
- '8.1'
3534
- '8.2'
3635
- '8.3'
@@ -39,30 +38,25 @@ jobs:
3938
symfony-require: ['']
4039
variant: [normal]
4140
include:
42-
- php-version: '8.0'
41+
- php-version: '8.1'
4342
dependencies: lowest
4443
allowed-to-fail: false
4544
variant: normal
4645
- php-version: '8.3'
4746
dependencies: highest
4847
allowed-to-fail: false
49-
symfony-require: 5.4.*
50-
variant: symfony/symfony:"5.4.*"
51-
- php-version: '8.3'
52-
dependencies: highest
53-
allowed-to-fail: false
54-
symfony-require: 6.3.*
55-
variant: symfony/symfony:"6.3.*"
48+
symfony-require: 6.4.*
49+
variant: symfony/symfony:"6.4.*"
5650
- php-version: '8.3'
5751
dependencies: highest
5852
allowed-to-fail: false
59-
symfony-require: 6.4.*
60-
variant: symfony/symfony:"6.4.*"
53+
symfony-require: 7.1.*
54+
variant: symfony/symfony:"7.1.*"
6155
- php-version: '8.3'
6256
dependencies: highest
6357
allowed-to-fail: false
64-
symfony-require: 7.0.*
65-
variant: symfony/symfony:"7.0.*"
58+
symfony-require: 7.2.*
59+
variant: symfony/symfony:"7.2.*"
6660

6761
steps:
6862
- name: Checkout

rector.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
use Rector\Config\RectorConfig;
2121
use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
22+
use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
2223
use Rector\PHPUnit\CodeQuality\Rector\Class_\NarrowUnusedSetUpDefinedPropertyRector;
2324
use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
2425
use Rector\PHPUnit\Set\PHPUnitSetList;
@@ -31,7 +32,7 @@
3132
]);
3233

3334
$rectorConfig->sets([
34-
LevelSetList::UP_TO_PHP_80,
35+
LevelSetList::UP_TO_PHP_81,
3536
PHPUnitSetList::PHPUNIT_90,
3637
PHPUnitSetList::PHPUNIT_CODE_QUALITY,
3738
]);
@@ -40,6 +41,7 @@
4041
$rectorConfig->importShortClasses(false);
4142
$rectorConfig->skip([
4243
ExceptionHandlerTypehintRector::class,
44+
ReadOnlyPropertyRector::class,
4345
PreferPHPUnitThisCallRector::class,
4446
NarrowUnusedSetUpDefinedPropertyRector::class,
4547
]);

tests/Functional/Frontend/ExceptionsTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
use Doctrine\ORM\EntityManagerInterface;
1717
use Sonata\PageBundle\Tests\App\Entity\SonataPagePage;
1818
use Sonata\PageBundle\Tests\App\Entity\SonataPageSite;
19+
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
1920
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
20-
use Symfony\Component\BrowserKit\AbstractBrowser;
2121
use Symfony\Component\BrowserKit\Cookie;
2222
use Symfony\Component\HttpFoundation\Session\SessionFactoryInterface;
2323
use Symfony\Component\Security\Core\User\OidcUser;
@@ -97,7 +97,7 @@ private function prepareData(): void
9797
* Normally this would happen via an interactive login.
9898
* Part of this logic is also copied from AbstractBrowser::loginUser().
9999
*/
100-
private function becomeEditor(AbstractBrowser $client): void
100+
private function becomeEditor(KernelBrowser $client): void
101101
{
102102
$sessionFactory = self::getContainer()->get('session.factory');
103103
\assert($sessionFactory instanceof SessionFactoryInterface);

tests/Functional/Frontend/PageTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
use Sonata\PageBundle\Tests\App\Entity\SonataPageBlock;
1919
use Sonata\PageBundle\Tests\App\Entity\SonataPagePage;
2020
use Sonata\PageBundle\Tests\App\Entity\SonataPageSite;
21+
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
2122
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
22-
use Symfony\Component\BrowserKit\AbstractBrowser;
2323
use Symfony\Component\BrowserKit\Cookie;
2424
use Symfony\Component\HttpFoundation\Session\SessionFactoryInterface;
2525

@@ -366,7 +366,7 @@ private function prepareGlobalPageData(): void
366366
* Normally this would happen via an interactive login.
367367
* Part of this logic is also copied from AbstractBrowser::loginUser().
368368
*/
369-
private function becomeEditor(AbstractBrowser $client): void
369+
private function becomeEditor(KernelBrowser $client): void
370370
{
371371
$sessionFactory = self::getContainer()->get('session.factory');
372372
\assert($sessionFactory instanceof SessionFactoryInterface);

0 commit comments

Comments
 (0)