Merge 1.x into 2.x

sonata-project · Dec 8, 2024 · b27418e · b27418e
2 parents 1cddd07 + b7a53d0
commit b27418e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -9,17 +9,17 @@
         "Audit"
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "doctrine/collections": "^1.8 || ^2.0",
         "doctrine/dbal": "^3.6",
         "doctrine/event-manager": "^1.2 || ^2.0",
         "doctrine/orm": "^2.14 || ^3.0",
         "doctrine/persistence": "^3.0",
         "psr/clock": "^1.0",
-        "symfony/config": "^5.4 || ^6.2 || ^7.0",
-        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
-        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
-        "symfony/security-core": "^5.4 || ^6.2 || ^7.0",
+        "symfony/config": "^6.4 || ^7.1",
+        "symfony/dependency-injection": "^6.4 || ^7.1",
+        "symfony/http-kernel": "^6.4 || ^7.1",
+        "symfony/security-core": "^6.4 || ^7.1",
         "twig/twig": "^3.0"
     },
     "require-dev": {
@@ -38,15 +38,15 @@
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^1.1",
-        "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
-        "symfony/cache": "^5.4 || ^6.2 || ^7.0",
-        "symfony/filesystem": "^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/phpunit-bridge": "^6.2",
-        "symfony/security-bundle": "^5.4 || ^6.2 || ^7.0",
-        "symfony/twig-bundle": "^5.4 || ^6.2 || ^7.0",
-        "symfony/var-dumper": "^5.4 || ^6.2 || ^7.0",
+        "symfony/browser-kit": "^6.4 || ^7.1",
+        "symfony/cache": "^6.4 || ^7.1",
+        "symfony/filesystem": "^6.4 || ^7.1",
+        "symfony/framework-bundle": "^6.4 || ^7.1",
+        "symfony/http-foundation": "^6.4 || ^7.1",
+        "symfony/phpunit-bridge": "^6.4 || ^7.1",
+        "symfony/security-bundle": "^6.4 || ^7.1",
+        "symfony/twig-bundle": "^6.4 || ^7.1",
+        "symfony/var-dumper": "^6.4 || ^7.1",
         "vimeo/psalm": "^5.7"
     },
     "conflict": {

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