Merge 4.x into 5.x

sonata-project · Dec 17, 2023 · dad8612 · dad8612
2 parents 3c2c756 + a2a6d6f
commit dad8612
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 18 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -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

diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "doctrine/data-fixtures": "^1.4",
+        "doctrine/data-fixtures": "^1.6",
         "friendsofphp/php-cs-fixer": "^3.4",
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
@@ -56,11 +56,12 @@
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^0.18",
-        "sonata-project/block-bundle": "^4.2",
+        "sonata-project/block-bundle": "^4.2 || ^5.0",
         "symfony/browser-kit": "^5.4 || ^6.2",
         "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": {

diff --git a/rector.php b/rector.php
@@ -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;
@@ -41,7 +40,6 @@
     $rectorConfig->importNames();
     $rectorConfig->importShortClasses(false);
     $rectorConfig->skip([
-        CountOnNullRector::class,
         ExceptionHandlerTypehintRector::class,
         AddSeeTestAnnotationRector::class,
         PreferPHPUnitThisCallRector::class,

diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -73,15 +73,14 @@ protected function configureRoutes(RoutingConfigurator $routes): void
         $routes->import(sprintf('%s/config/routes.yaml', $this->getProjectDir()));
     }
 
-    /**
-     * @psalm-suppress DeprecatedClass
-     */
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
         $loader->load(__DIR__.'/config/config.yaml');
 
         if (!class_exists(IsGranted::class)) {
             $loader->load(__DIR__.'/config/config_symfony_v5.yaml');
+        } else {
+            $loader->load(__DIR__.'/config/config_symfony_v6.yaml');
         }
 
         if (class_exists(HttpCacheHandler::class)) {

diff --git a/tests/App/DataFixtures/MongoDB/BookFixtures.php b/tests/App/DataFixtures/MongoDB/BookFixtures.php
@@ -24,15 +24,11 @@ final class BookFixtures extends Fixture implements DependentFixtureInterface
 {
     public function load(ObjectManager $manager): void
     {
-        $author = $this->getReference(AuthorFixtures::AUTHOR);
-
-        \assert($author instanceof Author);
+        $author = $this->getReference(AuthorFixtures::AUTHOR, Author::class);
 
         $book = new Book('book_id', 'Don Quixote', $author);
 
-        $category = $this->getReference(CategoryFixtures::CATEGORY);
-
-        \assert($category instanceof Category);
+        $category = $this->getReference(CategoryFixtures::CATEGORY, Category::class);
 
         $book->addCategory($category);
 

diff --git a/tests/App/config/config.yaml b/tests/App/config/config.yaml
@@ -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
diff --git a/tests/App/config/config_symfony_v6.yaml b/tests/App/config/config_symfony_v6.yaml
@@ -0,0 +1,11 @@
+framework:
+    annotations: false
+    handle_all_throwables: true
+    php_errors:
+        log: true
+    session:
+        cookie_secure: auto
+        cookie_samesite: lax
+        handler_id: null
+    validation:
+        email_validation_mode: html5
diff --git a/tests/Functional/BasePantherTestCase.php b/tests/Functional/BasePantherTestCase.php
@@ -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,
         ]);