Merge 2.x into 3.x

composer.json

@@ -21,7 +21,7 @@
     ],
     "homepage": "https://github.com/sonata-project/sonata-doctrine-extensions",
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "doctrine/dbal": "^3.4 || ^4.0",
         "doctrine/persistence": "^3.0.2"
     },
@@ -40,11 +40,11 @@
         "phpunit/phpunit": "^9.5.13",
         "psalm/plugin-phpunit": "^0.18",
         "rector/rector": "^1.1",
-        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
-        "symfony/doctrine-bridge": "^5.4 || ^6.2 || ^7.0",
-        "symfony/expression-language": "^5.4 || ^6.2 || ^7.0",
-        "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
-        "symfony/phpunit-bridge": "^6.2 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.1",
+        "symfony/doctrine-bridge": "^6.4 || ^7.1",
+        "symfony/expression-language": "^6.4 || ^7.1",
+        "symfony/framework-bundle": "^6.4 || ^7.1",
+        "symfony/phpunit-bridge": "^6.4 || ^7.1",
         "vimeo/psalm": "^5.0"
     },
     "conflict": {

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,
     ]);