Merge 3.x into 4.x

sonata-project · Dec 8, 2024 · 624f92f · 624f92f
2 parents 520de25 + 0569109
commit 624f92f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     ],
     "homepage": "https://docs.sonata-project.org/projects/exporter",
     "require": {
-        "php": "^8.0"
+        "php": "^8.1"
     },
     "require-dev": {
         "doctrine/dbal": "^3.1",
@@ -42,13 +42,13 @@
         "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/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/property-access": "^5.4 || ^6.2 || ^7.0",
-        "symfony/routing": "^5.4 || ^6.2 || ^7.0",
+        "symfony/config": "^6.4 || ^7.1",
+        "symfony/dependency-injection": "^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/property-access": "^6.4 || ^7.1",
+        "symfony/routing": "^6.4 || ^7.1",
         "vimeo/psalm": "^5.0"
     },
     "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,
     ]);

diff --git a/src/Source/AbstractXmlSourceIterator.php b/src/Source/AbstractXmlSourceIterator.php
@@ -104,8 +104,8 @@ final public function rewind(): void
     {
         $this->parser = xml_parser_create();
         xml_set_object($this->parser, $this);
-        xml_set_element_handler($this->parser, [$this, 'tagStart'], [$this, 'tagEnd']);
-        xml_set_character_data_handler($this->parser, [$this, 'tagContent']);
+        xml_set_element_handler($this->parser, $this->tagStart(...), $this->tagEnd(...));
+        xml_set_character_data_handler($this->parser, $this->tagContent(...));
         xml_parser_set_option($this->parser, \XML_OPTION_CASE_FOLDING, 0);
         xml_parser_set_option($this->parser, \XML_OPTION_SKIP_WHITE, 0);