Merge 2.x into 3.x

rector.php

@@ -19,6 +19,7 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\NarrowUnusedSetUpDefinedPropertyRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
@@ -40,5 +41,6 @@
     $rectorConfig->skip([
         ExceptionHandlerTypehintRector::class,
         PreferPHPUnitThisCallRector::class,
+        NarrowUnusedSetUpDefinedPropertyRector::class,
     ]);
 };

src/Mapper/Builder/OptionsBuilder.php

@@ -28,7 +28,7 @@ final class OptionsBuilder
     private function __construct(
         private string $type,
         string $fieldName,
-        string $targetEntity
+        string $targetEntity,
     ) {
         $this->options['fieldName'] = $fieldName;
         $this->options['targetEntity'] = $targetEntity;

src/Model/BaseManager.php

@@ -30,7 +30,7 @@ abstract class BaseManager implements ManagerInterface, ClearableManagerInterfac
      */
     public function __construct(
         protected string $class,
-        protected ManagerRegistry $registry
+        protected ManagerRegistry $registry,
     ) {
     }