Merge branch '2.x' into 3.x

.github/workflows/qa.yaml

@@ -65,3 +65,28 @@ jobs:
 
             - name: Psalm
               run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.1
+
+    rector:
+        name: Rector
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v3
+
+            - name: Install PHP with extensions
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.1'
+                  coverage: none
+                  tools: composer:v2
+
+            - name: Install Composer dependencies (highest)
+              uses: ramsey/composer-install@v2
+              with:
+                  dependency-versions: highest
+                  composer-options: --prefer-dist --prefer-stable
+
+            - name: Rector
+              run: vendor/bin/rector --no-progress-bar --dry-run

Makefile

@@ -100,3 +100,7 @@ phpstan:
 psalm:
 	vendor/bin/psalm --php-version=8.1
 .PHONY: psalm
+
+rector:
+	vendor/bin/rector
+.PHONY: rector

composer.json

@@ -22,7 +22,7 @@
     ],
     "homepage": "https://docs.sonata-project.org/projects/exporter",
     "require": {
-        "php": "^7.3 || ^8.0"
+        "php": "^7.4 || ^8.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.13",
@@ -42,6 +42,7 @@
         "propel/propel1": "^1.6",
         "psalm/plugin-phpunit": "^0.16",
         "psalm/plugin-symfony": "^3.0",
+        "rector/rector": "^0.12",
         "symfony/config": "^4.4 || ^5.3 || ^6.0",
         "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0",
         "symfony/http-foundation": "^4.4 || ^5.3 || ^6.0",

rector.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * DO NOT EDIT THIS FILE!
+ *
+ * It's auto-generated by sonata-project/dev-kit package.
+ */
+
+use Rector\Config\RectorConfig;
+use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
+use Rector\Php71\Rector\FuncCall\CountOnNullRector;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ]);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_74,
+    ]);
+
+    $rectorConfig->importNames();
+    $rectorConfig->disableImportShortClasses();
+    $rectorConfig->skip([
+        CountOnNullRector::class,
+        ExceptionHandlerTypehintRector::class,
+    ]);
+};

src/Exporter.php

@@ -24,7 +24,7 @@ final class Exporter
     /**
      * @var array<TypedWriterInterface>
      */
-    private $writers;
+    private array $writers;
 
     /**
      * @param array<TypedWriterInterface> $writers an array of allowed typed writers, indexed by format name

src/Handler.php

@@ -17,15 +17,9 @@
 
 final class Handler
 {
-    /**
-     * @var \Iterator
-     */
-    private $source;
-
-    /**
-     * @var WriterInterface
-     */
-    private $writer;
+    private \Iterator $source;
+
+    private WriterInterface $writer;
 
     public function __construct(\Iterator $source, WriterInterface $writer)
     {

src/Source/ChainSourceIterator.php

@@ -18,7 +18,7 @@ final class ChainSourceIterator implements SourceIteratorInterface
     /**
      * @var \ArrayIterator<array-key, \Iterator>
      */
-    private $sources;
+    private \ArrayIterator $sources;
 
     /**
      * @param array<\Iterator> $sources

src/Source/CsvSourceIterator.php

@@ -20,10 +20,7 @@
  */
 final class CsvSourceIterator implements SourceIteratorInterface
 {
-    /**
-     * @var string
-     */
-    private $filename;
+    private string $filename;
 
     /**
      * @var resource|null
@@ -32,35 +29,20 @@ final class CsvSourceIterator implements SourceIteratorInterface
      */
     private $file;
 
-    /**
-     * @var string
-     */
-    private $delimiter;
+    private string $delimiter;
 
-    /**
-     * @var string
-     */
-    private $enclosure;
+    private string $enclosure;
 
-    /**
-     * @var string
-     */
-    private $escape;
+    private string $escape;
 
-    /**
-     * @var bool
-     */
-    private $hasHeaders;
+    private bool $hasHeaders;
 
     /**
      * @var array<string|null>
      */
-    private $columns = [];
+    private array $columns = [];
 
-    /**
-     * @var int
-     */
-    private $position = 0;
+    private int $position = 0;
 
     /**
      * @var array<string|null>|false

src/Source/DoctrineDBALConnectionSourceIterator.php

@@ -18,30 +18,21 @@
 
 final class DoctrineDBALConnectionSourceIterator implements SourceIteratorInterface
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var string
-     */
-    private $query;
+    private string $query;
 
     /**
      * @var mixed[]
      */
-    private $parameters;
+    private array $parameters;
 
     /**
      * @var array<string, mixed>|false
      */
     private $current;
 
-    /**
-     * @var int
-     */
-    private $position = 0;
+    private int $position = 0;
 
     /**
      * @var Result

src/Source/DoctrineODMQuerySourceIterator.php

@@ -17,15 +17,9 @@
 
 final class DoctrineODMQuerySourceIterator extends AbstractPropertySourceIterator
 {
-    /**
-     * @var Query
-     */
-    private $query;
+    private Query $query;
 
-    /**
-     * @var int
-     */
-    private $batchSize;
+    private int $batchSize;
 
     /**
      * @param array<string> $fields Fields to export

src/Source/DoctrineORMQuerySourceIterator.php

@@ -20,15 +20,9 @@
  */
 class DoctrineORMQuerySourceIterator extends AbstractPropertySourceIterator
 {
-    /**
-     * @var Query
-     */
-    protected $query;
+    protected Query $query;
 
-    /**
-     * @var int
-     */
-    private $batchSize;
+    private int $batchSize;
 
     /**
      * @param array<string> $fields Fields to export

src/Source/PDOStatementSourceIterator.php

@@ -17,25 +17,16 @@
 
 final class PDOStatementSourceIterator implements SourceIteratorInterface
 {
-    /**
-     * @var \PDOStatement
-     */
-    private $statement;
+    private \PDOStatement $statement;
 
     /**
      * @var mixed
      */
     private $current;
 
-    /**
-     * @var int
-     */
-    private $position = 0;
+    private int $position = 0;
 
-    /**
-     * @var bool
-     */
-    private $rewinded = false;
+    private bool $rewinded = false;
 
     public function __construct(\PDOStatement $statement)
     {

src/Source/PropelCollectionSourceIterator.php

@@ -24,10 +24,7 @@
  */
 final class PropelCollectionSourceIterator extends AbstractPropertySourceIterator
 {
-    /**
-     * @var \PropelCollection
-     */
-    private $collection;
+    private \PropelCollection $collection;
 
     /**
      * @param array<string> $fields Fields to export
@@ -36,7 +33,7 @@ public function __construct(\PropelCollection $collection, array $fields, string
     {
         @trigger_error(sprintf(
             'The %s class is deprecated since sonata-project/exporter 2.x, to be removed in version 3.0.',
-            __CLASS__,
+            self::class,
         ), \E_USER_DEPRECATED);
 
         $this->collection = clone $collection;

src/Source/SymfonySitemapSourceIterator.php

@@ -18,25 +18,16 @@
 
 final class SymfonySitemapSourceIterator implements SourceIteratorInterface
 {
-    /**
-     * @var RouterInterface
-     */
-    private $router;
+    private RouterInterface $router;
 
-    /**
-     * @var \Iterator
-     */
-    private $source;
+    private \Iterator $source;
 
-    /**
-     * @var string
-     */
-    private $routeName;
+    private string $routeName;
 
     /**
      * @var array<string, mixed>
      */
-    private $parameters;
+    private array $parameters;
 
     /**
      * @param array<string, mixed> $parameters

src/Source/XmlSourceIterator.php

@@ -20,15 +20,9 @@
  */
 final class XmlSourceIterator extends AbstractXmlSourceIterator
 {
-    /**
-     * @var string
-     */
-    private $mainTag;
+    private string $mainTag;
 
-    /**
-     * @var string
-     */
-    private $dataTag;
+    private string $dataTag;
 
     public function __construct(string $filename, string $mainTag = 'datas', string $dataTag = 'data')
     {

src/Test/AbstractTypedWriterTestCase.php

@@ -25,10 +25,7 @@
  */
 abstract class AbstractTypedWriterTestCase extends TestCase
 {
-    /**
-     * @var TypedWriterInterface
-     */
-    private $writer;
+    private TypedWriterInterface $writer;
 
     protected function setUp(): void
     {