Updated Rector to commit bf2f6dd0e9a4b0abccdc345e588f1f713452848b

bf2f6dd0e9 [Php71] Skip iterable on CountOnNullRector (#1691)

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit45bdedca4f816bd4757927bb4025ea19::getLoader();
+return ComposerAutoloaderInit1b9205f82305e30ba10ce859891b7d1f::getLoader();

vendor/composer/autoload_classmap.php

@@ -1886,12 +1886,13 @@ return array(
     'Rector\\DependencyInjection\\Rector\\ClassMethod\\AddMethodParentCallRector' => $baseDir . '/rules/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector.php',
     'Rector\\DependencyInjection\\Rector\\Class_\\ActionInjectionToConstructorInjectionRector' => $baseDir . '/rules/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector.php',
     'Rector\\Doctrine\\NodeAnalyzer\\AssignPropertyFetchAnalyzer' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/AssignPropertyFetchAnalyzer.php',
-    'Rector\\Doctrine\\NodeAnalyzer\\AttributeArgValueResolver' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/AttributeArgValueResolver.php',
+    'Rector\\Doctrine\\NodeAnalyzer\\AttributeCleaner' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/AttributeCleaner.php',
     'Rector\\Doctrine\\NodeAnalyzer\\AttributeFinder' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/AttributeFinder.php',
     'Rector\\Doctrine\\NodeAnalyzer\\ConstructorAssignPropertyAnalyzer' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/ConstructorAssignPropertyAnalyzer.php',
     'Rector\\Doctrine\\NodeAnalyzer\\EntityObjectTypeResolver' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/EntityObjectTypeResolver.php',
     'Rector\\Doctrine\\NodeAnalyzer\\MethodCallNameOnTypeResolver' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/MethodCallNameOnTypeResolver.php',
     'Rector\\Doctrine\\NodeAnalyzer\\SetterClassMethodAnalyzer' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/SetterClassMethodAnalyzer.php',
+    'Rector\\Doctrine\\NodeAnalyzer\\TargetEntityResolver' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/TargetEntityResolver.php',
     'Rector\\Doctrine\\NodeAnalyzer\\TranslatablePropertyCollectorAndRemover' => $vendorDir . '/rector/rector-doctrine/src/NodeAnalyzer/TranslatablePropertyCollectorAndRemover.php',
     'Rector\\Doctrine\\NodeFactory\\ConstructClassMethodFactory' => $vendorDir . '/rector/rector-doctrine/src/NodeFactory/ConstructClassMethodFactory.php',
     'Rector\\Doctrine\\NodeFactory\\ConstructorClassMethodAssignFactory' => $vendorDir . '/rector/rector-doctrine/src/NodeFactory/ConstructorClassMethodAssignFactory.php',
@@ -1946,7 +1947,9 @@ return array(
     'Rector\\Doctrine\\TypeAnalyzer\\CollectionVarTagValueNodeResolver' => $vendorDir . '/rector/rector-doctrine/src/TypeAnalyzer/CollectionVarTagValueNodeResolver.php',
     'Rector\\Doctrine\\TypeAnalyzer\\TypeFinder' => $vendorDir . '/rector/rector-doctrine/src/TypeAnalyzer/TypeFinder.php',
     'Rector\\Doctrine\\Type\\RepositoryTypeFactory' => $vendorDir . '/rector/rector-doctrine/src/Type/RepositoryTypeFactory.php',
+    'Rector\\Doctrine\\ValueObject\\ArgName' => $vendorDir . '/rector/rector-doctrine/src/ValueObject/ArgName.php',
     'Rector\\Doctrine\\ValueObject\\AssignToPropertyFetch' => $vendorDir . '/rector/rector-doctrine/src/ValueObject/AssignToPropertyFetch.php',
+    'Rector\\Doctrine\\ValueObject\\DefaultAnnotationArgValue' => $vendorDir . '/rector/rector-doctrine/src/ValueObject/DefaultAnnotationArgValue.php',
     'Rector\\Doctrine\\ValueObject\\PropertyNameAndPhpDocInfo' => $vendorDir . '/rector/rector-doctrine/src/ValueObject/PropertyNameAndPhpDocInfo.php',
     'Rector\\Doctrine\\ValueObject\\PropertyNamesAndPhpDocInfos' => $vendorDir . '/rector/rector-doctrine/src/ValueObject/PropertyNamesAndPhpDocInfos.php',
     'Rector\\DowngradePhp53\\Rector\\Dir\\DirConstToFileConstRector' => $baseDir . '/rules/DowngradePhp53/Rector/Dir/DirConstToFileConstRector.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit45bdedca4f816bd4757927bb4025ea19
+class ComposerAutoloaderInit1b9205f82305e30ba10ce859891b7d1f
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ class ComposerAutoloaderInit45bdedca4f816bd4757927bb4025ea19
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit45bdedca4f816bd4757927bb4025ea19', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit1b9205f82305e30ba10ce859891b7d1f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit45bdedca4f816bd4757927bb4025ea19', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit1b9205f82305e30ba10ce859891b7d1f', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit45bdedca4f816bd4757927bb4025ea19::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit1b9205f82305e30ba10ce859891b7d1f::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,12 +42,12 @@ class ComposerAutoloaderInit45bdedca4f816bd4757927bb4025ea19
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit45bdedca4f816bd4757927bb4025ea19::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit1b9205f82305e30ba10ce859891b7d1f::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire45bdedca4f816bd4757927bb4025ea19($fileIdentifier, $file);
+            composerRequire1b9205f82305e30ba10ce859891b7d1f($fileIdentifier, $file);
         }
 
         return $loader;
@@ -59,7 +59,7 @@ class ComposerAutoloaderInit45bdedca4f816bd4757927bb4025ea19
  * @param string $file
  * @return void
  */
-function composerRequire45bdedca4f816bd4757927bb4025ea19($fileIdentifier, $file)
+function composerRequire1b9205f82305e30ba10ce859891b7d1f($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit45bdedca4f816bd4757927bb4025ea19
+class ComposerStaticInit1b9205f82305e30ba10ce859891b7d1f
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -2281,12 +2281,13 @@ class ComposerStaticInit45bdedca4f816bd4757927bb4025ea19
         'Rector\\DependencyInjection\\Rector\\ClassMethod\\AddMethodParentCallRector' => __DIR__ . '/../..' . '/rules/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector.php',
         'Rector\\DependencyInjection\\Rector\\Class_\\ActionInjectionToConstructorInjectionRector' => __DIR__ . '/../..' . '/rules/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector.php',
         'Rector\\Doctrine\\NodeAnalyzer\\AssignPropertyFetchAnalyzer' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/AssignPropertyFetchAnalyzer.php',
-        'Rector\\Doctrine\\NodeAnalyzer\\AttributeArgValueResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/AttributeArgValueResolver.php',
+        'Rector\\Doctrine\\NodeAnalyzer\\AttributeCleaner' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/AttributeCleaner.php',
         'Rector\\Doctrine\\NodeAnalyzer\\AttributeFinder' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/AttributeFinder.php',
         'Rector\\Doctrine\\NodeAnalyzer\\ConstructorAssignPropertyAnalyzer' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/ConstructorAssignPropertyAnalyzer.php',
         'Rector\\Doctrine\\NodeAnalyzer\\EntityObjectTypeResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/EntityObjectTypeResolver.php',
         'Rector\\Doctrine\\NodeAnalyzer\\MethodCallNameOnTypeResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/MethodCallNameOnTypeResolver.php',
         'Rector\\Doctrine\\NodeAnalyzer\\SetterClassMethodAnalyzer' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/SetterClassMethodAnalyzer.php',
+        'Rector\\Doctrine\\NodeAnalyzer\\TargetEntityResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/TargetEntityResolver.php',
         'Rector\\Doctrine\\NodeAnalyzer\\TranslatablePropertyCollectorAndRemover' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeAnalyzer/TranslatablePropertyCollectorAndRemover.php',
         'Rector\\Doctrine\\NodeFactory\\ConstructClassMethodFactory' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeFactory/ConstructClassMethodFactory.php',
         'Rector\\Doctrine\\NodeFactory\\ConstructorClassMethodAssignFactory' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeFactory/ConstructorClassMethodAssignFactory.php',
@@ -2341,7 +2342,9 @@ class ComposerStaticInit45bdedca4f816bd4757927bb4025ea19
         'Rector\\Doctrine\\TypeAnalyzer\\CollectionVarTagValueNodeResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/src/TypeAnalyzer/CollectionVarTagValueNodeResolver.php',
         'Rector\\Doctrine\\TypeAnalyzer\\TypeFinder' => __DIR__ . '/..' . '/rector/rector-doctrine/src/TypeAnalyzer/TypeFinder.php',
         'Rector\\Doctrine\\Type\\RepositoryTypeFactory' => __DIR__ . '/..' . '/rector/rector-doctrine/src/Type/RepositoryTypeFactory.php',
+        'Rector\\Doctrine\\ValueObject\\ArgName' => __DIR__ . '/..' . '/rector/rector-doctrine/src/ValueObject/ArgName.php',
         'Rector\\Doctrine\\ValueObject\\AssignToPropertyFetch' => __DIR__ . '/..' . '/rector/rector-doctrine/src/ValueObject/AssignToPropertyFetch.php',
+        'Rector\\Doctrine\\ValueObject\\DefaultAnnotationArgValue' => __DIR__ . '/..' . '/rector/rector-doctrine/src/ValueObject/DefaultAnnotationArgValue.php',
         'Rector\\Doctrine\\ValueObject\\PropertyNameAndPhpDocInfo' => __DIR__ . '/..' . '/rector/rector-doctrine/src/ValueObject/PropertyNameAndPhpDocInfo.php',
         'Rector\\Doctrine\\ValueObject\\PropertyNamesAndPhpDocInfos' => __DIR__ . '/..' . '/rector/rector-doctrine/src/ValueObject/PropertyNamesAndPhpDocInfos.php',
         'Rector\\DowngradePhp53\\Rector\\Dir\\DirConstToFileConstRector' => __DIR__ . '/../..' . '/rules/DowngradePhp53/Rector/Dir/DirConstToFileConstRector.php',
@@ -3867,9 +3870,9 @@ class ComposerStaticInit45bdedca4f816bd4757927bb4025ea19
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit45bdedca4f816bd4757927bb4025ea19::$prefixLengthsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit1b9205f82305e30ba10ce859891b7d1f::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit45bdedca4f816bd4757927bb4025ea19::$prefixDirsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit1b9205f82305e30ba10ce859891b7d1f::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit45bdedca4f816bd4757927bb4025ea19::$classMap;
+            $loader->classMap = ComposerStaticInit1b9205f82305e30ba10ce859891b7d1f::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -2165,12 +2165,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
-                "reference": "e8de3b0cbb4bfb1ddcb65102fbf1d852369d4246"
+                "reference": "2b82f7eba4ec9c9a3059076a2dc176310aa5a274"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/e8de3b0cbb4bfb1ddcb65102fbf1d852369d4246",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/2b82f7eba4ec9c9a3059076a2dc176310aa5a274",
-                "reference": "e8de3b0cbb4bfb1ddcb65102fbf1d852369d4246",
+                "reference": "2b82f7eba4ec9c9a3059076a2dc176310aa5a274",
                 "shasum": ""
             },
             "require": {
@@ -2195,7 +2195,7 @@
                 "symplify\/rule-doc-generator": "^10.0",
                 "symplify\/vendor-patches": "^10.0"
             },
-            "time": "2022-01-12T11:18:17+00:00",
+            "time": "2022-01-17T15:16:46+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {
@@ -2377,12 +2377,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-nette.git",
-                "reference": "eb859a55eee64bc5dcb60e0b0254f77b8f4790d2"
+                "reference": "fbfa93c0b88d5f2d7b3339e766653cfbd14206bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-nette\/zipball\/eb859a55eee64bc5dcb60e0b0254f77b8f4790d2",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-nette\/zipball\/fbfa93c0b88d5f2d7b3339e766653cfbd14206bf",
-                "reference": "eb859a55eee64bc5dcb60e0b0254f77b8f4790d2",
+                "reference": "fbfa93c0b88d5f2d7b3339e766653cfbd14206bf",
                 "shasum": ""
             },
             "require": {
@@ -2414,7 +2414,7 @@
                 "symplify\/rule-doc-generator": "^10.0",
                 "symplify\/vendor-patches": "^10.0"
             },
-            "time": "2021-12-31T08:08:04+00:00",
+            "time": "2022-01-17T15:43:45+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {
@@ -2523,12 +2523,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
-                "reference": "cd2eb3d70f324d0c71bea89d26349f47f5ba6bd2"
+                "reference": "5a8c2a899ba438e49efc15a399ca8bcf3284d33f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/cd2eb3d70f324d0c71bea89d26349f47f5ba6bd2",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/5a8c2a899ba438e49efc15a399ca8bcf3284d33f",
-                "reference": "cd2eb3d70f324d0c71bea89d26349f47f5ba6bd2",
+                "reference": "5a8c2a899ba438e49efc15a399ca8bcf3284d33f",
                 "shasum": ""
             },
             "require": {
@@ -2552,7 +2552,7 @@
                 "symplify\/rule-doc-generator": "^10.0",
                 "symplify\/vendor-patches": "^10.0"
             },
-            "time": "2021-12-31T12:15:32+00:00",
+            "time": "2022-01-17T16:11:25+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {
@@ -2590,12 +2590,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
-                "reference": "d12f643aae1eb0e8bb531376ce239c300e647889"
+                "reference": "57743a8956c8cef8fb511b2d35aabbb49cba3161"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/d12f643aae1eb0e8bb531376ce239c300e647889",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/57743a8956c8cef8fb511b2d35aabbb49cba3161",
-                "reference": "d12f643aae1eb0e8bb531376ce239c300e647889",
+                "reference": "57743a8956c8cef8fb511b2d35aabbb49cba3161",
                 "shasum": ""
             },
             "require": {
@@ -2623,7 +2623,7 @@
                 "symplify\/rule-doc-generator": "^10.0",
                 "symplify\/vendor-patches": "^10.0"
             },
-            "time": "2022-01-17T10:08:59+00:00",
+            "time": "2022-01-17T15:17:37+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {

vendor/rector/extension-installer/src/GeneratedConfig.php

@@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
  */
 final class GeneratedConfig
 {
-    public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main f601f07'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main e8de3b0'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main df58e86'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 96d50d4'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main eb859a5'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 3f56f3b'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main cd2eb3d'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d12f643'), 'ssch/typo3-rector' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/ssch/typo3-rector', 'relative_install_path' => '../../../ssch/typo3-rector', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d4a362b'));
+    public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main f601f07'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 2b82f7e'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main df58e86'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 96d50d4'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main fbfa93c'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 3f56f3b'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 5a8c2a8'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 57743a8'), 'ssch/typo3-rector' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/ssch/typo3-rector', 'relative_install_path' => '../../../ssch/typo3-rector', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d4a362b'));
     private function __construct()
     {
     }

vendor/rector/rector-doctrine/rector.php

@@ -19,7 +19,7 @@ return static function (\Symfony\Component\DependencyInjection\Loader\Configurat
         '*/Source/*',
         '*/Fixture/*',
     ]);
-    $containerConfigurator->import(\Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_80);
+    $containerConfigurator->import(\Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_81);
     $containerConfigurator->import(\Rector\Set\ValueObject\SetList::DEAD_CODE);
     $containerConfigurator->import(\Rector\Set\ValueObject\SetList::CODE_QUALITY);
     $services = $containerConfigurator->services();

vendor/rector/rector-doctrine/src/NodeAnalyzer/AssignPropertyFetchAnalyzer.php

@@ -12,10 +12,12 @@ use Rector\NodeNameResolver\NodeNameResolver;
 final class AssignPropertyFetchAnalyzer
 {
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-doctrine/src/NodeAnalyzer/AttributeArgValueResolver.php

@@ -1,36 +0,0 @@
-<?php
-
-declare (strict_types=1);
-namespace Rector\Doctrine\NodeAnalyzer;
-
-use PhpParser\Node\Attribute;
-use PhpParser\Node\Expr;
-use Rector\NodeNameResolver\NodeNameResolver;
-final class AttributeArgValueResolver
-{
-    /**
-     * @readonly
-     * @var \Rector\NodeNameResolver\NodeNameResolver
-     */
-    private $nodeNameResolver;
-    public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver)
-    {
-        $this->nodeNameResolver = $nodeNameResolver;
-    }
-    /**
-     * @return \PhpParser\Node\Expr|null
-     */
-    public function resolve(\PhpParser\Node\Attribute $attribute, string $argName)
-    {
-        foreach ($attribute->args as $arg) {
-            if ($arg->name === null) {
-                continue;
-            }
-            if (!$this->nodeNameResolver->isName($arg->name, $argName)) {
-                continue;
-            }
-            return $arg->value;
-        }
-        return null;
-    }
-}

vendor/rector/rector-doctrine/src/NodeAnalyzer/AttributeCleaner.php

@@ -0,0 +1,50 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Doctrine\NodeAnalyzer;
+
+use PhpParser\Node;
+use PhpParser\Node\Attribute;
+use PhpParser\Node\Param;
+use PhpParser\Node\Stmt\ClassLike;
+use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Property;
+use Rector\NodeNameResolver\NodeNameResolver;
+final class AttributeCleaner
+{
+    /**
+     * @readonly
+     * @var \Rector\Doctrine\NodeAnalyzer\AttributeFinder
+     */
+    private $attributeFinder;
+    /**
+     * @readonly
+     * @var \Rector\NodeNameResolver\NodeNameResolver
+     */
+    private $nodeNameResolver;
+    public function __construct(\Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver)
+    {
+        $this->attributeFinder = $attributeFinder;
+        $this->nodeNameResolver = $nodeNameResolver;
+    }
+    /**
+     * @param \PhpParser\Node\Param|\PhpParser\Node\Stmt\ClassLike|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Property $node
+     */
+    public function clearAttributeAndArgName($node, string $attributeClass, string $argName) : void
+    {
+        $attribute = $this->attributeFinder->findAttributeByClass($node, $attributeClass);
+        if (!$attribute instanceof \PhpParser\Node\Attribute) {
+            return;
+        }
+        foreach ($attribute->args as $key => $arg) {
+            if (!$arg->name instanceof \PhpParser\Node) {
+                continue;
+            }
+            if (!$this->nodeNameResolver->isName($arg->name, $argName)) {
+                continue;
+            }
+            // remove attribute
+            unset($attribute->args[$key]);
+        }
+    }
+}

vendor/rector/rector-doctrine/src/NodeAnalyzer/AttributeFinder.php

@@ -5,6 +5,7 @@ namespace Rector\Doctrine\NodeAnalyzer;
 
 use PhpParser\Node\Attribute;
 use PhpParser\Node\AttributeGroup;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassLike;
@@ -14,6 +15,7 @@ use Rector\NodeNameResolver\NodeNameResolver;
 final class AttributeFinder
 {
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
@@ -22,9 +24,46 @@ final class AttributeFinder
         $this->nodeNameResolver = $nodeNameResolver;
     }
     /**
+     * @param class-string $attributeClass
      * @param \PhpParser\Node\Param|\PhpParser\Node\Stmt\ClassLike|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Property $node
      */
-    public function findAttributeByClass($node, string $desiredAttributeClass) : ?\PhpParser\Node\Attribute
+    public function findAttributeByClassArgByName($node, string $attributeClass, string $argName) : ?\PhpParser\Node\Expr
+    {
+        return $this->findAttributeByClassesArgByName($node, [$attributeClass], $argName);
+    }
+    /**
+     * @param class-string[] $attributeClasses
+     * @param \PhpParser\Node\Param|\PhpParser\Node\Stmt\ClassLike|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Property $node
+     */
+    public function findAttributeByClassesArgByName($node, array $attributeClasses, string $argName) : ?\PhpParser\Node\Expr
+    {
+        $attribute = $this->findAttributeByClasses($node, $attributeClasses);
+        if (!$attribute instanceof \PhpParser\Node\Attribute) {
+            return null;
+        }
+        return $this->findArgByName($attribute, $argName);
+    }
+    /**
+     * @return \PhpParser\Node\Expr|null
+     */
+    public function findArgByName(\PhpParser\Node\Attribute $attribute, string $argName)
+    {
+        foreach ($attribute->args as $arg) {
+            if ($arg->name === null) {
+                continue;
+            }
+            if (!$this->nodeNameResolver->isName($arg->name, $argName)) {
+                continue;
+            }
+            return $arg->value;
+        }
+        return null;
+    }
+    /**
+     * @param class-string $attributeClass
+     * @param \PhpParser\Node\Param|\PhpParser\Node\Stmt\ClassLike|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Property $node
+     */
+    public function findAttributeByClass($node, string $attributeClass) : ?\PhpParser\Node\Attribute
     {
         /** @var AttributeGroup $attrGroup */
         foreach ($node->attrGroups as $attrGroup) {
@@ -32,11 +71,25 @@ final class AttributeFinder
                 if (!$attribute->name instanceof \PhpParser\Node\Name\FullyQualified) {
                     continue;
                 }
-                if ($this->nodeNameResolver->isName($attribute->name, $desiredAttributeClass)) {
+                if ($this->nodeNameResolver->isName($attribute->name, $attributeClass)) {
                     return $attribute;
                 }
             }
         }
         return null;
     }
+    /**
+     * @param class-string[] $attributeClasses
+     * @param \PhpParser\Node\Param|\PhpParser\Node\Stmt\ClassLike|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Property $node
+     */
+    private function findAttributeByClasses($node, array $attributeClasses) : ?\PhpParser\Node\Attribute
+    {
+        foreach ($attributeClasses as $attributeClass) {
+            $attribute = $this->findAttributeByClass($node, $attributeClass);
+            if ($attribute instanceof \PhpParser\Node\Attribute) {
+                return $attribute;
+            }
+        }
+        return null;
+    }
 }

vendor/rector/rector-doctrine/src/NodeAnalyzer/ConstructorAssignPropertyAnalyzer.php

@@ -14,10 +14,12 @@ use Rector\NodeNameResolver\NodeNameResolver;
 final class ConstructorAssignPropertyAnalyzer
 {
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-doctrine/src/NodeAnalyzer/EntityObjectTypeResolver.php

@@ -20,14 +20,17 @@ use Rector\NodeNameResolver\NodeNameResolver;
 final class EntityObjectTypeResolver
 {
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
      */
     private $phpDocInfoFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\TypeAnalyzer\TypeFinder
      */
     private $typeFinder;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-doctrine/src/NodeAnalyzer/MethodCallNameOnTypeResolver.php

@@ -12,14 +12,17 @@ use RectorPrefix20220117\Symplify\Astral\NodeTraverser\SimpleCallableNodeTravers
 final class MethodCallNameOnTypeResolver
 {
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
      */
     private $simpleCallableNodeTraverser;
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;

vendor/rector/rector-doctrine/src/NodeAnalyzer/SetterClassMethodAnalyzer.php

@@ -21,18 +21,22 @@ use Rector\NodeTypeResolver\NodeTypeResolver;
 final class SetterClassMethodAnalyzer
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Core\Reflection\ReflectionResolver
      */
     private $reflectionResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-doctrine/src/NodeAnalyzer/TargetEntityResolver.php

@@ -0,0 +1,36 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Doctrine\NodeAnalyzer;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Scalar\String_;
+use Rector\Core\Exception\NotImplementedYetException;
+use Rector\NodeNameResolver\NodeNameResolver;
+final class TargetEntityResolver
+{
+    /**
+     * @readonly
+     * @var \Rector\NodeNameResolver\NodeNameResolver
+     */
+    private $nodeNameResolver;
+    public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver)
+    {
+        $this->nodeNameResolver = $nodeNameResolver;
+    }
+    /**
+     * @return string|null
+     */
+    public function resolveFromExpr(\PhpParser\Node\Expr $targetEntityExpr)
+    {
+        if ($targetEntityExpr instanceof \PhpParser\Node\Expr\ClassConstFetch) {
+            return $this->nodeNameResolver->getName($targetEntityExpr->class);
+        }
+        if ($targetEntityExpr instanceof \PhpParser\Node\Scalar\String_) {
+            return $targetEntityExpr->value;
+        }
+        $errorMessage = \sprintf('Add support for "%s" targetEntity in "%s"', \get_class($targetEntityExpr), self::class);
+        throw new \Rector\Core\Exception\NotImplementedYetException($errorMessage);
+    }
+}

vendor/rector/rector-doctrine/src/NodeAnalyzer/TranslatablePropertyCollectorAndRemover.php

@@ -14,18 +14,22 @@ use Rector\NodeRemoval\NodeRemover;
 final class TranslatablePropertyCollectorAndRemover
 {
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover
      */
     private $phpDocTagRemover;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
      */
     private $phpDocInfoFactory;
     /**
+     * @readonly
      * @var \Rector\NodeRemoval\NodeRemover
      */
     private $nodeRemover;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-doctrine/src/NodeFactory/ConstructClassMethodFactory.php

@@ -20,14 +20,17 @@ use RectorPrefix20220117\Symplify\Astral\ValueObject\NodeBuilder\MethodBuilder;
 final class ConstructClassMethodFactory
 {
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\StaticTypeMapper\StaticTypeMapper
      */
     private $staticTypeMapper;

vendor/rector/rector-doctrine/src/NodeFactory/EntityIdNodeFactory.php

@@ -13,10 +13,12 @@ use Rector\Core\PhpParser\Node\NodeFactory;
 final class EntityIdNodeFactory
 {
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\NodeFactory
      */
     private $nodeFactory;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
      */
     private $phpDocInfoFactory;

vendor/rector/rector-doctrine/src/NodeFactory/ParamFactory.php

@@ -18,18 +18,22 @@ use Rector\StaticTypeMapper\StaticTypeMapper;
 final class ParamFactory
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\StaticTypeMapper\StaticTypeMapper
      */
     private $staticTypeMapper;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\NodeFactory
      */
     private $nodeFactory;

vendor/rector/rector-doctrine/src/NodeFactory/RepositoryAssignFactory.php

@@ -13,14 +13,17 @@ use Rector\NodeNameResolver\NodeNameResolver;
 final class RepositoryAssignFactory
 {
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\EntityObjectTypeResolver
      */
     private $entityObjectTypeResolver;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\NodeFactory
      */
     private $nodeFactory;

vendor/rector/rector-doctrine/src/NodeFactory/TranslationClassNodeFactory.php

@@ -15,10 +15,12 @@ use Rector\Core\NodeManipulator\ClassInsertManipulator;
 final class TranslationClassNodeFactory
 {
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
      */
     private $phpDocInfoFactory;
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;

vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php

@@ -3,7 +3,6 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\NodeManipulator;
 
-use PhpParser\Node\Attribute;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Type\BooleanType;
@@ -17,7 +16,6 @@ use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\Doctrine\NodeAnalyzer\AttributeArgValueResolver;
 use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 final class ColumnPropertyTypeResolver
@@ -36,26 +34,25 @@ final class ColumnPropertyTypeResolver
      */
     private $phpDocInfoFactory;
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\PHPStan\Type\TypeFactory
      */
     private $typeFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\AttributeFinder
      */
     private $attributeFinder;
-    /**
-     * @var \Rector\Doctrine\NodeAnalyzer\AttributeArgValueResolver
-     */
-    private $attributeArgValueResolver;
     /**
      * @var array<string, Type>
+     * @readonly
      */
     private $doctrineTypeToScalarType;
     /**
      * @param array<string, Type> $doctrineTypeToScalarType
      * @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/basic-mapping.html#doctrine-mapping-types
      */
-    public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\NodeTypeResolver\PHPStan\Type\TypeFactory $typeFactory, \Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, \Rector\Doctrine\NodeAnalyzer\AttributeArgValueResolver $attributeArgValueResolver, array $doctrineTypeToScalarType = null)
+    public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\NodeTypeResolver\PHPStan\Type\TypeFactory $typeFactory, \Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, array $doctrineTypeToScalarType = null)
     {
         $doctrineTypeToScalarType = $doctrineTypeToScalarType ?? [
             'tinyint' => new \PHPStan\Type\BooleanType(),
@@ -96,17 +93,13 @@ final class ColumnPropertyTypeResolver
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->typeFactory = $typeFactory;
         $this->attributeFinder = $attributeFinder;
-        $this->attributeArgValueResolver = $attributeArgValueResolver;
         $this->doctrineTypeToScalarType = $doctrineTypeToScalarType;
     }
     public function resolve(\PhpParser\Node\Stmt\Property $property, bool $isNullable) : ?\PHPStan\Type\Type
     {
-        $columnAttribute = $this->attributeFinder->findAttributeByClass($property, self::COLUMN_CLASS);
+        $argValue = $this->attributeFinder->findAttributeByClassArgByName($property, self::COLUMN_CLASS, 'type');
-        if ($columnAttribute instanceof \PhpParser\Node\Attribute) {
+        if ($argValue instanceof \PhpParser\Node\Scalar\String_) {
-            $argValue = $this->attributeArgValueResolver->resolve($columnAttribute, 'type');
+            return $this->createPHPStanTypeFromDoctrineStringType($argValue->value, $isNullable);
-            if ($argValue instanceof \PhpParser\Node\Scalar\String_) {
-                return $this->createPHPStanTypeFromDoctrineStringType($argValue->value, $isNullable);
-            }
         }
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
         return $this->resolveFromPhpDocInfo($phpDocInfo, $isNullable);

vendor/rector/rector-doctrine/src/NodeManipulator/ConstructorManipulator.php

@@ -13,10 +13,12 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
 final class ConstructorManipulator
 {
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\NodeFactory
      */
     private $nodeFactory;
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;

vendor/rector/rector-doctrine/src/NodeManipulator/DependencyRemover.php

@@ -17,14 +17,17 @@ use RectorPrefix20220117\Symplify\Astral\NodeTraverser\SimpleCallableNodeTravers
 final class DependencyRemover
 {
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
      */
     private $simpleCallableNodeTraverser;
     /**
+     * @readonly
      * @var \Rector\NodeRemoval\NodeRemover
      */
     private $nodeRemover;

vendor/rector/rector-doctrine/src/NodeManipulator/IssetDimFetchCleaner.php

@@ -20,18 +20,22 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
 final class IssetDimFetchCleaner
 {
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\Value\ValueResolver
      */
     private $valueResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Comparing\NodeComparator
      */
     private $nodeComparator;
     /**
+     * @readonly
      * @var \Rector\NodeRemoval\NodeRemover
      */
     private $nodeRemover;

vendor/rector/rector-doctrine/src/NodeManipulator/NullabilityColumnPropertyTypeResolver.php

@@ -3,7 +3,6 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\NodeManipulator;
 
-use PhpParser\Node\Attribute;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode;
@@ -11,7 +10,6 @@ use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\PhpParser\Node\Value\ValueResolver;
-use Rector\Doctrine\NodeAnalyzer\AttributeArgValueResolver;
 use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
 final class NullabilityColumnPropertyTypeResolver
 {
@@ -25,35 +23,28 @@ final class NullabilityColumnPropertyTypeResolver
      */
     private $phpDocInfoFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\AttributeFinder
      */
     private $attributeFinder;
     /**
-     * @var \Rector\Doctrine\NodeAnalyzer\AttributeArgValueResolver
+     * @readonly
-     */
-    private $attributeArgValueResolver;
-    /**
      * @var \Rector\Core\PhpParser\Node\Value\ValueResolver
      */
     private $valueResolver;
     /**
      * @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/basic-mapping.html#doctrine-mapping-types
      */
-    public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, \Rector\Doctrine\NodeAnalyzer\AttributeArgValueResolver $attributeArgValueResolver, \Rector\Core\PhpParser\Node\Value\ValueResolver $valueResolver)
+    public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, \Rector\Core\PhpParser\Node\Value\ValueResolver $valueResolver)
     {
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->attributeFinder = $attributeFinder;
-        $this->attributeArgValueResolver = $attributeArgValueResolver;
         $this->valueResolver = $valueResolver;
     }
     public function isNullable(\PhpParser\Node\Stmt\Property $property) : bool
     {
-        $columnAttribute = $this->attributeFinder->findAttributeByClass($property, self::COLUMN_CLASS);
+        $nullableExpr = $this->attributeFinder->findAttributeByClassArgByName($property, self::COLUMN_CLASS, 'nullable');
-        if ($columnAttribute instanceof \PhpParser\Node\Attribute) {
+        if ($nullableExpr instanceof \PhpParser\Node\Expr) {
-            $nullableExpr = $this->attributeArgValueResolver->resolve($columnAttribute, 'nullable');
-            if (!$nullableExpr instanceof \PhpParser\Node\Expr) {
-                return \true;
-            }
             return $this->valueResolver->isTrue($nullableExpr);
         }
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);

vendor/rector/rector-doctrine/src/NodeManipulator/PropertyTypeManipulator.php

@@ -13,10 +13,12 @@ use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 final class PropertyTypeManipulator
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockClassRenamer
      */
     private $docBlockClassRenamer;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
      */
     private $phpDocInfoFactory;

vendor/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php

@@ -3,11 +3,15 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\NodeManipulator;
 
+use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
+use Rector\Core\Exception\ShouldNotHappenException;
+use Rector\Core\PhpParser\Node\Value\ValueResolver;
+use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
 use Rector\Doctrine\PhpDoc\ShortClassExpander;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 final class ToManyRelationPropertyTypeResolver
@@ -16,6 +20,10 @@ final class ToManyRelationPropertyTypeResolver
      * @var string
      */
     private const COLLECTION_TYPE = 'Doctrine\\Common\\Collections\\Collection';
+    /**
+     * @var class-string[]
+     */
+    private const TO_MANY_ANNOTATION_CLASSES = ['Doctrine\\ORM\\Mapping\\OneToMany', 'Doctrine\\ORM\\Mapping\\ManyToMany'];
     /**
      * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
@@ -26,23 +34,49 @@ final class ToManyRelationPropertyTypeResolver
      * @var \Rector\Doctrine\PhpDoc\ShortClassExpander
      */
     private $shortClassExpander;
-    public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\Doctrine\PhpDoc\ShortClassExpander $shortClassExpander)
+    /**
+     * @readonly
+     * @var \Rector\Doctrine\NodeAnalyzer\AttributeFinder
+     */
+    private $attributeFinder;
+    /**
+     * @readonly
+     * @var \Rector\Core\PhpParser\Node\Value\ValueResolver
+     */
+    private $valueResolver;
+    public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\Doctrine\PhpDoc\ShortClassExpander $shortClassExpander, \Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, \Rector\Core\PhpParser\Node\Value\ValueResolver $valueResolver)
     {
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->shortClassExpander = $shortClassExpander;
+        $this->attributeFinder = $attributeFinder;
+        $this->valueResolver = $valueResolver;
     }
     public function resolve(\PhpParser\Node\Stmt\Property $property) : ?\PHPStan\Type\Type
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
-        $toManyRelationTagValueNode = $phpDocInfo->getByAnnotationClasses(['Doctrine\\ORM\\Mapping\\OneToMany', 'Doctrine\\ORM\\Mapping\\ManyToMany']);
+        $toManyRelationTagValueNode = $phpDocInfo->getByAnnotationClasses(self::TO_MANY_ANNOTATION_CLASSES);
         if ($toManyRelationTagValueNode !== null) {
             return $this->processToManyRelation($property, $toManyRelationTagValueNode);
         }
-        return null;
+        $targetEntity = $this->attributeFinder->findAttributeByClassesArgByName($property, self::TO_MANY_ANNOTATION_CLASSES, 'targetEntity');
+        return $this->resolveTypeFromTargetEntity($targetEntity, $property);
     }
     private function processToManyRelation(\PhpParser\Node\Stmt\Property $property, \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode) : \PHPStan\Type\Type
     {
         $targetEntity = $doctrineAnnotationTagValueNode->getValueWithoutQuotes('targetEntity');
+        if (!\is_string($targetEntity) && $targetEntity !== null) {
+            throw new \Rector\Core\Exception\ShouldNotHappenException();
+        }
+        return $this->resolveTypeFromTargetEntity($targetEntity, $property);
+    }
+    /**
+     * @param \PhpParser\Node\Expr|string|null $targetEntity
+     */
+    private function resolveTypeFromTargetEntity($targetEntity, \PhpParser\Node\Stmt\Property $property) : \PHPStan\Type\Type
+    {
+        if ($targetEntity instanceof \PhpParser\Node\Expr) {
+            $targetEntity = $this->valueResolver->getValue($targetEntity);
+        }
         if (!\is_string($targetEntity)) {
             return new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType(self::COLLECTION_TYPE);
         }

vendor/rector/rector-doctrine/src/NodeManipulator/ToOneRelationPropertyTypeResolver.php

@@ -4,6 +4,7 @@ declare (strict_types=1);
 namespace Rector\Doctrine\NodeManipulator;
 
 use RectorPrefix20220117\Nette\Utils\Strings;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode;
 use PHPStan\Type\MixedType;
@@ -11,12 +12,19 @@ use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher;
+use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
+use Rector\Doctrine\NodeAnalyzer\TargetEntityResolver;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 final class ToOneRelationPropertyTypeResolver
 {
+    /**
+     * @var class-string[]
+     */
+    private const TO_ONE_ANNOTATION_CLASSES = ['Doctrine\\ORM\\Mapping\\ManyToOne', 'Doctrine\\ORM\\Mapping\\OneToOne'];
     /**
      * @readonly
      * @var \Rector\NodeTypeResolver\PHPStan\Type\TypeFactory
@@ -32,19 +40,40 @@ final class ToOneRelationPropertyTypeResolver
      * @var \Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher
      */
     private $classAnnotationMatcher;
-    public function __construct(\Rector\NodeTypeResolver\PHPStan\Type\TypeFactory $typeFactory, \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher $classAnnotationMatcher)
+    /**
+     * @readonly
+     * @var \Rector\Doctrine\NodeAnalyzer\AttributeFinder
+     */
+    private $attributeFinder;
+    /**
+     * @readonly
+     * @var \Rector\Doctrine\NodeAnalyzer\TargetEntityResolver
+     */
+    private $targetEntityResolver;
+    public function __construct(\Rector\NodeTypeResolver\PHPStan\Type\TypeFactory $typeFactory, \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher $classAnnotationMatcher, \Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, \Rector\Doctrine\NodeAnalyzer\TargetEntityResolver $targetEntityResolver)
     {
         $this->typeFactory = $typeFactory;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->classAnnotationMatcher = $classAnnotationMatcher;
+        $this->attributeFinder = $attributeFinder;
+        $this->targetEntityResolver = $targetEntityResolver;
     }
     public function resolve(\PhpParser\Node\Stmt\Property $property) : ?\PHPStan\Type\Type
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
-        $toOneRelationTagValueNode = $phpDocInfo->getByAnnotationClasses(['Doctrine\\ORM\\Mapping\\ManyToOne', 'Doctrine\\ORM\\Mapping\\OneToOne']);
+        $toOneRelationTagValueNode = $phpDocInfo->getByAnnotationClasses(self::TO_ONE_ANNOTATION_CLASSES);
-        if ($toOneRelationTagValueNode !== null) {
+        if ($toOneRelationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
-            $joinDoctrineAnnotationTagValueNode = $phpDocInfo->findOneByAnnotationClass('Doctrine\\ORM\\Mapping\\JoinColumn');
+            return $this->resolveFromDocBlock($phpDocInfo, $property, $toOneRelationTagValueNode);
-            return $this->processToOneRelation($property, $toOneRelationTagValueNode, $joinDoctrineAnnotationTagValueNode);
+        }
+        $targetEntity = $this->attributeFinder->findAttributeByClassesArgByName($property, self::TO_ONE_ANNOTATION_CLASSES, 'targetEntity');
+        if (!$targetEntity instanceof \PhpParser\Node\Expr) {
+            return null;
+        }
+        $targetEntityClass = $this->targetEntityResolver->resolveFromExpr($targetEntity);
+        if ($targetEntityClass !== null) {
+            $fullyQualifiedObjectType = new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType($targetEntityClass);
+            // @todo resolve nullable value
+            return $this->resolveFromObjectType($fullyQualifiedObjectType, \false);
         }
         return null;
     }
@@ -59,9 +88,25 @@ final class ToOneRelationPropertyTypeResolver
         }
         // resolve to FQN
         $tagFullyQualifiedName = $this->classAnnotationMatcher->resolveTagFullyQualifiedName($targetEntity, $property);
+        $fullyQualifiedObjectType = new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType($tagFullyQualifiedName);
+        $isNullable = $this->isNullableType($joinDoctrineAnnotationTagValueNode);
+        return $this->resolveFromObjectType($fullyQualifiedObjectType, $isNullable);
+    }
+    private function shouldAddNullType(\Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode) : bool
+    {
+        $isNullableValue = $doctrineAnnotationTagValueNode->getValue('nullable');
+        return $isNullableValue instanceof \PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode;
+    }
+    private function resolveFromDocBlock(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo, \PhpParser\Node\Stmt\Property $property, \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode $toOneRelationTagValueNode) : \PHPStan\Type\Type
+    {
+        $joinDoctrineAnnotationTagValueNode = $phpDocInfo->findOneByAnnotationClass('Doctrine\\ORM\\Mapping\\JoinColumn');
+        return $this->processToOneRelation($property, $toOneRelationTagValueNode, $joinDoctrineAnnotationTagValueNode);
+    }
+    private function resolveFromObjectType(\Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType $fullyQualifiedObjectType, bool $isNullable) : \PHPStan\Type\Type
+    {
         $types = [];
-        $types[] = new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType($tagFullyQualifiedName);
+        $types[] = $fullyQualifiedObjectType;
-        if ($joinDoctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode && $this->shouldAddNullType($joinDoctrineAnnotationTagValueNode)) {
+        if ($isNullable) {
             $types[] = new \PHPStan\Type\NullType();
         }
         $propertyType = $this->typeFactory->createMixedPassedOrUnionType($types);
@@ -71,9 +116,11 @@ final class ToOneRelationPropertyTypeResolver
         }
         return $propertyType;
     }
-    private function shouldAddNullType(\Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode) : bool
+    private function isNullableType(?\Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode $joinDoctrineAnnotationTagValueNode) : bool
     {
-        $isNullableValue = $doctrineAnnotationTagValueNode->getValue('nullable');
+        if (!$joinDoctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
-        return $isNullableValue instanceof \PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode;
+            return \false;
+        }
+        return $this->shouldAddNullType($joinDoctrineAnnotationTagValueNode);
     }
 }

vendor/rector/rector-doctrine/src/PhpDocParser/DoctrineDocBlockResolver.php

@@ -13,14 +13,17 @@ use Rector\Doctrine\PhpDoc\ShortClassExpander;
 final class DoctrineDocBlockResolver
 {
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
      */
     private $phpDocInfoFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\PhpDoc\ShortClassExpander
      */
     private $shortClassExpander;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-doctrine/src/Rector/ClassMethod/MakeEntitySetterNullabilityInSyncWithPropertyRector.php

@@ -20,10 +20,12 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class MakeEntitySetterNullabilityInSyncWithPropertyRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\SetterClassMethodAnalyzer
      */
     private $setterClassMethodAnalyzer;
     /**
+     * @readonly
      * @var \Rector\Doctrine\PhpDocParser\DoctrineDocBlockResolver
      */
     private $doctrineDocBlockResolver;

vendor/rector/rector-doctrine/src/Rector/ClassMethod/ServiceEntityRepositoryParentCallToDIRector.php

@@ -31,22 +31,27 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class ServiceEntityRepositoryParentCallToDIRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeFactory\RepositoryNodeFactory
      */
     private $repositoryNodeFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\Type\RepositoryTypeFactory
      */
     private $repositoryTypeFactory;
     /**
+     * @readonly
      * @var \Rector\PostRector\Collector\PropertyToAddCollector
      */
     private $propertyToAddCollector;
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassDependencyManipulator
      */
     private $classDependencyManipulator;
     /**
+     * @readonly
      * @var \Rector\Naming\Naming\PropertyNaming
      */
     private $propertyNaming;

vendor/rector/rector-doctrine/src/Rector/Class_/AddEntityIdByConditionRector.php

@@ -28,18 +28,22 @@ final class AddEntityIdByConditionRector extends \Rector\Core\Rector\AbstractRec
      */
     private $detectedTraits = [];
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeFactory\EntityIdNodeFactory
      */
     private $entityIdNodeFactory;
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;
     /**
+     * @readonly
      * @var \PHPStan\Reflection\ReflectionProvider
      */
     private $reflectionProvider;
     /**
+     * @readonly
      * @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
      */
     private $classAnalyzer;

vendor/rector/rector-doctrine/src/Rector/Class_/BlameableBehaviorRector.php

@@ -19,6 +19,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class BlameableBehaviorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;

vendor/rector/rector-doctrine/src/Rector/Class_/ClassAnnotationToNamedArgumentConstructorRector.php

@@ -31,26 +31,32 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class ClassAnnotationToNamedArgumentConstructorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeFactory\ParamFactory
      */
     private $paramFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeFactory\ConstructClassMethodFactory
      */
     private $constructClassMethodFactory;
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\AssignPropertyFetchAnalyzer
      */
     private $assignPropertyFetchAnalyzer;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\IssetDimFetchCleaner
      */
     private $issetDimFetchCleaner;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeFactory\ConstructorClassMethodAssignFactory
      */
     private $constructorClassMethodAssignFactory;

vendor/rector/rector-doctrine/src/Rector/Class_/InitializeDefaultEntityCollectionRector.php

@@ -22,6 +22,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class InitializeDefaultEntityCollectionRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassDependencyManipulator
      */
     private $classDependencyManipulator;

vendor/rector/rector-doctrine/src/Rector/Class_/LoggableBehaviorRector.php

@@ -23,6 +23,7 @@ use RectorPrefix20220117\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
 final class LoggableBehaviorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;

vendor/rector/rector-doctrine/src/Rector/Class_/ManagerRegistryGetManagerToEntityManagerRector.php

@@ -37,14 +37,17 @@ final class ManagerRegistryGetManagerToEntityManagerRector extends \Rector\Core\
      */
     private const ENTITY_MANAGER = 'entityManager';
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\MethodCallNameOnTypeResolver
      */
     private $methodCallNameOnTypeResolver;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\DependencyRemover
      */
     private $dependencyRemover;
     /**
+     * @readonly
      * @var \Rector\PostRector\Collector\PropertyToAddCollector
      */
     private $propertyToAddCollector;

vendor/rector/rector-doctrine/src/Rector/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector.php

@@ -23,14 +23,17 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class MoveCurrentDateTimeDefaultInEntityToConstructorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\ConstructorManipulator
      */
     private $constructorManipulator;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeFactory\ValueAssignFactory
      */
     private $valueAssignFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\ConstructorAssignPropertyAnalyzer
      */
     private $constructorAssignPropertyAnalyzer;

vendor/rector/rector-doctrine/src/Rector/Class_/MoveRepositoryFromParentToConstructorRector.php

@@ -20,18 +20,22 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class MoveRepositoryFromParentToConstructorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassDependencyManipulator
      */
     private $classDependencyManipulator;
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeFactory\RepositoryAssignFactory
      */
     private $repositoryAssignFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\EntityObjectTypeResolver
      */
     private $entityObjectTypeResolver;

vendor/rector/rector-doctrine/src/Rector/Class_/RemoveRedundantDefaultClassAnnotationValuesRector.php

@@ -16,6 +16,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class RemoveRedundantDefaultClassAnnotationValuesRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\DoctrineItemDefaultValueManipulator
      */
     private $doctrineItemDefaultValueManipulator;

vendor/rector/rector-doctrine/src/Rector/Class_/SluggableBehaviorRector.php

@@ -28,10 +28,12 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class SluggableBehaviorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger
      */
     private $phpDocTypeChanger;

vendor/rector/rector-doctrine/src/Rector/Class_/SoftDeletableBehaviorRector.php

@@ -21,10 +21,12 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class SoftDeletableBehaviorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover
      */
     private $phpDocTagRemover;

vendor/rector/rector-doctrine/src/Rector/Class_/TimestampableBehaviorRector.php

@@ -19,6 +19,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class TimestampableBehaviorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassManipulator
      */
     private $classManipulator;

vendor/rector/rector-doctrine/src/Rector/Class_/TranslationBehaviorRector.php

@@ -30,18 +30,22 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class TranslationBehaviorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassManipulator
      */
     private $classManipulator;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeFactory\TranslationClassNodeFactory
      */
     private $translationClassNodeFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeAnalyzer\TranslatablePropertyCollectorAndRemover
      */
     private $translatablePropertyCollectorAndRemover;

vendor/rector/rector-doctrine/src/Rector/Class_/TreeBehaviorRector.php

@@ -22,10 +22,12 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class TreeBehaviorRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover
      */
     private $phpDocTagRemover;

vendor/rector/rector-doctrine/src/Rector/MethodCall/ChangeSetParametersArrayToArrayCollectionRector.php

@@ -26,10 +26,12 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class ChangeSetParametersArrayToArrayCollectionRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\TypeAnalyzer\ArrayTypeAnalyzer
      */
     private $arrayTypeAnalyzer;
     /**
+     * @readonly
      * @var \Rector\Defluent\NodeAnalyzer\FluentChainMethodCallNodeAnalyzer
      */
     private $fluentChainMethodCallNodeAnalyzer;

vendor/rector/rector-doctrine/src/Rector/MethodCall/ReplaceParentRepositoryCallsByRepositoryPropertyRector.php

@@ -26,6 +26,7 @@ final class ReplaceParentRepositoryCallsByRepositoryPropertyRector extends \Rect
      */
     private const ENTITY_REPOSITORY_PUBLIC_METHODS = ['createQueryBuilder', 'createResultSetMappingBuilder', 'clear', 'find', 'findBy', 'findAll', 'findOneBy', 'count', 'getClassName', 'matching'];
     /**
+     * @readonly
      * @var \Rector\PostRector\Collector\PropertyToAddCollector
      */
     private $propertyToAddCollector;

vendor/rector/rector-doctrine/src/Rector/Property/ChangeBigIntEntityPropertyToIntTypeRector.php

@@ -24,6 +24,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class ChangeBigIntEntityPropertyToIntTypeRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockClassRenamer
      */
     private $docBlockClassRenamer;

vendor/rector/rector-doctrine/src/Rector/Property/ImproveDoctrineCollectionDocTypeInEntityRector.php

@@ -4,16 +4,20 @@ declare (strict_types=1);
 namespace Rector\Doctrine\Rector\Property;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\Reflection\Php\PhpPropertyReflection;
 use PHPStan\Type\Type;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\Core\NodeManipulator\AssignManipulator;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Reflection\ReflectionResolver;
+use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
+use Rector\Doctrine\NodeAnalyzer\TargetEntityResolver;
 use Rector\Doctrine\PhpDocParser\DoctrineDocBlockResolver;
 use Rector\Doctrine\TypeAnalyzer\CollectionTypeFactory;
 use Rector\Doctrine\TypeAnalyzer\CollectionTypeResolver;
@@ -27,34 +31,51 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class ImproveDoctrineCollectionDocTypeInEntityRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Doctrine\TypeAnalyzer\CollectionTypeFactory
      */
     private $collectionTypeFactory;
     /**
+     * @readonly
      * @var \Rector\Core\NodeManipulator\AssignManipulator
      */
     private $assignManipulator;
     /**
+     * @readonly
      * @var \Rector\Doctrine\TypeAnalyzer\CollectionTypeResolver
      */
     private $collectionTypeResolver;
     /**
+     * @readonly
      * @var \Rector\Doctrine\TypeAnalyzer\CollectionVarTagValueNodeResolver
      */
     private $collectionVarTagValueNodeResolver;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger
      */
     private $phpDocTypeChanger;
     /**
+     * @readonly
      * @var \Rector\Doctrine\PhpDocParser\DoctrineDocBlockResolver
      */
     private $doctrineDocBlockResolver;
     /**
+     * @readonly
      * @var \Rector\Core\Reflection\ReflectionResolver
      */
     private $reflectionResolver;
-    public function __construct(\Rector\Doctrine\TypeAnalyzer\CollectionTypeFactory $collectionTypeFactory, \Rector\Core\NodeManipulator\AssignManipulator $assignManipulator, \Rector\Doctrine\TypeAnalyzer\CollectionTypeResolver $collectionTypeResolver, \Rector\Doctrine\TypeAnalyzer\CollectionVarTagValueNodeResolver $collectionVarTagValueNodeResolver, \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger $phpDocTypeChanger, \Rector\Doctrine\PhpDocParser\DoctrineDocBlockResolver $doctrineDocBlockResolver, \Rector\Core\Reflection\ReflectionResolver $reflectionResolver)
+    /**
+     * @readonly
+     * @var \Rector\Doctrine\NodeAnalyzer\AttributeFinder
+     */
+    private $attributeFinder;
+    /**
+     * @readonly
+     * @var \Rector\Doctrine\NodeAnalyzer\TargetEntityResolver
+     */
+    private $targetEntityResolver;
+    public function __construct(\Rector\Doctrine\TypeAnalyzer\CollectionTypeFactory $collectionTypeFactory, \Rector\Core\NodeManipulator\AssignManipulator $assignManipulator, \Rector\Doctrine\TypeAnalyzer\CollectionTypeResolver $collectionTypeResolver, \Rector\Doctrine\TypeAnalyzer\CollectionVarTagValueNodeResolver $collectionVarTagValueNodeResolver, \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger $phpDocTypeChanger, \Rector\Doctrine\PhpDocParser\DoctrineDocBlockResolver $doctrineDocBlockResolver, \Rector\Core\Reflection\ReflectionResolver $reflectionResolver, \Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, \Rector\Doctrine\NodeAnalyzer\TargetEntityResolver $targetEntityResolver)
     {
         $this->collectionTypeFactory = $collectionTypeFactory;
         $this->assignManipulator = $assignManipulator;
@@ -63,6 +84,8 @@ final class ImproveDoctrineCollectionDocTypeInEntityRector extends \Rector\Core\
         $this->phpDocTypeChanger = $phpDocTypeChanger;
         $this->doctrineDocBlockResolver = $doctrineDocBlockResolver;
         $this->reflectionResolver = $reflectionResolver;
+        $this->attributeFinder = $attributeFinder;
+        $this->targetEntityResolver = $targetEntityResolver;
     }
     public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
     {
@@ -120,26 +143,14 @@ CODE_SAMPLE
     private function refactorProperty(\PhpParser\Node\Stmt\Property $property) : ?\PhpParser\Node\Stmt\Property
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
-        if (!$phpDocInfo->hasByAnnotationClass('Doctrine\\ORM\\Mapping\\OneToMany')) {
+        if ($phpDocInfo->hasByAnnotationClass('Doctrine\\ORM\\Mapping\\OneToMany')) {
+            return $this->refactorPropertyPhpDocInfo($property, $phpDocInfo);
+        }
+        $targetEntityExpr = $this->attributeFinder->findAttributeByClassArgByName($property, 'Doctrine\\ORM\\Mapping\\OneToMany', 'targetEntity');
+        if (!$targetEntityExpr instanceof \PhpParser\Node\Expr) {
             return null;
         }
-        $varTagValueNode = $this->collectionVarTagValueNodeResolver->resolve($property);
+        return $this->refactorAttribute($targetEntityExpr, $phpDocInfo, $property);
-        if ($varTagValueNode !== null) {
-            $collectionObjectType = $this->collectionTypeResolver->resolveFromTypeNode($varTagValueNode->type, $property);
-            if (!$collectionObjectType instanceof \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType) {
-                return null;
-            }
-            $newVarType = $this->collectionTypeFactory->createType($collectionObjectType);
-            $this->phpDocTypeChanger->changeVarType($phpDocInfo, $newVarType);
-        } else {
-            $collectionObjectType = $this->collectionTypeResolver->resolveFromOneToManyProperty($property);
-            if (!$collectionObjectType instanceof \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType) {
-                return null;
-            }
-            $newVarType = $this->collectionTypeFactory->createType($collectionObjectType);
-            $this->phpDocTypeChanger->changeVarType($phpDocInfo, $newVarType);
-        }
-        return $property;
     }
     private function refactorClassMethod(\PhpParser\Node\Stmt\ClassMethod $classMethod) : ?\PhpParser\Node\Stmt\ClassMethod
     {
@@ -191,4 +202,35 @@ CODE_SAMPLE
         }
         return $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($varTagValueNode->type, $property);
     }
+    private function refactorPropertyPhpDocInfo(\PhpParser\Node\Stmt\Property $property, \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo) : ?\PhpParser\Node\Stmt\Property
+    {
+        $varTagValueNode = $this->collectionVarTagValueNodeResolver->resolve($property);
+        if ($varTagValueNode !== null) {
+            $collectionObjectType = $this->collectionTypeResolver->resolveFromTypeNode($varTagValueNode->type, $property);
+            if (!$collectionObjectType instanceof \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType) {
+                return null;
+            }
+            $newVarType = $this->collectionTypeFactory->createType($collectionObjectType);
+            $this->phpDocTypeChanger->changeVarType($phpDocInfo, $newVarType);
+        } else {
+            $collectionObjectType = $this->collectionTypeResolver->resolveFromOneToManyProperty($property);
+            if (!$collectionObjectType instanceof \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType) {
+                return null;
+            }
+            $newVarType = $this->collectionTypeFactory->createType($collectionObjectType);
+            $this->phpDocTypeChanger->changeVarType($phpDocInfo, $newVarType);
+        }
+        return $property;
+    }
+    private function refactorAttribute(\PhpParser\Node\Expr $targetEntity, \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo, \PhpParser\Node\Stmt\Property $property) : ?\PhpParser\Node\Stmt\Property
+    {
+        $targetEntityClassName = $this->targetEntityResolver->resolveFromExpr($targetEntity);
+        if ($targetEntityClassName === null) {
+            return null;
+        }
+        $collectionObjectType = new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType($targetEntityClassName);
+        $newVarType = $this->collectionTypeFactory->createType($collectionObjectType);
+        $this->phpDocTypeChanger->changeVarType($phpDocInfo, $newVarType);
+        return $property;
+    }
 }

vendor/rector/rector-doctrine/src/Rector/Property/MakeEntityDateTimePropertyDateTimeInterfaceRector.php

@@ -21,6 +21,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class MakeEntityDateTimePropertyDateTimeInterfaceRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\PropertyTypeManipulator
      */
     private $propertyTypeManipulator;

vendor/rector/rector-doctrine/src/Rector/Property/RemoveRedundantDefaultPropertyAnnotationValuesRector.php

@@ -4,41 +4,54 @@ declare (strict_types=1);
 namespace Rector\Doctrine\Rector\Property;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Property;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Doctrine\NodeAnalyzer\AttributeCleaner;
+use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
 use Rector\Doctrine\NodeManipulator\DoctrineItemDefaultValueManipulator;
+use Rector\Doctrine\ValueObject\ArgName;
+use Rector\Doctrine\ValueObject\DefaultAnnotationArgValue;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
  * @see \Rector\Doctrine\Tests\Rector\Property\RemoveRedundantDefaultPropertyAnnotationValuesRector\RemoveRedundantDefaultPropertyAnnotationValuesRectorTest
+ *
+ * @changelog https://www.doctrine-project.org/projects/doctrine-orm/en/2.8/reference/basic-mapping.html#property-mapping
  */
 final class RemoveRedundantDefaultPropertyAnnotationValuesRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
-     * @var string
+     * @var DefaultAnnotationArgValue[]
      */
-    private const ORPHAN_REMOVAL = 'orphanRemoval';
+    private $defaultAnnotationArgValues = [];
-    /**
-     * @var string
-     */
-    private const FETCH = 'fetch';
-    /**
-     * @var string
-     */
-    private const LAZY = 'LAZY';
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\DoctrineItemDefaultValueManipulator
      */
     private $doctrineItemDefaultValueManipulator;
-    public function __construct(\Rector\Doctrine\NodeManipulator\DoctrineItemDefaultValueManipulator $doctrineItemDefaultValueManipulator)
+    /**
+     * @readonly
+     * @var \Rector\Doctrine\NodeAnalyzer\AttributeFinder
+     */
+    private $attributeFinder;
+    /**
+     * @readonly
+     * @var \Rector\Doctrine\NodeAnalyzer\AttributeCleaner
+     */
+    private $attributeCleaner;
+    public function __construct(\Rector\Doctrine\NodeManipulator\DoctrineItemDefaultValueManipulator $doctrineItemDefaultValueManipulator, \Rector\Doctrine\NodeAnalyzer\AttributeFinder $attributeFinder, \Rector\Doctrine\NodeAnalyzer\AttributeCleaner $attributeCleaner)
     {
         $this->doctrineItemDefaultValueManipulator = $doctrineItemDefaultValueManipulator;
+        $this->attributeFinder = $attributeFinder;
+        $this->attributeCleaner = $attributeCleaner;
+        $this->defaultAnnotationArgValues = [new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\Column', 'nullable', \false), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\Column', 'unique', \false), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\Column', 'precision', 0), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\Column', 'scale', 0), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\GeneratedValue', 'strategy', 'AUTO'), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\JoinColumn', 'unique', \false), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\JoinColumn', 'nullable', \true), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\JoinColumn', 'referencedColumnName', 'id'), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\ManyToMany', \Rector\Doctrine\ValueObject\ArgName::ORPHAN_REMOVAL, \false), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\ManyToMany', \Rector\Doctrine\ValueObject\ArgName::FETCH, \Rector\Doctrine\ValueObject\ArgName::LAZY), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\ManyToOne', \Rector\Doctrine\ValueObject\ArgName::FETCH, \Rector\Doctrine\ValueObject\ArgName::LAZY), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\OneToMany', \Rector\Doctrine\ValueObject\ArgName::ORPHAN_REMOVAL, \false), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\OneToMany', \Rector\Doctrine\ValueObject\ArgName::FETCH, \Rector\Doctrine\ValueObject\ArgName::LAZY), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\OneToOne', \Rector\Doctrine\ValueObject\ArgName::ORPHAN_REMOVAL, \false), new \Rector\Doctrine\ValueObject\DefaultAnnotationArgValue('Doctrine\\ORM\\Mapping\\OneToOne', \Rector\Doctrine\ValueObject\ArgName::FETCH, \Rector\Doctrine\ValueObject\ArgName::LAZY)];
     }
     public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
     {
-        return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Removes redundant default values from Doctrine ORM annotations on class property level', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'
+        return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Removes redundant default values from Doctrine ORM annotations/attributes properties', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -83,81 +96,37 @@ CODE_SAMPLE
     public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
     {
         $this->refactorPropertyAnnotations($node);
+        foreach ($this->defaultAnnotationArgValues as $defaultAnnotationArgValue) {
+            $argExpr = $this->attributeFinder->findAttributeByClassArgByName($node, $defaultAnnotationArgValue->getAnnotationClass(), $defaultAnnotationArgValue->getArgName());
+            if (!$argExpr instanceof \PhpParser\Node\Expr) {
+                continue;
+            }
+            if (!$this->valueResolver->isValue($argExpr, $defaultAnnotationArgValue->getDefaultValue())) {
+                continue;
+            }
+            $this->attributeCleaner->clearAttributeAndArgName($node, $defaultAnnotationArgValue->getAnnotationClass(), $defaultAnnotationArgValue->getArgName());
+        }
         return $node;
     }
     private function refactorPropertyAnnotations(\PhpParser\Node\Stmt\Property $property) : void
     {
-        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
+        $phpDocInfo = $this->phpDocInfoFactory->createFromNode($property);
-        $this->refactorColumnAnnotation($phpDocInfo);
+        if ($phpDocInfo instanceof \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo) {
-        $this->refactorGeneratedValueAnnotation($phpDocInfo);
+            foreach ($this->defaultAnnotationArgValues as $defaultAnnotationArgValue) {
-        $this->refactorJoinColumnAnnotation($phpDocInfo);
+                $this->refactorAnnotation($phpDocInfo, $defaultAnnotationArgValue->getAnnotationClass(), $defaultAnnotationArgValue->getArgName(), $defaultAnnotationArgValue->getDefaultValue());
-        $this->refactorManyToManyAnnotation($phpDocInfo);
+            }
-        $this->refactorManyToOneAnnotation($phpDocInfo);
+        }
-        $this->refactorOneToManyAnnotation($phpDocInfo);
-        $this->refactorOneToOneAnnotation($phpDocInfo);
     }
-    private function refactorColumnAnnotation(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo) : void
+    /**
+     * @param class-string $annotationClass
+     * @param bool|int|string $defaultValue
+     */
+    private function refactorAnnotation(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo, string $annotationClass, string $argName, $defaultValue) : void
     {
-        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass('Doctrine\\ORM\\Mapping\\Column');
+        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass($annotationClass);
         if (!$doctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
             return;
         }
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, 'nullable', \false);
+        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, $argName, $defaultValue);
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, 'unique', \false);
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, 'precision', 0);
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, 'scale', 0);
-    }
-    private function refactorGeneratedValueAnnotation(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo) : void
-    {
-        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass('Doctrine\\ORM\\Mapping\\GeneratedValue');
-        if (!$doctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
-            return;
-        }
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, 'strategy', 'AUTO');
-    }
-    private function refactorJoinColumnAnnotation(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo) : void
-    {
-        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass('Doctrine\\ORM\\Mapping\\JoinColumn');
-        if (!$doctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
-            return;
-        }
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, 'nullable', \true);
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, 'referencedColumnName', 'id');
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, 'unique', \false);
-    }
-    private function refactorManyToManyAnnotation(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo) : void
-    {
-        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass('Doctrine\\ORM\\Mapping\\ManyToMany');
-        if (!$doctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
-            return;
-        }
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, self::ORPHAN_REMOVAL, \false);
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, self::FETCH, self::LAZY);
-    }
-    private function refactorManyToOneAnnotation(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo) : void
-    {
-        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass('Doctrine\\ORM\\Mapping\\ManyToOne');
-        if (!$doctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
-            return;
-        }
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, self::FETCH, self::LAZY);
-    }
-    private function refactorOneToManyAnnotation(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo) : void
-    {
-        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass('Doctrine\\ORM\\Mapping\\OneToMany');
-        if (!$doctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
-            return;
-        }
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, self::ORPHAN_REMOVAL, \false);
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, self::FETCH, self::LAZY);
-    }
-    private function refactorOneToOneAnnotation(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo) : void
-    {
-        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass('Doctrine\\ORM\\Mapping\\OneToOne');
-        if (!$doctrineAnnotationTagValueNode instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
-            return;
-        }
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, self::ORPHAN_REMOVAL, \false);
-        $this->doctrineItemDefaultValueManipulator->remove($phpDocInfo, $doctrineAnnotationTagValueNode, self::FETCH, self::LAZY);
     }
 }

vendor/rector/rector-doctrine/src/Rector/Property/TypedPropertyFromColumnTypeRector.php

@@ -24,18 +24,22 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class TypedPropertyFromColumnTypeRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\TypeDeclaration\NodeTypeAnalyzer\PropertyTypeDecorator
      */
     private $propertyTypeDecorator;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\ColumnPropertyTypeResolver
      */
     private $columnPropertyTypeResolver;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger
      */
     private $phpDocTypeChanger;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\NullabilityColumnPropertyTypeResolver
      */
     private $nullabilityColumnPropertyTypeResolver;

vendor/rector/rector-doctrine/src/Rector/Property/TypedPropertyFromToManyRelationTypeRector.php

@@ -22,14 +22,17 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class TypedPropertyFromToManyRelationTypeRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\TypeDeclaration\NodeTypeAnalyzer\PropertyTypeDecorator
      */
     private $propertyTypeDecorator;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger
      */
     private $phpDocTypeChanger;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\ToManyRelationPropertyTypeResolver
      */
     private $toManyRelationPropertyTypeResolver;

vendor/rector/rector-doctrine/src/Rector/Property/TypedPropertyFromToOneRelationTypeRector.php

@@ -4,6 +4,8 @@ declare (strict_types=1);
 namespace Rector\Doctrine\Rector\Property;
 
 use PhpParser\Node;
+use PhpParser\Node\ComplexType;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -22,14 +24,17 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class TypedPropertyFromToOneRelationTypeRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\TypeDeclaration\NodeTypeAnalyzer\PropertyTypeDecorator
      */
     private $propertyTypeDecorator;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger
      */
     private $phpDocTypeChanger;
     /**
+     * @readonly
      * @var \Rector\Doctrine\NodeManipulator\ToOneRelationPropertyTypeResolver
      */
     private $toOneRelationPropertyTypeResolver;
@@ -82,23 +87,33 @@ CODE_SAMPLE
             return null;
         }
         $propertyType = $this->toOneRelationPropertyTypeResolver->resolve($node);
-        if (!$propertyType instanceof \PHPStan\Type\Type || $propertyType instanceof \PHPStan\Type\MixedType) {
+        if (!$propertyType instanceof \PHPStan\Type\Type) {
+            return null;
+        }
+        if ($propertyType instanceof \PHPStan\Type\MixedType) {
             return null;
         }
         $typeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($propertyType, \Rector\PHPStanStaticTypeMapper\Enum\TypeKind::PROPERTY());
         if ($typeNode === null) {
             return null;
         }
-        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
+        $this->completePropertyTypeOrVarDoc($propertyType, $typeNode, $node);
-        if ($this->phpVersionProvider->isAtLeastPhpVersion(\Rector\Core\ValueObject\PhpVersion::PHP_74)) {
-            if ($propertyType instanceof \PHPStan\Type\UnionType) {
-                $this->propertyTypeDecorator->decoratePropertyUnionType($propertyType, $typeNode, $node, $phpDocInfo);
-                return $node;
-            }
-            $node->type = $typeNode;
-            return $node;
-        }
-        $this->phpDocTypeChanger->changeVarType($phpDocInfo, $propertyType);
         return $node;
     }
+    /**
+     * @param \PhpParser\Node\ComplexType|\PhpParser\Node\Name $typeNode
+     */
+    private function completePropertyTypeOrVarDoc(\PHPStan\Type\Type $propertyType, $typeNode, \PhpParser\Node\Stmt\Property $property) : void
+    {
+        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
+        if ($this->phpVersionProvider->isAtLeastPhpVersion(\Rector\Core\ValueObject\PhpVersion::PHP_74)) {
+            if ($propertyType instanceof \PHPStan\Type\UnionType) {
+                $this->propertyTypeDecorator->decoratePropertyUnionType($propertyType, $typeNode, $property, $phpDocInfo);
+                return;
+            }
+            $property->type = $typeNode;
+            return;
+        }
+        $this->phpDocTypeChanger->changeVarType($phpDocInfo, $propertyType);
+    }
 }

vendor/rector/rector-doctrine/src/Type/RepositoryTypeFactory.php

@@ -12,6 +12,7 @@ use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 final class RepositoryTypeFactory
 {
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-doctrine/src/TypeAnalyzer/CollectionTypeResolver.php

@@ -18,14 +18,17 @@ use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 final class CollectionTypeResolver
 {
     /**
+     * @readonly
      * @var \Rector\StaticTypeMapper\Naming\NameScopeFactory
      */
     private $nameScopeFactory;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
      */
     private $phpDocInfoFactory;
     /**
+     * @readonly
      * @var \Rector\Doctrine\PhpDoc\ShortClassExpander
      */
     private $shortClassExpander;

vendor/rector/rector-doctrine/src/TypeAnalyzer/CollectionVarTagValueNodeResolver.php

@@ -9,6 +9,7 @@ use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 final class CollectionVarTagValueNodeResolver
 {
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
      */
     private $phpDocInfoFactory;

vendor/rector/rector-doctrine/src/ValueObject/ArgName.php

@@ -0,0 +1,20 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Doctrine\ValueObject;
+
+final class ArgName
+{
+    /**
+     * @var string
+     */
+    public const FETCH = 'fetch';
+    /**
+     * @var string
+     */
+    public const LAZY = 'LAZY';
+    /**
+     * @var string
+     */
+    public const ORPHAN_REMOVAL = 'orphanRemoval';
+}

vendor/rector/rector-doctrine/src/ValueObject/AssignToPropertyFetch.php

@@ -8,14 +8,17 @@ use PhpParser\Node\Expr\PropertyFetch;
 final class AssignToPropertyFetch
 {
     /**
+     * @readonly
      * @var \PhpParser\Node\Expr\Assign
      */
     private $assign;
     /**
+     * @readonly
      * @var \PhpParser\Node\Expr\PropertyFetch
      */
     private $propertyFetch;
     /**
+     * @readonly
      * @var string
      */
     private $propertyName;

vendor/rector/rector-doctrine/src/ValueObject/DefaultAnnotationArgValue.php

@@ -0,0 +1,47 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Doctrine\ValueObject;
+
+final class DefaultAnnotationArgValue
+{
+    /**
+     * @readonly
+     * @var string
+     */
+    private $annotationClass;
+    /**
+     * @readonly
+     * @var string
+     */
+    private $argName;
+    /**
+     * @readonly
+     * @var bool|int|string
+     */
+    private $defaultValue;
+    /**
+     * @param bool|int|string $defaultValue
+     */
+    public function __construct(string $annotationClass, string $argName, $defaultValue)
+    {
+        $this->annotationClass = $annotationClass;
+        $this->argName = $argName;
+        $this->defaultValue = $defaultValue;
+    }
+    public function getAnnotationClass() : string
+    {
+        return $this->annotationClass;
+    }
+    public function getArgName() : string
+    {
+        return $this->argName;
+    }
+    /**
+     * @return bool|int|string
+     */
+    public function getDefaultValue()
+    {
+        return $this->defaultValue;
+    }
+}

vendor/rector/rector-doctrine/src/ValueObject/PropertyNameAndPhpDocInfo.php

@@ -7,10 +7,12 @@ use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 final class PropertyNameAndPhpDocInfo
 {
     /**
+     * @readonly
      * @var string
      */
     private $propertyName;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo
      */
     private $phpDocInfos;

vendor/rector/rector-doctrine/src/ValueObject/PropertyNamesAndPhpDocInfos.php

@@ -8,6 +8,7 @@ final class PropertyNamesAndPhpDocInfos
 {
     /**
      * @var PropertyNameAndPhpDocInfo[]
+     * @readonly
      */
     private $propertyNameAndPhpDocInfos;
     /**

vendor/rector/rector-nette/rector.php

@@ -21,7 +21,7 @@ return static function (\Symfony\Component\DependencyInjection\Loader\Configurat
     $services->set(\Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class)->configure(['Nette\\*', 'Symfony\\Component\\Translation\\TranslatorInterface', 'Symfony\\Contracts\\EventDispatcher\\Event', 'Kdyby\\Events\\Subscriber']);
     // needed for DEAD_CODE list, just in split package like this
     $containerConfigurator->import(__DIR__ . '/config/config.php');
-    $containerConfigurator->import(\Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_80);
+    $containerConfigurator->import(\Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_81);
     $containerConfigurator->import(\Rector\Set\ValueObject\SetList::DEAD_CODE);
     $containerConfigurator->import(\Rector\Set\ValueObject\SetList::CODE_QUALITY);
 };

vendor/rector/rector-nette/src/FileProcessor/LatteFileProcessor.php

@@ -15,9 +15,11 @@ final class LatteFileProcessor implements \Rector\Core\Contract\Processor\FilePr
 {
     /**
      * @var LatteRectorInterface[]
+     * @readonly
      */
     private $latteRectors;
     /**
+     * @readonly
      * @var \Rector\ChangesReporting\ValueObjectFactory\FileDiffFactory
      */
     private $fileDiffFactory;

vendor/rector/rector-nette/src/FileProcessor/NeonFileProcessor.php

@@ -17,22 +17,27 @@ use Rector\Parallel\ValueObject\Bridge;
 final class NeonFileProcessor implements \Rector\Core\Contract\Processor\FileProcessorInterface
 {
     /**
+     * @readonly
      * @var \Rector\Nette\NeonParser\NeonParser
      */
     private $neonParser;
     /**
+     * @readonly
      * @var \Rector\Nette\NeonParser\NeonNodeTraverserFactory
      */
     private $neonNodeTraverserFactory;
     /**
+     * @readonly
      * @var \Rector\Nette\NeonParser\Printer\FormatPreservingNeonPrinter
      */
     private $formatPreservingNeonPrinter;
     /**
      * @var NeonRectorInterface[]
+     * @readonly
      */
     private $neonRectors;
     /**
+     * @readonly
      * @var \Rector\ChangesReporting\ValueObjectFactory\FileDiffFactory
      */
     private $fileDiffFactory;

vendor/rector/rector-nette/src/FormControlTypeResolver/ArrayDimFetchControlTypeResolver.php

@@ -16,22 +16,27 @@ use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
 final class ArrayDimFetchControlTypeResolver implements \Rector\Nette\Contract\FormControlTypeResolverInterface
 {
     /**
+     * @readonly
      * @var \Rector\Nette\NodeAnalyzer\ControlDimFetchAnalyzer
      */
     private $controlDimFetchAnalyzer;
     /**
+     * @readonly
      * @var \Rector\Nette\Naming\NetteControlNaming
      */
     private $netteControlNaming;
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer
      */
     private $returnTypeInferer;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\AstResolver
      */
     private $astResolver;

vendor/rector/rector-nette/src/FormControlTypeResolver/AssignDimFetchFormTypeResolver.php

@@ -14,10 +14,12 @@ use Rector\NodeTypeResolver\NodeTypeResolver;
 final class AssignDimFetchFormTypeResolver implements \Rector\Nette\Contract\FormControlTypeResolverInterface
 {
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;

vendor/rector/rector-nette/src/FormControlTypeResolver/AssignedVariablesMethodCallsFormTypeResolver.php

@@ -17,6 +17,7 @@ final class AssignedVariablesMethodCallsFormTypeResolver implements \Rector\Nett
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-nette/src/FormControlTypeResolver/ClassMethodFormTypeResolver.php

@@ -20,10 +20,12 @@ final class ClassMethodFormTypeResolver implements \Rector\Nette\Contract\FormCo
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-nette/src/FormControlTypeResolver/ConstructorFormControlTypeResolver.php

@@ -19,10 +19,12 @@ final class ConstructorFormControlTypeResolver implements \Rector\Nette\Contract
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-nette/src/FormControlTypeResolver/GetComponentMethodCallFormControlTypeResolver.php

@@ -23,18 +23,22 @@ final class GetComponentMethodCallFormControlTypeResolver implements \Rector\Net
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\Value\ValueResolver
      */
     private $valueResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\AstResolver
      */
     private $astResolver;

vendor/rector/rector-nette/src/FormControlTypeResolver/MagicNetteFactoryInterfaceFormControlTypeResolver.php

@@ -24,18 +24,22 @@ final class MagicNetteFactoryInterfaceFormControlTypeResolver implements \Rector
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \PHPStan\Reflection\ReflectionProvider
      */
     private $reflectionProvider;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\AstResolver
      */
     private $astResolver;

vendor/rector/rector-nette/src/FormControlTypeResolver/NewFormControlTypeResolver.php

@@ -19,10 +19,12 @@ final class NewFormControlTypeResolver implements \Rector\Nette\Contract\FormCon
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\AstResolver
      */
     private $astResolver;

vendor/rector/rector-nette/src/FormControlTypeResolver/OnVariableMethodCallsFormControlTypeResolver.php

@@ -14,14 +14,17 @@ use Rector\NodeNameResolver\NodeNameResolver;
 final class OnVariableMethodCallsFormControlTypeResolver implements \Rector\Nette\Contract\FormControlTypeResolverInterface
 {
     /**
+     * @readonly
      * @var \Rector\Nette\NodeAnalyzer\MethodCallManipulator
      */
     private $methodCallManipulator;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\Value\ValueResolver
      */
     private $valueResolver;

vendor/rector/rector-nette/src/FormControlTypeResolver/ReturnFormControlTypeResolver.php

@@ -18,6 +18,7 @@ final class ReturnFormControlTypeResolver implements \Rector\Nette\Contract\Form
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-nette/src/FormControlTypeResolver/ThisVariableInAnotherMethodFormControlTypeResolver.php

@@ -20,10 +20,12 @@ final class ThisVariableInAnotherMethodFormControlTypeResolver implements \Recto
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-nette/src/FormControlTypeResolver/VariableConstructorFormControlTypeResolver.php

@@ -22,18 +22,22 @@ final class VariableConstructorFormControlTypeResolver implements \Rector\Nette\
      */
     private $methodNamesByInputNamesResolver;
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \PHPStan\Reflection\ReflectionProvider
      */
     private $reflectionProvider;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\AstResolver
      */
     private $astResolver;

vendor/rector/rector-nette/src/Kdyby/BlueprintFactory/VariableWithTypesFactory.php

@@ -15,14 +15,17 @@ use Rector\StaticTypeMapper\StaticTypeMapper;
 final class VariableWithTypesFactory
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\StaticTypeMapper\StaticTypeMapper
      */
     private $staticTypeMapper;
     /**
+     * @readonly
      * @var \Rector\Naming\Naming\VariableNaming
      */
     private $variableNaming;

vendor/rector/rector-nette/src/Kdyby/ContributeEventClassResolver.php

@@ -36,14 +36,17 @@ final class ContributeEventClassResolver
         'Contributte\\Events\\Extra\\Event\\Latte\\TemplateCreateEvent' => ['Nette\\Bridges\\ApplicationLatte\\Template' => 'getTemplate'],
     ];
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\StaticTypeMapper\StaticTypeMapper
      */
     private $staticTypeMapper;
     /**
+     * @readonly
      * @var \Rector\Naming\Naming\VariableNaming
      */
     private $variableNaming;
@@ -85,11 +88,7 @@ final class ContributeEventClassResolver
     }
     private function resolveParamType(?\PhpParser\Node\Identifier $identifier, \PhpParser\Node\Param $param) : string
     {
-        if ($identifier === null) {
+        $staticType = $identifier === null ? new \PHPStan\Type\MixedType() : $this->staticTypeMapper->mapPhpParserNodePHPStanType($identifier);
-            $staticType = new \PHPStan\Type\MixedType();
-        } else {
-            $staticType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($identifier);
-        }
         return $this->createGetterFromParamAndStaticType($param, $staticType);
     }
 }

vendor/rector/rector-nette/src/Kdyby/Naming/EventClassNaming.php

@@ -14,10 +14,12 @@ final class EventClassNaming
      */
     private const EVENT = 'Event';
     /**
+     * @readonly
      * @var \Rector\CodingStyle\Naming\ClassNaming
      */
     private $classNaming;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-nette/src/Kdyby/NodeAnalyzer/GetSubscribedEventsClassMethodAnalyzer.php

@@ -12,14 +12,17 @@ use Rector\NodeTypeResolver\NodeTypeResolver;
 final class GetSubscribedEventsClassMethodAnalyzer
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-nette/src/Kdyby/NodeFactory/EventValueObjectClassFactory.php

@@ -29,18 +29,22 @@ use RectorPrefix20220117\Symplify\Astral\ValueObject\NodeBuilder\NamespaceBuilde
 final class EventValueObjectClassFactory
 {
     /**
+     * @readonly
      * @var \Rector\CodingStyle\Naming\ClassNaming
      */
     private $classNaming;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\NodeFactory
      */
     private $nodeFactory;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\BlueprintFactory\VariableWithTypesFactory
      */
     private $variableWithTypesFactory;

vendor/rector/rector-nette/src/Kdyby/NodeManipulator/GetSubscribedEventsArrayManipulator.php

@@ -14,10 +14,12 @@ use RectorPrefix20220117\Symplify\Astral\NodeTraverser\SimpleCallableNodeTravers
 final class GetSubscribedEventsArrayManipulator
 {
     /**
+     * @readonly
      * @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
      */
     private $simpleCallableNodeTraverser;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\Value\ValueResolver
      */
     private $valueResolver;

vendor/rector/rector-nette/src/Kdyby/NodeManipulator/ListeningClassMethodArgumentManipulator.php

@@ -21,14 +21,17 @@ final class ListeningClassMethodArgumentManipulator
      */
     private const EVENT_PARAMETER_REPLACED = 'event_parameter_replaced';
     /**
+     * @readonly
      * @var \Rector\CodingStyle\Naming\ClassNaming
      */
     private $classNaming;
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\ContributeEventClassResolver
      */
     private $contributeEventClassResolver;
     /**
+     * @readonly
      * @var \Rector\Core\NodeAnalyzer\ParamAnalyzer
      */
     private $paramAnalyzer;

vendor/rector/rector-nette/src/Kdyby/NodeResolver/ListeningMethodsCollector.php

@@ -30,18 +30,22 @@ final class ListeningMethodsCollector
      */
     private $eventClassesAndClassMethods = [];
     /**
+     * @readonly
      * @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
      */
     private $simpleCallableNodeTraverser;
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\Naming\EventClassNaming
      */
     private $eventClassNaming;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\Value\ValueResolver
      */
     private $valueResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-nette/src/Kdyby/Rector/ClassMethod/ChangeNetteEventNamesInGetSubscribedEventsRector.php

@@ -26,22 +26,27 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class ChangeNetteEventNamesInGetSubscribedEventsRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\NodeManipulator\GetSubscribedEventsArrayManipulator
      */
     private $getSubscribedEventsArrayManipulator;
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\NodeManipulator\ListeningClassMethodArgumentManipulator
      */
     private $listeningClassMethodArgumentManipulator;
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\NodeResolver\ListeningMethodsCollector
      */
     private $listeningMethodsCollector;
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\NodeAnalyzer\GetSubscribedEventsClassMethodAnalyzer
      */
     private $getSubscribedEventsClassMethodAnalyzer;
     /**
+     * @readonly
      * @var \Rector\Privatization\NodeManipulator\VisibilityManipulator
      */
     private $visibilityManipulator;

vendor/rector/rector-nette/src/Kdyby/Rector/MethodCall/ReplaceEventManagerWithEventSubscriberRector.php

@@ -24,10 +24,12 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 final class ReplaceEventManagerWithEventSubscriberRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\Naming\EventClassNaming
      */
     private $eventClassNaming;
     /**
+     * @readonly
      * @var \Rector\Nette\Kdyby\NodeFactory\EventValueObjectClassFactory
      */
     private $eventValueObjectClassFactory;

vendor/rector/rector-nette/src/Kdyby/ValueObject/EventClassAndClassMethod.php

@@ -7,10 +7,12 @@ use PhpParser\Node\Stmt\ClassMethod;
 final class EventClassAndClassMethod
 {
     /**
+     * @readonly
      * @var string
      */
     private $eventClass;
     /**
+     * @readonly
      * @var \PhpParser\Node\Stmt\ClassMethod
      */
     private $classMethod;

vendor/rector/rector-nette/src/Kdyby/ValueObject/VariableWithType.php

@@ -13,10 +13,12 @@ use PHPStan\Type\Type;
 final class VariableWithType
 {
     /**
+     * @readonly
      * @var string
      */
     private $name;
     /**
+     * @readonly
      * @var \PHPStan\Type\Type
      */
     private $type;

vendor/rector/rector-nette/src/NodeAdding/FunctionLikeFirstLevelStatementResolver.php

@@ -15,10 +15,12 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
 final class FunctionLikeFirstLevelStatementResolver
 {
     /**
+     * @readonly
      * @var \Rector\NodeNestingScope\ParentScopeFinder
      */
     private $parentScopeFinder;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-nette/src/NodeAnalyzer/ArrayDimFetchRenamer.php

@@ -17,10 +17,12 @@ use RectorPrefix20220117\Symplify\Astral\NodeTraverser\SimpleCallableNodeTravers
 final class ArrayDimFetchRenamer
 {
     /**
+     * @readonly
      * @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
      */
     private $simpleCallableNodeTraverser;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Comparing\NodeComparator
      */
     private $nodeComparator;

vendor/rector/rector-nette/src/NodeAnalyzer/AssignAnalyzer.php

@@ -21,18 +21,22 @@ final class AssignAnalyzer
      */
     private $alreadyInitializedAssignsClassMethodObjectHashes = [];
     /**
+     * @readonly
      * @var \Rector\Nette\NodeAdding\FunctionLikeFirstLevelStatementResolver
      */
     private $functionLikeFirstLevelStatementResolver;
     /**
+     * @readonly
      * @var \Rector\PostRector\Collector\NodesToAddCollector
      */
     private $nodesToAddCollector;
     /**
+     * @readonly
      * @var \Rector\BetterPhpDocParser\PhpDocManipulator\VarAnnotationManipulator
      */
     private $varAnnotationManipulator;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;

vendor/rector/rector-nette/src/NodeAnalyzer/BinaryOpAnalyzer.php

@@ -10,6 +10,7 @@ use Rector\NodeNameResolver\NodeNameResolver;
 final class BinaryOpAnalyzer
 {
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;

vendor/rector/rector-nette/src/NodeAnalyzer/ControlDimFetchAnalyzer.php

@@ -13,6 +13,7 @@ use Rector\NodeTypeResolver\NodeTypeResolver;
 final class ControlDimFetchAnalyzer
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;

vendor/rector/rector-nette/src/NodeAnalyzer/MethodCallManipulator.php

@@ -17,14 +17,17 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
 final class MethodCallManipulator
 {
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
     /**
+     * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
     /**
+     * @readonly
      * @var \Rector\Defluent\NodeAnalyzer\FluentChainMethodCallNodeAnalyzer
      */
     private $fluentChainMethodCallNodeAnalyzer;

vendor/rector/rector-nette/src/NodeAnalyzer/NetteClassAnalyzer.php

@@ -11,10 +11,12 @@ use Rector\NodeTypeResolver\NodeTypeResolver;
 final class NetteClassAnalyzer
 {
     /**
+     * @readonly
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
     /**
+     * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
@@ -25,11 +27,7 @@ final class NetteClassAnalyzer
     }
     public function isInComponent(\PhpParser\Node $node) : bool
     {
-        if ($node instanceof \PhpParser\Node\Stmt\Class_) {
+        $class = $node instanceof \PhpParser\Node\Stmt\Class_ ? $node : $this->betterNodeFinder->findParentType($node, \PhpParser\Node\Stmt\Class_::class);
-            $class = $node;
-        } else {
-            $class = $this->betterNodeFinder->findParentType($node, \PhpParser\Node\Stmt\Class_::class);
-        }
         if (!$class instanceof \PhpParser\Node\Stmt\Class_) {
             return \false;
         }

vendor/rector/rector-nette/src/NodeAnalyzer/NetteInjectPropertyAnalyzer.php

@@ -14,6 +14,7 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
 final class NetteInjectPropertyAnalyzer
 {
     /**
+     * @readonly
      * @var \Rector\FamilyTree\NodeAnalyzer\ClassChildAnalyzer
      */
     private $classChildAnalyzer;