Updated Rector to commit 68c2bcd

rectorphp/rector-src@68c2bcd [composer] remove dependency on nette-to-symfony, very niche package that would require much work to be used in public (rectorphp#290)

composer.json

@@ -27,7 +27,6 @@
         "rector/rector-symfony": "*",
         "rector/rector-doctrine": "*",
         "rector/rector-nette": "*",
-        "rector/rector-nette-to-symfony": "*",
         "rector/rector-cakephp": "*"
     }
 }

packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php

@@ -5,15 +5,10 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
-use Rector\NodeCollector\NodeCollector\NodeRepository;
 use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
 use Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector;
 final class NodeCollectorNodeVisitor extends \PhpParser\NodeVisitorAbstract
 {
-    /**
-     * @var \Rector\NodeCollector\NodeCollector\NodeRepository
-     */
-    private $nodeRepository;
     /**
      * @var \Rector\NodeCollector\NodeCollector\ParsedNodeCollector
      */
@@ -22,9 +17,8 @@ final class NodeCollectorNodeVisitor extends \PhpParser\NodeVisitorAbstract
      * @var \Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector
      */
     private $parsedPropertyFetchNodeCollector;
-    public function __construct(\Rector\NodeCollector\NodeCollector\NodeRepository $nodeRepository, \Rector\NodeCollector\NodeCollector\ParsedNodeCollector $parsedNodeCollector, \Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector)
+    public function __construct(\Rector\NodeCollector\NodeCollector\ParsedNodeCollector $parsedNodeCollector, \Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector)
     {
-        $this->nodeRepository = $nodeRepository;
         $this->parsedNodeCollector = $parsedNodeCollector;
         $this->parsedPropertyFetchNodeCollector = $parsedPropertyFetchNodeCollector;
     }

packages/Set/ValueObject/SetList.php

@@ -46,10 +46,6 @@ final class SetList implements \Rector\Set\Contract\SetListInterface
      * @var string
      */
     public const GMAGICK_TO_IMAGICK = __DIR__ . '/../../../config/set/gmagick_to_imagick.php';
-    /**
-     * @var string
-     */
-    public const KDYBY_TO_SYMFONY = __DIR__ . '/../../../config/set/kdyby-to-symfony.php';
     /**
      * @var string
      */

rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php

@@ -8,7 +8,7 @@
 use Rector\Core\Rector\AbstractRector;
 use Rector\FileSystemRector\ValueObject\AddedFileWithNodes;
 use Rector\FileSystemRector\ValueObjectFactory\AddedFileWithNodesFactory;
-use Rector\NetteToSymfony\NodeAnalyzer\NetteControlFactoryInterfaceAnalyzer;
+use Rector\Nette\NodeAnalyzer\Component\NetteControlFactoryInterfaceAnalyzer;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
@@ -19,14 +19,14 @@
 final class MoveInterfacesToContractNamespaceDirectoryRector extends \Rector\Core\Rector\AbstractRector
 {
     /**
-     * @var \Rector\NetteToSymfony\NodeAnalyzer\NetteControlFactoryInterfaceAnalyzer
+     * @var \Rector\Nette\NodeAnalyzer\Component\NetteControlFactoryInterfaceAnalyzer
      */
     private $netteControlFactoryInterfaceAnalyzer;
     /**
      * @var \Rector\FileSystemRector\ValueObjectFactory\AddedFileWithNodesFactory
      */
     private $addedFileWithNodesFactory;
-    public function __construct(\Rector\NetteToSymfony\NodeAnalyzer\NetteControlFactoryInterfaceAnalyzer $netteControlFactoryInterfaceAnalyzer, \Rector\FileSystemRector\ValueObjectFactory\AddedFileWithNodesFactory $addedFileWithNodesFactory)
+    public function __construct(\Rector\Nette\NodeAnalyzer\Component\NetteControlFactoryInterfaceAnalyzer $netteControlFactoryInterfaceAnalyzer, \Rector\FileSystemRector\ValueObjectFactory\AddedFileWithNodesFactory $addedFileWithNodesFactory)
     {
         $this->netteControlFactoryInterfaceAnalyzer = $netteControlFactoryInterfaceAnalyzer;
         $this->addedFileWithNodesFactory = $addedFileWithNodesFactory;

rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php

@@ -11,7 +11,6 @@
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\ObjectType;
-use Rector\Core\NodeManipulator\ClassMethodManipulator;
 use Rector\Core\Rector\AbstractRector;
 use Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver;
 use Rector\NodeCollector\StaticAnalyzer;
@@ -25,10 +24,6 @@
  */
 final class StaticCallOnNonStaticToInstanceCallRector extends \Rector\Core\Rector\AbstractRector
 {
-    /**
-     * @var \Rector\Core\NodeManipulator\ClassMethodManipulator
-     */
-    private $classMethodManipulator;
     /**
      * @var \Rector\NodeCollector\StaticAnalyzer
      */
@@ -41,9 +36,8 @@ final class StaticCallOnNonStaticToInstanceCallRector extends \Rector\Core\Recto
      * @var \Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver
      */
     private $parentClassScopeResolver;
-    public function __construct(\Rector\Core\NodeManipulator\ClassMethodManipulator $classMethodManipulator, \Rector\NodeCollector\StaticAnalyzer $staticAnalyzer, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver $parentClassScopeResolver)
+    public function __construct(\Rector\NodeCollector\StaticAnalyzer $staticAnalyzer, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver $parentClassScopeResolver)
     {
-        $this->classMethodManipulator = $classMethodManipulator;
         $this->staticAnalyzer = $staticAnalyzer;
         $this->reflectionProvider = $reflectionProvider;
         $this->parentClassScopeResolver = $parentClassScopeResolver;

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = '417d89867df93be3a9b8e980be0d65296618a01c';
+    public const PACKAGE_VERSION = '68c2bcda1bad5b45226f6af5232c19139a902a95';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2021-06-25 17:37:55';
+    public const RELEASE_DATE = '2021-06-25 18:59:21';
     public static function resolvePackageVersion() : string
     {
         $process = new \RectorPrefix20210625\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

vendor/autoload.php

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

vendor/composer/autoload_classmap.php

@@ -2298,35 +2298,6 @@
     'Rector\\Naming\\ValueObject\\VariableAndCallAssign' => $baseDir . '/rules/Naming/ValueObject/VariableAndCallAssign.php',
     'Rector\\Naming\\ValueObject\\VariableAndCallForeach' => $baseDir . '/rules/Naming/ValueObject/VariableAndCallForeach.php',
     'Rector\\Naming\\VariableRenamer' => $baseDir . '/rules/Naming/VariableRenamer.php',
-    'Rector\\NetteToSymfony\\AssertManipulator' => $vendorDir . '/rector/rector-nette-to-symfony/src/AssertManipulator.php',
-    'Rector\\NetteToSymfony\\Collector\\OnFormVariableMethodCallsCollector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Collector/OnFormVariableMethodCallsCollector.php',
-    'Rector\\NetteToSymfony\\NodeAnalyzer\\ClassMethodRenderAnalyzer' => $vendorDir . '/rector/rector-nette-to-symfony/src/NodeAnalyzer/ClassMethodRenderAnalyzer.php',
-    'Rector\\NetteToSymfony\\NodeAnalyzer\\NetteControlFactoryInterfaceAnalyzer' => $vendorDir . '/rector/rector-nette-to-symfony/src/NodeAnalyzer/NetteControlFactoryInterfaceAnalyzer.php',
-    'Rector\\NetteToSymfony\\NodeFactory\\ActionWithFormProcessClassMethodFactory' => $vendorDir . '/rector/rector-nette-to-symfony/src/NodeFactory/ActionWithFormProcessClassMethodFactory.php',
-    'Rector\\NetteToSymfony\\NodeFactory\\BuildFormClassMethodFactory' => $vendorDir . '/rector/rector-nette-to-symfony/src/NodeFactory/BuildFormClassMethodFactory.php',
-    'Rector\\NetteToSymfony\\NodeFactory\\SymfonyControllerFactory' => $vendorDir . '/rector/rector-nette-to-symfony/src/NodeFactory/SymfonyControllerFactory.php',
-    'Rector\\NetteToSymfony\\NodeFactory\\SymfonyMethodCallsFactory' => $vendorDir . '/rector/rector-nette-to-symfony/src/NodeFactory/SymfonyMethodCallsFactory.php',
-    'Rector\\NetteToSymfony\\Rector\\ClassMethod\\RenameEventNamesInEventSubscriberRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/ClassMethod/RenameEventNamesInEventSubscriberRector.php',
-    'Rector\\NetteToSymfony\\Rector\\ClassMethod\\RouterListToControllerAnnotationsRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/ClassMethod/RouterListToControllerAnnotationsRector.php',
-    'Rector\\NetteToSymfony\\Rector\\Class_\\FormControlToControllerAndFormTypeRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/Class_/FormControlToControllerAndFormTypeRector.php',
-    'Rector\\NetteToSymfony\\Rector\\Class_\\NetteControlToSymfonyControllerRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/Class_/NetteControlToSymfonyControllerRector.php',
-    'Rector\\NetteToSymfony\\Rector\\Class_\\NetteTesterClassToPHPUnitClassRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/Class_/NetteTesterClassToPHPUnitClassRector.php',
-    'Rector\\NetteToSymfony\\Rector\\Class_\\RenameTesterTestToPHPUnitToTestFileRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/Class_/RenameTesterTestToPHPUnitToTestFileRector.php',
-    'Rector\\NetteToSymfony\\Rector\\Interface_\\DeleteFactoryInterfaceRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/Interface_/DeleteFactoryInterfaceRector.php',
-    'Rector\\NetteToSymfony\\Rector\\MethodCall\\FromHttpRequestGetHeaderToHeadersGetRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector.php',
-    'Rector\\NetteToSymfony\\Rector\\MethodCall\\FromRequestGetParameterToAttributesGetRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/MethodCall/FromRequestGetParameterToAttributesGetRector.php',
-    'Rector\\NetteToSymfony\\Rector\\MethodCall\\NetteFormToSymfonyFormRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/MethodCall/NetteFormToSymfonyFormRector.php',
-    'Rector\\NetteToSymfony\\Rector\\MethodCall\\WrapTransParameterNameRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/MethodCall/WrapTransParameterNameRector.php',
-    'Rector\\NetteToSymfony\\Rector\\StaticCall\\NetteAssertToPHPUnitAssertRector' => $vendorDir . '/rector/rector-nette-to-symfony/src/Rector/StaticCall/NetteAssertToPHPUnitAssertRector.php',
-    'Rector\\NetteToSymfony\\Route\\RouteInfoFactory' => $vendorDir . '/rector/rector-nette-to-symfony/src/Route/RouteInfoFactory.php',
-    'Rector\\NetteToSymfony\\Routing\\ExplicitRouteAnnotationDecorator' => $vendorDir . '/rector/rector-nette-to-symfony/src/Routing/ExplicitRouteAnnotationDecorator.php',
-    'Rector\\NetteToSymfony\\Set\\NetteToSymfonySetList' => $vendorDir . '/rector/rector-nette-to-symfony/src/Set/NetteToSymfonySetList.php',
-    'Rector\\NetteToSymfony\\SymfonyFormAbstractTypeFactory' => $vendorDir . '/rector/rector-nette-to-symfony/src/SymfonyFormAbstractTypeFactory.php',
-    'Rector\\NetteToSymfony\\ValueObjectFactory\\EventInfosFactory' => $vendorDir . '/rector/rector-nette-to-symfony/src/ValueObjectFactory/EventInfosFactory.php',
-    'Rector\\NetteToSymfony\\ValueObject\\ClassMethodRender' => $vendorDir . '/rector/rector-nette-to-symfony/src/ValueObject/ClassMethodRender.php',
-    'Rector\\NetteToSymfony\\ValueObject\\EventInfo' => $vendorDir . '/rector/rector-nette-to-symfony/src/ValueObject/EventInfo.php',
-    'Rector\\NetteToSymfony\\ValueObject\\NetteFormMethodToSymfonyTypeClass' => $vendorDir . '/rector/rector-nette-to-symfony/src/ValueObject/NetteFormMethodToSymfonyTypeClass.php',
-    'Rector\\NetteToSymfony\\ValueObject\\RouteInfo' => $vendorDir . '/rector/rector-nette-to-symfony/src/ValueObject/RouteInfo.php',
     'Rector\\Nette\\Contract\\FormControlTypeResolverInterface' => $vendorDir . '/rector/rector-nette/src/Contract/FormControlTypeResolverInterface.php',
     'Rector\\Nette\\Contract\\PregToNetteUtilsStringInterface' => $vendorDir . '/rector/rector-nette/src/Contract/PregToNetteUtilsStringInterface.php',
     'Rector\\Nette\\Contract\\Rector\\LatteRectorInterface' => $vendorDir . '/rector/rector-nette/src/Contract/Rector/LatteRectorInterface.php',
@@ -2358,6 +2329,7 @@
     'Rector\\Nette\\Kdyby\\NodeResolver\\ListeningMethodsCollector' => $vendorDir . '/rector/rector-nette/src/Kdyby/NodeResolver/ListeningMethodsCollector.php',
     'Rector\\Nette\\Kdyby\\Rector\\ClassMethod\\ChangeNetteEventNamesInGetSubscribedEventsRector' => $vendorDir . '/rector/rector-nette/src/Kdyby/Rector/ClassMethod/ChangeNetteEventNamesInGetSubscribedEventsRector.php',
     'Rector\\Nette\\Kdyby\\Rector\\MethodCall\\ReplaceEventManagerWithEventSubscriberRector' => $vendorDir . '/rector/rector-nette/src/Kdyby/Rector/MethodCall/ReplaceEventManagerWithEventSubscriberRector.php',
+    'Rector\\Nette\\Kdyby\\Rector\\MethodCall\\WrapTransParameterNameRector' => $vendorDir . '/rector/rector-nette/src/Kdyby/Rector/MethodCall/WrapTransParameterNameRector.php',
     'Rector\\Nette\\Kdyby\\ValueObject\\EventAndListenerTree' => $vendorDir . '/rector/rector-nette/src/Kdyby/ValueObject/EventAndListenerTree.php',
     'Rector\\Nette\\Kdyby\\ValueObject\\EventClassAndClassMethod' => $vendorDir . '/rector/rector-nette/src/Kdyby/ValueObject/EventClassAndClassMethod.php',
     'Rector\\Nette\\Kdyby\\ValueObject\\GetterMethodBlueprint' => $vendorDir . '/rector/rector-nette/src/Kdyby/ValueObject/GetterMethodBlueprint.php',
@@ -2370,6 +2342,7 @@
     'Rector\\Nette\\NodeAnalyzer\\ArrayDimFetchAnalyzer' => $vendorDir . '/rector/rector-nette/src/NodeAnalyzer/ArrayDimFetchAnalyzer.php',
     'Rector\\Nette\\NodeAnalyzer\\AssignAnalyzer' => $vendorDir . '/rector/rector-nette/src/NodeAnalyzer/AssignAnalyzer.php',
     'Rector\\Nette\\NodeAnalyzer\\BinaryOpAnalyzer' => $vendorDir . '/rector/rector-nette/src/NodeAnalyzer/BinaryOpAnalyzer.php',
+    'Rector\\Nette\\NodeAnalyzer\\Component\\NetteControlFactoryInterfaceAnalyzer' => $vendorDir . '/rector/rector-nette/src/NodeAnalyzer/Component/NetteControlFactoryInterfaceAnalyzer.php',
     'Rector\\Nette\\NodeAnalyzer\\ConditionalTemplateAssignReplacer' => $vendorDir . '/rector/rector-nette/src/NodeAnalyzer/ConditionalTemplateAssignReplacer.php',
     'Rector\\Nette\\NodeAnalyzer\\ControlDimFetchAnalyzer' => $vendorDir . '/rector/rector-nette/src/NodeAnalyzer/ControlDimFetchAnalyzer.php',
     'Rector\\Nette\\NodeAnalyzer\\NetteClassAnalyzer' => $vendorDir . '/rector/rector-nette/src/NodeAnalyzer/NetteClassAnalyzer.php',

vendor/composer/autoload_psr4.php

@@ -14,7 +14,6 @@
     'Rector\\RectorInstaller\\' => array($vendorDir . '/rector/extension-installer/src'),
     'Rector\\PHPUnit\\' => array($vendorDir . '/rector/rector-phpunit/src'),
     'Rector\\Nette\\' => array($vendorDir . '/rector/rector-nette/src'),
-    'Rector\\NetteToSymfony\\' => array($vendorDir . '/rector/rector-nette-to-symfony/src'),
     'Rector\\Laravel\\' => array($vendorDir . '/rector/rector-laravel/src'),
     'Rector\\Doctrine\\' => array($vendorDir . '/rector/rector-doctrine/src'),
     'Rector\\Core\\' => array($baseDir . '/src'),

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit4f63aa8e87141b4ceeebbcc45fb1e37f
+class ComposerAutoloaderInit55d77de373068deda6c6409f95051069
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit4f63aa8e87141b4ceeebbcc45fb1e37f', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit55d77de373068deda6c6409f95051069', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit4f63aa8e87141b4ceeebbcc45fb1e37f', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit55d77de373068deda6c6409f95051069', '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\ComposerStaticInit4f63aa8e87141b4ceeebbcc45fb1e37f::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit55d77de373068deda6c6409f95051069::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,19 +42,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit4f63aa8e87141b4ceeebbcc45fb1e37f::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit55d77de373068deda6c6409f95051069::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire4f63aa8e87141b4ceeebbcc45fb1e37f($fileIdentifier, $file);
+            composerRequire55d77de373068deda6c6409f95051069($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire4f63aa8e87141b4ceeebbcc45fb1e37f($fileIdentifier, $file)
+function composerRequire55d77de373068deda6c6409f95051069($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;