Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DevKit updates for 4.x branch #836

Merged
merged 4 commits into from
Dec 16, 2023
Merged

DevKit updates for 4.x branch #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c09ad62
DevKit updates
SonataCI Dec 7, 2023
53ba558
DevKit updates
SonataCI Dec 7, 2023
0b25094
Use Firefox for panther tests
franmomu Dec 16, 2023
bb9722b
Add symfony/twig-bridge
franmomu Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ jobs:
- php-version: '8.2'
dependencies: highest
allowed-to-fail: false
symfony-require: 6.2.*
variant: symfony/symfony:"6.2.*"
symfony-require: 6.3.*
variant: symfony/symfony:"6.3.*"
- php-version: '8.2'
dependencies: highest
allowed-to-fail: false
symfony-require: 6.3.*
variant: symfony/symfony:"6.3.*"
symfony-require: 6.4.*
variant: symfony/symfony:"6.4.*"

steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"symfony/css-selector": "^5.4 || ^6.2",
"symfony/panther": "^2.0.1",
"symfony/phpunit-bridge": "^6.2",
"symfony/twig-bridge": "^5.4 || ^6.2",
"vimeo/psalm": "^5.7"
},
"conflict": {
Expand Down
2 changes: 0 additions & 2 deletions rector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

use Rector\Config\RectorConfig;
use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
use Rector\Php71\Rector\FuncCall\CountOnNullRector;
use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector;
use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
use Rector\PHPUnit\Set\PHPUnitLevelSetList;
Expand All @@ -41,7 +40,6 @@
$rectorConfig->importNames();
$rectorConfig->importShortClasses(false);
$rectorConfig->skip([
CountOnNullRector::class,
ExceptionHandlerTypehintRector::class,
AddSeeTestAnnotationRector::class,
PreferPHPUnitThisCallRector::class,
Expand Down
5 changes: 5 additions & 0 deletions tests/App/config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,8 @@ doctrine_mongodb:
dir: "%kernel.project_dir%/Document"
is_bundle: false
prefix: Sonata\DoctrineMongoDBAdminBundle\Tests\App\Document

sonata_admin:
options:
html5_validate: false
use_stickyforms: false
2 changes: 1 addition & 1 deletion tests/Functional/BasePantherTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ abstract class BasePantherTestCase extends PantherTestCase
protected function setUp(): void
{
$this->client = static::createPantherClient([
'browser' => PantherTestCase::CHROME,
'browser' => PantherTestCase::FIREFOX,
'connection_timeout_in_ms' => 5000,
'request_timeout_in_ms' => 60000,
]);
Expand Down