Merge 2.x into 3.x

sonata-project · Dec 8, 2024 · 532376c · 532376c
2 parents 22b1ff6 + 2468b0f
commit 532376c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -20,15 +20,15 @@
     ],
     "homepage": "https://docs.sonata-project.org/projects/form-extensions",
     "require": {
-        "php": "^8.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.2 || ^7.0",
-        "symfony/form": "^5.4 || ^6.2 || ^7.0",
-        "symfony/options-resolver": "^5.4 || ^6.2 || ^7.0",
-        "symfony/property-access": "^5.4 || ^6.2 || ^7.0",
-        "symfony/security-csrf": "^5.4 || ^6.2 || ^7.0",
-        "symfony/translation": "^5.4 || ^6.2 || ^7.0",
+        "php": "^8.1",
+        "symfony/event-dispatcher": "^6.4 || ^7.1",
+        "symfony/form": "^6.4 || ^7.1",
+        "symfony/options-resolver": "^6.4 || ^7.1",
+        "symfony/property-access": "^6.4 || ^7.1",
+        "symfony/security-csrf": "^6.4 || ^7.1",
+        "symfony/translation": "^6.4 || ^7.1",
         "symfony/translation-contracts": "^2.5 || ^3.0",
-        "symfony/validator": "^5.4 || ^6.2 || ^7.0",
+        "symfony/validator": "^6.4 || ^7.1",
         "twig/twig": "^3.0"
     },
     "require-dev": {
@@ -45,14 +45,14 @@
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^1.1",
-        "symfony/config": "^5.4 || ^6.2 || ^7.0",
-        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
-        "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
-        "symfony/http-foundation": "^5.4 || ^6.2 || ^7.0",
-        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
-        "symfony/phpunit-bridge": "^6.2 || ^7.0",
-        "symfony/twig-bridge": "^5.4 || ^6.2 || ^7.0",
-        "symfony/twig-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/config": "^6.4 || ^7.1",
+        "symfony/dependency-injection": "^6.4 || ^7.1",
+        "symfony/framework-bundle": "^6.4 || ^7.1",
+        "symfony/http-foundation": "^6.4 || ^7.1",
+        "symfony/http-kernel": "^6.4 || ^7.1",
+        "symfony/phpunit-bridge": "^6.4 || ^7.1",
+        "symfony/twig-bridge": "^6.4.3 || ^7.1",
+        "symfony/twig-bundle": "^6.4 || ^7.1",
         "vimeo/psalm": "^5.8"
     },
     "minimum-stability": "dev",

diff --git a/rector.php b/rector.php
@@ -19,6 +19,8 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
+use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
+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 +42,8 @@
     $rectorConfig->importShortClasses(false);
     $rectorConfig->skip([
         ExceptionHandlerTypehintRector::class,
+        ReadOnlyPropertyRector::class,
+        NullToStrictStringFuncCallArgRector::class,
         PreferPHPUnitThisCallRector::class,
         NarrowUnusedSetUpDefinedPropertyRector::class,
     ]);

diff --git a/tests/Fixtures/Bundle/Validator/FooValidatorService.php b/tests/Fixtures/Bundle/Validator/FooValidatorService.php
@@ -26,7 +26,7 @@ final class FooValidatorService
     /**
      * @throws ValidatorException
      */
-    public function fooValidatorMethod(ErrorElement $errorElement, string $value): void
+    public function fooValidatorMethod(ErrorElement $errorElement, string $value): never
     {
         throw new ValidatorException($errorElement->getSubject().' is equal to '.$value);
     }