Merge 2.x into 3.x

sonata-project · Dec 18, 2023 · 2e11c71 · 2e11c71
2 parents 8c22537 + 844a2dd
commit 2e11c71
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -50,13 +50,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.*"
                     - php-version: '8.2'
                       dependencies: highest
                       allowed-to-fail: false

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -27,8 +27,9 @@
 HEADER;
 
 $rules = [
-    '@PHP74Migration' => true,
-    '@PHP74Migration:risky' => true,
+    '@PHP80Migration' => true,
+    '@PHP80Migration:risky' => true,
+    '@PHPUnit84Migration:risky' => true,
     '@PSR12' => true,
     '@PSR12:risky' => true,
     '@Symfony' => true,
@@ -42,6 +43,7 @@
     'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
     'no_useless_else' => true,
     'no_useless_return' => true,
+    'no_superfluous_elseif' => true,
     'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true],
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
@@ -51,16 +53,14 @@
         ['phpstan-template', 'phpstan-template-covariant', 'phpstan-extends', 'phpstan-implements', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return'],
         ['psalm-suppress', 'phpstan-ignore-next-line'],
         ['Assert\\*'],
-        ['ODM\\*'],
-        ['ORM\\*'],
     ]],
-    'php_unit_strict' => true,
-    'php_unit_test_case_static_method_calls' => true,
     'php_unit_data_provider_name' => true,
     'php_unit_data_provider_return_type' => true,
+    'php_unit_strict' => true,
+    'php_unit_test_case_static_method_calls' => true,
     'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress', 'phpstan-var']],
-    'single_line_throw' => false,
     'static_lambda' => true,
+    'single_line_throw' => false,
     'strict_comparison' => true,
     'strict_param' => true,
     'void_return' => false,

diff --git a/package-lock.json b/package-lock.json
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/src/Bridge/Symfony/DependencyInjection/Configuration.php b/src/Bridge/Symfony/DependencyInjection/Configuration.php
@@ -38,7 +38,7 @@ public function getConfigTreeBuilder(): TreeBuilder
     /**
      * Returns configuration for flash messages.
      *
-     * @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod
+     * @psalm-suppress UndefinedInterfaceMethod
      *
      * @see https://github.com/psalm/psalm-plugin-symfony/issues/174
      */

diff --git a/tests/Type/FormChoiceWidgetTest.php b/tests/Type/FormChoiceWidgetTest.php
@@ -36,7 +36,7 @@ public function testLabelRendering(): void
         );
 
         $html = $this->renderWidget($choice->createView());
-        if (0 !== preg_match("/7\..\../", Kernel::VERSION)) {
+        if (version_compare(Kernel::VERSION, '6.4.0', '>=')) {
             static::assertStringContainsString(
                 $this->cleanHtmlWhitespace(
                     <<<'HTML'