Post moving cleanup (#5827)

.github/workflows/rector.yaml

@@ -21,10 +21,73 @@ jobs:
             fail-fast: false
             matrix:
                 directories:
-                    - rules
                     - packages
+                    - packages-tests
                     - src
                     - tests
+                    - rules-tests
+
+                    - rules/Arguments
+                    - rules/Autodiscovery
+                    - rules/CakePHP
+                    - rules/Carbon
+                    - rules/CodeQuality
+                    - rules/CodeQualityStrict
+                    - rules/CodingStyle
+                    - rules/Composer
+                    - rules/DeadCode
+                    - rules/DeadDocBlock
+                    - rules/Defluent
+                    - rules/DependencyInjection
+                    - rules/Doctrine
+                    - rules/DoctrineCodeQuality
+                    - rules/DoctrineGedmoToKnplabs
+                    - rules/DowngradePhp70
+                    - rules/DowngradePhp71
+                    - rules/DowngradePhp72
+                    - rules/DowngradePhp73
+                    - rules/DowngradePhp74
+                    - rules/DowngradePhp80
+                    - rules/EarlyReturn
+                    - rules/Generics
+                    - rules/Laravel
+                    - rules/MockeryToProphecy
+                    - rules/MysqlToMysqli
+                    - rules/Naming
+                    - rules/Nette
+                    - rules/NetteCodeQuality
+                    - rules/NetteKdyby
+                    - rules/NetteTesterToPHPUnit
+                    - rules/NetteToSymfony
+                    - rules/Order
+                    - rules/Php52
+                    - rules/Php53
+                    - rules/Php54
+                    - rules/Php55
+                    - rules/Php56
+                    - rules/Php70
+                    - rules/Php71
+                    - rules/Php72
+                    - rules/Php73
+                    - rules/Php74
+                    - rules/Php80
+                    - rules/PHPOffice
+                    - rules/PhpSpecToPHPUnit
+                    - rules/PHPUnit
+                    - rules/Privatization
+                    - rules/PSR4
+                    - rules/Removing
+                    - rules/RemovingStatic
+                    - rules/Renaming
+                    - rules/Restoration
+                    - rules/Symfony
+                    - rules/Symfony2
+                    - rules/Symfony3
+                    - rules/Symfony4
+                    - rules/Symfony5
+                    - rules/Transform
+                    - rules/TypeDeclaration
+                    - rules/Visibility
 
         runs-on: ubuntu-latest
         steps:
@@ -49,6 +112,16 @@ jobs:
                     php-version: 7.3
                     coverage: none
 
+            -   uses: actions/cache@v2
+                env:
+                    cache-name: rector-container-cache
+                with:
+                    path: tmp
+                    key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('${{ matrix.directories }}') }}
+                    restore-keys: |
+                        ${{ runner.os }}-build-${{ env.cache-name }}-
+                        ${{ runner.os }}-build-
+                        ${{ runner.os }}-
 
             -   run: composer install --no-progress --ansi
 

.gitignore

@@ -14,3 +14,5 @@ abz
 
 php-scoper.phar
 box.phar
+
+tmp

ci/downgrade/composer.json

@@ -145,7 +145,7 @@
             "Rector\\Set\\": "packages/set/src",
             "Rector\\StaticTypeMapper\\": "packages/static-type-mapper/src",
             "Rector\\CodeQualityStrict\\": "rules/code-quality-strict/src",
-            "Rector\\SymfonyCodeQuality\\": "rules/symfony-code-quality/src",
+            "Rector\\Symfony\\": "rules/symfony-code-quality/src",
             "Rector\\SymfonyPhpConfig\\": "rules/symfony-php-config/src",
             "Rector\\Symfony\\": "rules/symfony/src",
             "Rector\\Symfony2\\": "rules/symfony2/src",
@@ -258,7 +258,7 @@
             "Rector\\Restoration\\Tests\\": "rules/restoration/tests",
             "Rector\\Sensio\\Tests\\": "rules/sensio/tests",
             "Rector\\CodeQualityStrict\\Tests\\": "rules/code-quality-strict/tests",
-            "Rector\\SymfonyCodeQuality\\Tests\\": "rules/symfony-code-quality/tests",
+            "Rector\\Symfony\\Tests\\": "rules/symfony-code-quality/tests",
             "Rector\\SymfonyPhpConfig\\Tests\\": "rules/symfony-php-config/tests",
             "Rector\\Symfony\\Tests\\": "rules/symfony/tests",
             "Rector\\Symfony2\\Tests\\": "rules/symfony2/tests",

composer.json

@@ -91,6 +91,15 @@
         }
     },
     "autoload-dev": {
+        "psr-4": {
+            "Rector\\Tests\\": ["packages-tests", "rules-tests"],
+            "Rector\\Core\\Tests\\": "tests",
+            "Rector\\RuleDocGenerator\\": "utils/rule-doc-generator/src",
+            "Rector\\PHPStanExtensions\\": "utils/phpstan-extensions/src",
+            "Rector\\PHPStanExtensions\\Tests\\": "utils/phpstan-extensions/tests",
+            "Rector\\Utils\\DoctrineAnnotationParserSyncer\\": "utils/doctrine-annotation-parser-syncer/src",
+            "Rector\\Utils\\ProjectValidator\\": "utils/project-validator/src"
+        },
         "classmap": [
             "rules-tests/Autodiscovery/Rector/FileNode/MoveInterfacesToContractNamespaceDirectoryRector/Expected",
             "rules-tests/Autodiscovery/Rector/FileNode/MoveServicesBySuffixToDirectoryRector/Expected",
@@ -118,16 +127,7 @@
             "rules-tests/TypeDeclaration/Rector/Property/CompleteVarDocTypePropertyRector/Source/EventDispatcher.php",
             "vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php",
             "tests/debug_functions.php"
-        ],
-        "psr-4": {
-            "Rector\\Tests\\": ["packages-tests", "rules-tests"],
-            "Rector\\Core\\Tests\\": "tests",
-            "Rector\\RuleDocGenerator\\": "utils/rule-doc-generator/src",
-            "Rector\\PHPStanExtensions\\": "utils/phpstan-extensions/src",
-            "Rector\\PHPStanExtensions\\Tests\\": "utils/phpstan-extensions/tests",
-            "Rector\\Utils\\DoctrineAnnotationParserSyncer\\": "utils/doctrine-annotation-parser-syncer/src",
-            "Rector\\Utils\\ProjectValidator\\": "utils/project-validator/src"
-        }
+        ]
     },
     "scripts": {
         "complete-check": [

config/set/framework-extra-bundle-40.php

@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Rector\Sensio\Rector\ClassMethod\RemoveServiceFromSensioRouteRector;
-use Rector\Sensio\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector;
+use Rector\Symfony\Rector\ClassMethod\RemoveServiceFromSensioRouteRector;
+use Rector\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {

config/set/framework-extra-bundle-50.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector;
+use Rector\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {

config/set/symfony-code-quality.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
+use Rector\Symfony\Rector\Attribute\ExtractAttributeRouteNameConstantsRector;
 use Rector\Symfony\Rector\BinaryOp\ResponseStatusCodeRector;
+use Rector\Symfony\Rector\Class_\EventListenerToEventSubscriberRector;
 use Rector\Symfony\Rector\Class_\MakeCommandLazyRector;
-use Rector\SymfonyCodeQuality\Rector\Attribute\ExtractAttributeRouteNameConstantsRector;
-use Rector\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {

phpstan.neon

@@ -387,7 +387,7 @@ parameters:
         - '#Method Rector\\Core\\PhpParser\\Node\\BetterNodeFinder\:\:findVariableOfName\(\) should return PhpParser\\Node\\Expr\\Variable\|null but returns T of PhpParser\\Node\|null#'
 
         # fixed in php-parser master
-        - '#Method Rector\\SymfonyCodeQuality\\NodeFactory\\RouteNameClassFactory\:\:create\(\) should return PhpParser\\Node\\Stmt\\Namespace_ but returns PhpParser\\Node#'
+        - '#Method Rector\\Symfony\\NodeFactory\\RouteNameClassFactory\:\:create\(\) should return PhpParser\\Node\\Stmt\\Namespace_ but returns PhpParser\\Node#'
         - '#Parameter \#4 \$classWithConstants of class Rector\\Privatization\\ValueObject\\ReplaceStringWithClassConstant constructor expects class\-string, string given#'
         - '#Method Rector\\BetterPhpDocParser\\Tests\\PhpDocParser\\AbstractPhpDocInfoTest\:\:parseFileAndGetFirstNodeOfType\(\) should return T of PhpParser\\Node but returns PhpParser\\Node#'
 
@@ -622,3 +622,5 @@ parameters:
             message: '#Function "class_exists\(\)" cannot be used/left in the code#'
             paths:
                 - src/HttpKernel/RectorKernel.php
+
+        - '#Content of method "getIfNextReturn\(\)" is duplicated with method "getIfNextReturn\(\)" in "Rector\\EarlyReturn\\Rector\\If_\\ChangeAndIfToEarlyReturnRector" class\. Use unique content or service instead#'

rector.php

@@ -14,7 +14,6 @@ use Rector\Privatization\Rector\Property\PrivatizeLocalPropertyToPrivateProperty
 use Rector\Restoration\Rector\ClassMethod\InferParamFromClassMethodReturnRector;
 use Rector\Restoration\ValueObject\InferParamFromClassMethodReturn;
 use Rector\Set\ValueObject\SetList;
-use Rector\SymfonyPhpConfig\Rector\MethodCall\AutoInPhpSymfonyConfigRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 
@@ -36,8 +35,6 @@ return static function (ContainerConfigurator $containerConfigurator): void {
             ],
         ]]);
 
-    $services->set(AutoInPhpSymfonyConfigRector::class);
-
     $parameters = $containerConfigurator->parameters();
 
     $parameters->set(Option::SETS, [
@@ -64,7 +61,9 @@ return static function (ContainerConfigurator $containerConfigurator): void {
     $parameters->set(Option::PATHS, [
         __DIR__ . '/src',
         __DIR__ . '/rules',
+        __DIR__ . '/rules-tests',
         __DIR__ . '/packages',
+        __DIR__ . '/packages-tests',
         __DIR__ . '/tests',
         __DIR__ . '/utils',
         __DIR__ . '/config/set',

rules-tests/Sensio/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/Source/ClassToBeCreated.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Source;
-
-final class ClassToBeCreated
-{
-
-}

rules-tests/Symfony/Rector/Attribute/ExtractAttributeRouteNameConstantsRector/ExtractAttributeRouteNameConstantsRectorTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Attribute\ExtractAttributeRouteNameConstantsRector;
+namespace Rector\Tests\Symfony\Rector\Attribute\ExtractAttributeRouteNameConstantsRector;
 
 use Iterator;
-use Rector\SymfonyCodeQuality\Rector\Attribute\ExtractAttributeRouteNameConstantsRector;
+use Rector\Symfony\Rector\Attribute\ExtractAttributeRouteNameConstantsRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 

rules-tests/Symfony/Rector/Attribute/ExtractAttributeRouteNameConstantsRector/Fixture/fixture.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Attribute\ExtractAttributeRouteNameConstantsRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Attribute\ExtractAttributeRouteNameConstantsRector\Fixture;
 
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -21,7 +21,7 @@ class SomeClass
 -----
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Attribute\ExtractAttributeRouteNameConstantsRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Attribute\ExtractAttributeRouteNameConstantsRector\Fixture;
 
 use Symfony\Component\Routing\Annotation\Route;
 

rules-tests/Symfony/Rector/ClassMethod/RemoveServiceFromSensioRouteRector/Fixture/fixture.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\RemoveServiceFromSensioRouteRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\RemoveServiceFromSensioRouteRector\Fixture;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 
@@ -18,7 +18,7 @@ final class SomeClass
 -----
 <?php
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\RemoveServiceFromSensioRouteRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\RemoveServiceFromSensioRouteRector\Fixture;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 

rules-tests/Symfony/Rector/ClassMethod/RemoveServiceFromSensioRouteRector/RemoveServiceFromSensioRouteRectorTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\RemoveServiceFromSensioRouteRector;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\RemoveServiceFromSensioRouteRector;
 
 use Iterator;
-use Rector\Sensio\Rector\ClassMethod\RemoveServiceFromSensioRouteRector;
+use Rector\Symfony\Rector\ClassMethod\RemoveServiceFromSensioRouteRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 

rules-tests/Symfony/Rector/ClassMethod/ReplaceSensioRouteAnnotationWithSymfonyRector/Fixture/fixture.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector\Fixture;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 
@@ -18,7 +18,7 @@ final class SomeClass
 -----
 <?php
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector\Fixture;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 

rules-tests/Symfony/Rector/ClassMethod/ReplaceSensioRouteAnnotationWithSymfonyRector/Fixture/skip_alreacy_symfony_route.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector\Fixture;
 
 use Symfony\Component\Routing\Annotation\Route;
 

rules-tests/Symfony/Rector/ClassMethod/ReplaceSensioRouteAnnotationWithSymfonyRector/ReplaceSensioRouteAnnotationWithSymfonyRectorTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector;
 
 use Iterator;
-use Rector\Sensio\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector;
+use Rector\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 

rules-tests/Symfony/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/Fixture/array_map_return_controller.php.inc

@@ -2,7 +2,7 @@
 
 namespace AppBundle\Controller;
 
-use Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Source\ClassToBeCreated;
+use Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Source\ClassToBeCreated;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
@@ -27,7 +27,7 @@ final class ArrayMapReturnController extends AbstractController
 
 namespace AppBundle\Controller;
 
-use Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Source\ClassToBeCreated;
+use Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Source\ClassToBeCreated;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 

rules-tests/Symfony/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/Fixture/compact_controller.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Fixture;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -23,7 +23,7 @@ final class CompactController extends AbstractController
 -----
 <?php
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Fixture;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

rules-tests/Symfony/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/Fixture/skip_only_remove.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Fixture;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

rules-tests/Symfony/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/Source/ClassToBeCreated.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\Source;
+
+final class ClassToBeCreated
+{
+
+}

rules-tests/Symfony/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/TemplateAnnotationToThisRenderRectorTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector;
+namespace Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector;
 
 use Iterator;
-use Rector\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector;
+use Rector\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 

rules-tests/Symfony/Rector/Class_/EventListenerToEventSubscriberRector/EventListenerToEventSubscriberRectorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;

rules-tests/Symfony/Rector/Class_/EventListenerToEventSubscriberRector/Fixture/multiple_listeners.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class MultipleMethods
 {
@@ -21,7 +21,7 @@ class MultipleMethods
 -----
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class MultipleMethodsEventSubscriber implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
 {

rules-tests/Symfony/Rector/Class_/EventListenerToEventSubscriberRector/Fixture/multiple_listeners_called_once.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class MultipleListenersCalledOnce
 {
@@ -17,7 +17,7 @@ class MultipleListenersCalledOnce
 -----
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class MultipleListenersCalledOnceEventSubscriber implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
 {

rules-tests/Symfony/Rector/Class_/EventListenerToEventSubscriberRector/Fixture/multiple_listeners_with_non_kernel.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class MultipleMethodsWithNonKernel
 {
@@ -17,7 +17,7 @@ class MultipleMethodsWithNonKernel
 -----
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class MultipleMethodsWithNonKernelEventSubscriber implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
 {

rules-tests/Symfony/Rector/Class_/EventListenerToEventSubscriberRector/Fixture/some_listener.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class SomeListener
 {
@@ -13,7 +13,7 @@ class SomeListener
 -----
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class SomeEventSubscriber implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
 {

rules-tests/Symfony/Rector/Class_/EventListenerToEventSubscriberRector/Fixture/with_priority_listener.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class WithPriorityListener
 {
@@ -13,7 +13,7 @@ class WithPriorityListener
 -----
 <?php
 
-namespace Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture;
 
 class WithPriorityEventSubscriber implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
 {

rules-tests/Symfony/Rector/Class_/EventListenerToEventSubscriberRector/config/config_with_parameter.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Core\Configuration\Option;
-use Rector\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector;
+use Rector\Symfony\Rector\Class_\EventListenerToEventSubscriberRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {

rules-tests/Symfony/Rector/Class_/EventListenerToEventSubscriberRector/config/listener_services.xml

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="first_listener" class="Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\SomeListener">
+        <service id="first_listener" class="Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\SomeListener">
             <tag name="kernel.event_listener" event="some_event" method="methodToBeCalled"/>
         </service>
 
-        <service id="second_listener" class="Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\WithPriorityListener">
+        <service id="second_listener" class="Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\WithPriorityListener">
             <tag name="kernel.event_listener" event="some_event" method="callMe" priority="1540" />
         </service>
 
-        <service id="third_listener" class="Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\MultipleMethods">
+        <service id="third_listener" class="Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\MultipleMethods">
             <tag name="kernel.event_listener" event="single_event" method="singles"/>
             <tag name="kernel.event_listener" event="multi_event" method="callMe"/>
             <tag name="kernel.event_listener" event="multi_event" method="meToo"/>
         </service>
 
-        <service id="fourth_listener" class="Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\MultipleListenersCalledOnce">
+        <service id="fourth_listener" class="Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\MultipleListenersCalledOnce">
             <tag name="kernel.event_listener" event="single_event" method="singles"/>
             <tag name="kernel.event_listener" event="single_second_event" method="second"/>
         </service>
 
-        <service id="fifth_listener" class="Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\MultipleMethodsWithNonKernel">
+        <service id="fifth_listener" class="Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\Fixture\MultipleMethodsWithNonKernel">
             <tag name="another_listener" event="unknown_event" method="unknownMethod"/>
             <tag name="kernel.event_listener" event="single_event" method="singles"/>
         </service>

rules-tests/Symfony/Rector/StaticCall/AddMessageToEqualsResponseCodeRector/AddMessageToEqualsResponseCodeRectorTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\PHPUnitSymfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector;
+namespace Rector\Tests\Symfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector;
 
 use Iterator;
-use Rector\PHPUnitSymfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector;
+use Rector\Symfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 

rules-tests/Symfony/Rector/StaticCall/AddMessageToEqualsResponseCodeRector/Fixture/fixture.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\PHPUnitSymfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\Fixture;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
@@ -26,7 +26,7 @@ final class SomeClassTest extends TestCase
 -----
 <?php
 
-namespace Rector\Tests\PHPUnitSymfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\Fixture;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;

rules-tests/Symfony/Rector/StaticCall/AddMessageToEqualsResponseCodeRector/Fixture/method_call.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\PHPUnitSymfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\Fixture;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
@@ -24,7 +24,7 @@ final class MethodCallTest extends TestCase
 -----
 <?php
 
-namespace Rector\Tests\PHPUnitSymfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\Fixture;
+namespace Rector\Tests\Symfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\Fixture;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;

rules-tests/SymfonyPhpConfig/Rector/MethodCall/AutoInPhpSymfonyConfigRector/AutoInPhpSymfonyConfigRectorTest.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Tests\SymfonyPhpConfig\Rector\MethodCall\AutoInPhpSymfonyConfigRector;
-
-use Iterator;
-use Rector\SymfonyPhpConfig\Rector\MethodCall\AutoInPhpSymfonyConfigRector;
-use Rector\Testing\PHPUnit\AbstractRectorTestCase;
-use Symplify\SmartFileSystem\SmartFileInfo;
-
-final class AutoInPhpSymfonyConfigRectorTest extends AbstractRectorTestCase
-{
-    /**
-     * @dataProvider provideData()
-     */
-    public function test(SmartFileInfo $fileInfo): void
-    {
-        $this->doTestFileInfo($fileInfo);
-    }
-
-    public function provideData(): Iterator
-    {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
-    }
-
-    protected function getRectorClass(): string
-    {
-        return AutoInPhpSymfonyConfigRector::class;
-    }
-}

rules-tests/SymfonyPhpConfig/Rector/MethodCall/AutoInPhpSymfonyConfigRector/Fixture/fixture.php.inc

@@ -1,29 +0,0 @@
-<?php
-
-namespace Rector\Tests\SymfonyPhpConfig\Rector\MethodCall\AutoInPhpSymfonyConfigRector\Fixture;
-
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-
-    $services->defaults()
-        ->autowire();
-};
-
-?>
------
-<?php
-
-namespace Rector\Tests\SymfonyPhpConfig\Rector\MethodCall\AutoInPhpSymfonyConfigRector\Fixture;
-
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-
-    $services->defaults()
-        ->autowire()->public()->autoconfigure();
-};
-
-?>

rules-tests/SymfonyPhpConfig/Rector/MethodCall/AutoInPhpSymfonyConfigRector/Fixture/skip_already.php.inc

@@ -1,14 +0,0 @@
-<?php
-
-namespace Rector\Tests\SymfonyPhpConfig\Rector\MethodCall\AutoInPhpSymfonyConfigRector\Fixture;
-
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-
-    $services->defaults()
-        ->autowire()
-        ->public()
-        ->autoconfigure();
-};

rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/ChangeSingletonToServiceRectorTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector;
 
 use Iterator;
-use Rector\Legacy\Rector\Class_\ChangeSingletonToServiceRector;
+use Rector\Transform\Rector\Class_\ChangeSingletonToServiceRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 

rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/Fixture/fixture.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
 
 class Fixture
 {
@@ -20,7 +20,7 @@ class Fixture
 -----
 <?php
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
 
 class Fixture
 {

rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/Fixture/non_empty_protected_construct.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
 
 class NonEmptyProtectedConstruct
 {
@@ -25,7 +25,7 @@ class NonEmptyProtectedConstruct
 -----
 <?php
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
 
 class NonEmptyProtectedConstruct
 {

rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/Fixture/protected_construct.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
 
 class ProtectedConstruct
 {
@@ -24,7 +24,7 @@ class ProtectedConstruct
 -----
 <?php
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
 
 class ProtectedConstruct
 {

rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/Fixture/static_variable.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
 
 class StaticVariable
 {
@@ -20,7 +20,7 @@ class StaticVariable
 -----
 <?php
 
-namespace Rector\Tests\Legacy\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
+namespace Rector\Tests\Transform\Rector\Class_\ChangeSingletonToServiceRector\Fixture;
 
 class StaticVariable
 {

rules/DowngradePhp70/Contract/Rector/DowngradeParamDeclarationRectorInterface.php

@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\DowngradePhp70\Contract\Rector;
-
-use PhpParser\Node\FunctionLike;
-use PhpParser\Node\Param;
-
-interface DowngradeParamDeclarationRectorInterface
-{
-    /**
-     * Indicate if the parameter must be removed
-     */
-    public function isNullableParam(Param $param, FunctionLike $functionLike): bool;
-}

rules/DowngradePhp70/Contract/Rector/DowngradeReturnDeclarationRectorInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\DowngradePhp70\Contract\Rector;
-
-use PhpParser\Node\FunctionLike;
-
-interface DowngradeReturnDeclarationRectorInterface
-{
-    public function shouldRemoveReturnDeclaration(FunctionLike $functionLike): bool;
-}

rules/Symfony/ApplicationMetadata/ListenerServiceDefinitionProvider.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\ApplicationMetadata;
+namespace Rector\Symfony\ApplicationMetadata;
 
 use Nette\Utils\Strings;
 use Rector\Symfony\ServiceMapProvider;

rules/Symfony/BundleClassResolver.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio;
+namespace Rector\Symfony;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassLike;

rules/Symfony/Composer/ComposerNamespaceMatcher.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\Composer;
+namespace Rector\Symfony\Composer;
 
 use Nette\Utils\Strings;
 use Symplify\ComposerJsonManipulator\ComposerJsonFactory;

rules/Symfony/ConstantNameAndValueMatcher.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality;
+namespace Rector\Symfony;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\ClassConstFetch;
 use Rector\Core\PhpParser\Node\Value\ValueResolver;
 use Rector\Core\Util\StaticRectorStrings;
-use Rector\SymfonyCodeQuality\ValueObject\ConstantNameAndValue;
+use Rector\Symfony\ValueObject\ConstantNameAndValue;
 
 final class ConstantNameAndValueMatcher
 {

rules/Symfony/ConstantNameAndValueResolver.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality;
+namespace Rector\Symfony;
 
 use PhpParser\Node\Attribute;
 use Rector\NodeNameResolver\NodeNameResolver;
-use Rector\SymfonyCodeQuality\ValueObject\ConstantNameAndValue;
+use Rector\Symfony\ValueObject\ConstantNameAndValue;
 
 final class ConstantNameAndValueResolver
 {

rules/Symfony/Contract/EventReferenceToMethodNameInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\Contract;
+namespace Rector\Symfony\Contract;
 
 use PhpParser\Node\Expr\ClassConstFetch;
 

rules/Symfony/Helper/TemplateGuesser.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio\Helper;
+namespace Rector\Symfony\Helper;
 
 use Nette\Utils\Strings;
 use PhpParser\Node\Stmt\ClassMethod;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\Sensio\BundleClassResolver;
+use Rector\Symfony\BundleClassResolver;
 
 /**
- * @see \Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\TemplateAnnotationToThisRenderRectorTest
+ * @see \Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\TemplateAnnotationToThisRenderRectorTest
  */
 final class TemplateGuesser
 {

rules/Symfony/NodeFactory/ArrayFromCompactFactory.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio\NodeFactory;
+namespace Rector\Symfony\NodeFactory;
 
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;

rules/Symfony/NodeFactory/EventReferenceFactory.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\NodeFactory;
+namespace Rector\Symfony\NodeFactory;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Reflection\ReflectionProvider;
 use Rector\Core\PhpParser\Node\NodeFactory;
-use Rector\SymfonyCodeQuality\ValueObject\EventNameToClassAndConstant;
+use Rector\Symfony\ValueObject\EventNameToClassAndConstant;
 
 final class EventReferenceFactory
 {

rules/Symfony/NodeFactory/GetSubscribedEventsClassMethodFactory.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\NodeFactory;
+namespace Rector\Symfony\NodeFactory;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
@@ -22,13 +22,13 @@ use Rector\Core\Php\PhpVersionProvider;
 use Rector\Core\PhpParser\Node\NodeFactory;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\Privatization\NodeManipulator\VisibilityManipulator;
+use Rector\Symfony\Contract\EventReferenceToMethodNameInterface;
 use Rector\Symfony\Contract\Tag\TagInterface;
+use Rector\Symfony\ValueObject\EventNameToClassAndConstant;
+use Rector\Symfony\ValueObject\EventReferenceToMethodNameWithPriority;
 use Rector\Symfony\ValueObject\ServiceDefinition;
 use Rector\Symfony\ValueObject\Tag;
 use Rector\Symfony\ValueObject\Tag\EventListenerTag;
-use Rector\SymfonyCodeQuality\Contract\EventReferenceToMethodNameInterface;
-use Rector\SymfonyCodeQuality\ValueObject\EventNameToClassAndConstant;
-use Rector\SymfonyCodeQuality\ValueObject\EventReferenceToMethodNameWithPriority;
 
 final class GetSubscribedEventsClassMethodFactory
 {

rules/Symfony/NodeFactory/RouteNameClassFactory.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\NodeFactory;
+namespace Rector\Symfony\NodeFactory;
 
 use PhpParser\Node\Stmt\Namespace_;
 use Rector\Core\PhpParser\Node\NodeFactory;
-use Rector\SymfonyCodeQuality\Composer\ComposerNamespaceMatcher;
-use Rector\SymfonyCodeQuality\ValueObject\ClassName;
-use Rector\SymfonyCodeQuality\ValueObject\ConstantNameAndValue;
+use Rector\Symfony\Composer\ComposerNamespaceMatcher;
+use Rector\Symfony\ValueObject\ClassName;
+use Rector\Symfony\ValueObject\ConstantNameAndValue;
 use Symplify\Astral\ValueObject\NodeBuilder\ClassBuilder;
 use Symplify\Astral\ValueObject\NodeBuilder\NamespaceBuilder;
 

rules/Symfony/NodeFactory/ThisRenderFactory.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio\NodeFactory;
+namespace Rector\Symfony\NodeFactory;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
@@ -19,7 +19,7 @@ use Rector\BetterPhpDocParser\ValueObject\PhpDocNode\Sensio\SensioTemplateTagVal
 use Rector\Core\PhpParser\Node\NodeFactory;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\NodeTypeResolver;
-use Rector\Sensio\Helper\TemplateGuesser;
+use Rector\Symfony\Helper\TemplateGuesser;
 
 final class ThisRenderFactory
 {

rules/Symfony/Rector/Attribute/ExtractAttributeRouteNameConstantsRector.php

@@ -2,18 +2,18 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\Rector\Attribute;
+namespace Rector\Symfony\Rector\Attribute;
 
 use PhpParser\Node;
 use PhpParser\Node\Attribute;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocNode\Symfony\SymfonyRouteTagValueNode;
 use Rector\Core\Rector\AbstractRector;
 use Rector\FileSystemRector\ValueObject\AddedFileWithNodes;
-use Rector\SymfonyCodeQuality\ConstantNameAndValueMatcher;
-use Rector\SymfonyCodeQuality\ConstantNameAndValueResolver;
-use Rector\SymfonyCodeQuality\NodeFactory\RouteNameClassFactory;
-use Rector\SymfonyCodeQuality\ValueObject\ClassName;
-use Rector\SymfonyCodeQuality\ValueObject\ConstantNameAndValue;
+use Rector\Symfony\ConstantNameAndValueMatcher;
+use Rector\Symfony\ConstantNameAndValueResolver;
+use Rector\Symfony\NodeFactory\RouteNameClassFactory;
+use Rector\Symfony\ValueObject\ClassName;
+use Rector\Symfony\ValueObject\ConstantNameAndValue;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ExtraFileCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use Symplify\SmartFileSystem\SmartFileSystem;
@@ -21,7 +21,7 @@ use Symplify\SmartFileSystem\SmartFileSystem;
 /**
  * @see https://tomasvotruba.com/blog/2020/12/21/5-new-combos-opened-by-symfony-52-and-php-80/
  *
- * @see \Rector\Tests\SymfonyCodeQuality\Rector\Attribute\ExtractAttributeRouteNameConstantsRector\ExtractAttributeRouteNameConstantsRectorTest
+ * @see \Rector\Tests\Symfony\Rector\Attribute\ExtractAttributeRouteNameConstantsRector\ExtractAttributeRouteNameConstantsRectorTest
  */
 final class ExtractAttributeRouteNameConstantsRector extends AbstractRector
 {

rules/Symfony/Rector/ClassMethod/RemoveServiceFromSensioRouteRector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio\Rector\ClassMethod;
+namespace Rector\Symfony\Rector\ClassMethod;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
@@ -15,7 +15,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
  * @see https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/routing.html#route-annotation
  *
- * @see \Rector\Tests\Sensio\Rector\ClassMethod\RemoveServiceFromSensioRouteRector\RemoveServiceFromSensioRouteRectorTest
+ * @see \Rector\Tests\Symfony\Rector\ClassMethod\RemoveServiceFromSensioRouteRector\RemoveServiceFromSensioRouteRectorTest
  */
 final class RemoveServiceFromSensioRouteRector extends AbstractRector
 {

rules/Symfony/Rector/ClassMethod/ReplaceSensioRouteAnnotationWithSymfonyRector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio\Rector\ClassMethod;
+namespace Rector\Symfony\Rector\ClassMethod;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
@@ -18,7 +18,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
  * @see https://medium.com/@nebkam/symfony-deprecated-route-and-method-annotations-4d5e1d34556a
  * @see https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/routing.html#method-annotation
  *
- * @see \Rector\Tests\Sensio\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector\ReplaceSensioRouteAnnotationWithSymfonyRectorTest
+ * @see \Rector\Tests\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector\ReplaceSensioRouteAnnotationWithSymfonyRectorTest
  */
 final class ReplaceSensioRouteAnnotationWithSymfonyRector extends AbstractRector
 {

rules/Symfony/Rector/ClassMethod/TemplateAnnotationToThisRenderRector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio\Rector\ClassMethod;
+namespace Rector\Symfony\Rector\ClassMethod;
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
@@ -25,9 +25,9 @@ use PHPStan\Type\MixedType;
 use PHPStan\Type\TypeWithClassName;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocNode\Sensio\SensioTemplateTagValueNode;
 use Rector\Core\Rector\AbstractRector;
-use Rector\Sensio\NodeFactory\ThisRenderFactory;
-use Rector\Sensio\TypeAnalyzer\ArrayUnionResponseTypeAnalyzer;
-use Rector\Sensio\TypeDeclaration\ReturnTypeDeclarationUpdater;
+use Rector\Symfony\NodeFactory\ThisRenderFactory;
+use Rector\Symfony\TypeAnalyzer\ArrayUnionResponseTypeAnalyzer;
+use Rector\Symfony\TypeDeclaration\ReturnTypeDeclarationUpdater;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -36,7 +36,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
  * @see https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/view.html
  * @see https://github.com/sensiolabs/SensioFrameworkExtraBundle/issues/641
  *
- * @see \Rector\Tests\Sensio\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\TemplateAnnotationToThisRenderRectorTest
+ * @see \Rector\Tests\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector\TemplateAnnotationToThisRenderRectorTest
  */
 final class TemplateAnnotationToThisRenderRector extends AbstractRector
 {

rules/Symfony/Rector/Class_/EventListenerToEventSubscriberRector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\Rector\Class_;
+namespace Rector\Symfony\Rector\Class_;
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
@@ -10,15 +10,15 @@ use PhpParser\Node\Identifier;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Class_;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Symfony\ApplicationMetadata\ListenerServiceDefinitionProvider;
+use Rector\Symfony\NodeFactory\GetSubscribedEventsClassMethodFactory;
+use Rector\Symfony\ValueObject\EventNameToClassAndConstant;
 use Rector\Symfony\ValueObject\ServiceDefinition;
-use Rector\SymfonyCodeQuality\ApplicationMetadata\ListenerServiceDefinitionProvider;
-use Rector\SymfonyCodeQuality\NodeFactory\GetSubscribedEventsClassMethodFactory;
-use Rector\SymfonyCodeQuality\ValueObject\EventNameToClassAndConstant;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Tests\SymfonyCodeQuality\Rector\Class_\EventListenerToEventSubscriberRector\EventListenerToEventSubscriberRectorTest
+ * @see \Rector\Tests\Symfony\Rector\Class_\EventListenerToEventSubscriberRector\EventListenerToEventSubscriberRectorTest
  */
 final class EventListenerToEventSubscriberRector extends AbstractRector
 {

rules/Symfony/Rector/StaticCall/AddMessageToEqualsResponseCodeRector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPUnitSymfony\Rector\StaticCall;
+namespace Rector\Symfony\Rector\StaticCall;
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
@@ -17,7 +17,7 @@ use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Tests\PHPUnitSymfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\AddMessageToEqualsResponseCodeRectorTest
+ * @see \Rector\Tests\Symfony\Rector\StaticCall\AddMessageToEqualsResponseCodeRector\AddMessageToEqualsResponseCodeRectorTest
  */
 final class AddMessageToEqualsResponseCodeRector extends AbstractRector
 {

rules/Symfony/TypeAnalyzer/ArrayUnionResponseTypeAnalyzer.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio\TypeAnalyzer;
+namespace Rector\Symfony\TypeAnalyzer;
 
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Type;

rules/Symfony/TypeDeclaration/ReturnTypeDeclarationUpdater.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Sensio\TypeDeclaration;
+namespace Rector\Symfony\TypeDeclaration;
 
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\ClassMethod;

rules/Symfony/ValueObject/ClassName.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\ValueObject;
+namespace Rector\Symfony\ValueObject;
 
 final class ClassName
 {

rules/Symfony/ValueObject/ConstantNameAndValue.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\ValueObject;
+namespace Rector\Symfony\ValueObject;
 
 final class ConstantNameAndValue
 {

rules/Symfony/ValueObject/EventNameToClassAndConstant.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\ValueObject;
+namespace Rector\Symfony\ValueObject;
 
 final class EventNameToClassAndConstant
 {

rules/Symfony/ValueObject/EventReferenceToMethodName.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\ValueObject;
+namespace Rector\Symfony\ValueObject;
 
 use PhpParser\Node\Expr\ClassConstFetch;
-use Rector\SymfonyCodeQuality\Contract\EventReferenceToMethodNameInterface;
+use Rector\Symfony\Contract\EventReferenceToMethodNameInterface;
 
 final class EventReferenceToMethodName implements EventReferenceToMethodNameInterface
 {

rules/Symfony/ValueObject/EventReferenceToMethodNameWithPriority.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Rector\SymfonyCodeQuality\ValueObject;
+namespace Rector\Symfony\ValueObject;
 
 use PhpParser\Node\Expr\ClassConstFetch;
-use Rector\SymfonyCodeQuality\Contract\EventReferenceToMethodNameInterface;
+use Rector\Symfony\Contract\EventReferenceToMethodNameInterface;
 
 final class EventReferenceToMethodNameWithPriority implements EventReferenceToMethodNameInterface
 {

rules/Symfony5/Rector/Class_/LogoutHandlerToLogoutEventSubscriberRector.php

@@ -10,9 +10,9 @@ use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Symfony\NodeFactory\GetSubscribedEventsClassMethodFactory;
+use Rector\Symfony\ValueObject\EventReferenceToMethodName;
 use Rector\Symfony5\NodeFactory\OnLogoutClassMethodFactory;
-use Rector\SymfonyCodeQuality\NodeFactory\GetSubscribedEventsClassMethodFactory;
-use Rector\SymfonyCodeQuality\ValueObject\EventReferenceToMethodName;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

rules/Symfony5/Rector/Class_/LogoutSuccessHandlerToLogoutEventSubscriberRector.php

@@ -10,9 +10,9 @@ use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Symfony\NodeFactory\GetSubscribedEventsClassMethodFactory;
+use Rector\Symfony\ValueObject\EventReferenceToMethodNameWithPriority;
 use Rector\Symfony5\NodeFactory\OnSuccessLogoutClassMethodFactory;
-use Rector\SymfonyCodeQuality\NodeFactory\GetSubscribedEventsClassMethodFactory;
-use Rector\SymfonyCodeQuality\ValueObject\EventReferenceToMethodNameWithPriority;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

rules/SymfonyPhpConfig/NodeAnalyzer/SymfonyPhpConfigClosureAnalyzer.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\SymfonyPhpConfig\NodeAnalyzer;
-
-use PhpParser\Node\Expr\Closure;
-use Rector\NodeNameResolver\NodeNameResolver;
-
-final class SymfonyPhpConfigClosureAnalyzer
-{
-    /**
-     * @var NodeNameResolver
-     */
-    private $nodeNameResolver;
-
-    public function __construct(NodeNameResolver $nodeNameResolver)
-    {
-        $this->nodeNameResolver = $nodeNameResolver;
-    }
-
-    public function isPhpConfigClosure(Closure $closure): bool
-    {
-        if (count($closure->params) !== 1) {
-            return false;
-        }
-
-        $onlyParam = $closure->params[0];
-        if ($onlyParam->type === null) {
-            return false;
-        }
-
-        return $this->nodeNameResolver->isName(
-            $onlyParam->type,
-            'Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator'
-        );
-    }
-}

rules/SymfonyPhpConfig/Rector/MethodCall/AutoInPhpSymfonyConfigRector.php

@@ -1,148 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\SymfonyPhpConfig\Rector\MethodCall;
-
-use PhpParser\Node;
-use PhpParser\Node\Expr\MethodCall;
-use Rector\Core\Rector\AbstractRector;
-use Rector\Defluent\NodeAnalyzer\FluentChainMethodCallNodeAnalyzer;
-use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\SymfonyPhpConfig\NodeAnalyzer\SymfonyPhpConfigClosureAnalyzer;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-
-/**
- * @see phpstan rule https://github.com/symplify/coding-standard/blob/master/docs/phpstan_rules.md#check-required-autowire-autoconfigure-and-public-are-used-in-config-service-rule
- * @see \Rector\Tests\SymfonyPhpConfig\Rector\MethodCall\AutoInPhpSymfonyConfigRector\AutoInPhpSymfonyConfigRectorTest
- */
-final class AutoInPhpSymfonyConfigRector extends AbstractRector
-{
-    /**
-     * @var string[]
-     */
-    private const REQUIRED_METHOD_NAMES = ['public', 'autowire', 'autoconfigure'];
-
-    /**
-     * @var SymfonyPhpConfigClosureAnalyzer
-     */
-    private $symfonyPhpConfigClosureAnalyzer;
-
-    /**
-     * @var FluentChainMethodCallNodeAnalyzer
-     */
-    private $fluentChainMethodCallNodeAnalyzer;
-
-    public function __construct(
-        SymfonyPhpConfigClosureAnalyzer $symfonyPhpConfigClosureAnalyzer,
-        FluentChainMethodCallNodeAnalyzer $fluentChainMethodCallNodeAnalyzer
-    ) {
-        $this->symfonyPhpConfigClosureAnalyzer = $symfonyPhpConfigClosureAnalyzer;
-        $this->fluentChainMethodCallNodeAnalyzer = $fluentChainMethodCallNodeAnalyzer;
-    }
-
-    public function getRuleDefinition(): RuleDefinition
-    {
-        return new RuleDefinition(
-            'Make sure there is public(), autowire(), autoconfigure() calls on defaults() in Symfony configs',
-            [
-                new CodeSample(
-                    <<<'CODE_SAMPLE'
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-
-    $services->defaults()
-        ->autowire();
-};
-CODE_SAMPLE
-                    ,
-                    <<<'CODE_SAMPLE'
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-
-    $services->defaults()
-        ->autowire()
-        ->public()
-        ->autoconfigure();
-};
-CODE_SAMPLE
-                ),
-            ]
-        );
-    }
-
-    /**
-     * @return array<class-string<Node>>
-     */
-    public function getNodeTypes(): array
-    {
-        return [MethodCall::class];
-    }
-
-    /**
-     * @param MethodCall $node
-     */
-    public function refactor(Node $node): ?Node
-    {
-        if ($this->shouldSkipMethodCall($node)) {
-            return null;
-        }
-
-        $missingMethodNames = $this->resolveMissingMethodNames($node);
-        if ($missingMethodNames === []) {
-            return null;
-        }
-
-        $node->setAttribute(AttributeKey::DO_NOT_CHANGE, true);
-
-        $methodCall = clone $node;
-        foreach ($missingMethodNames as $missingMethodName) {
-            $methodCall = new MethodCall($methodCall, $missingMethodName);
-        }
-
-        return $methodCall;
-    }
-
-    private function shouldSkipMethodCall(MethodCall $methodCall): bool
-    {
-        $doNotChange = (bool) $methodCall->getAttribute(AttributeKey::DO_NOT_CHANGE);
-        if ($doNotChange) {
-            return true;
-        }
-
-        $closure = $methodCall->getAttribute(AttributeKey::CLOSURE_NODE);
-        if ($closure === null) {
-            return true;
-        }
-
-        if (! $this->symfonyPhpConfigClosureAnalyzer->isPhpConfigClosure($closure)) {
-            return true;
-        }
-
-        if (! $this->fluentChainMethodCallNodeAnalyzer->isLastChainMethodCall($methodCall)) {
-            return true;
-        }
-
-        $rootMethodCall = $this->fluentChainMethodCallNodeAnalyzer->resolveRootMethodCall($methodCall);
-        if (! $rootMethodCall instanceof MethodCall) {
-            return true;
-        }
-
-        return ! $this->isName($rootMethodCall->name, 'defaults');
-    }
-
-    /**
-     * @return string[]
-     */
-    private function resolveMissingMethodNames(MethodCall $methodCall): array
-    {
-        $methodCallNames = $this->fluentChainMethodCallNodeAnalyzer->collectMethodCallNamesInChain($methodCall);
-
-        return array_diff(self::REQUIRED_METHOD_NAMES, $methodCallNames);
-    }
-}

rules/Transform/Naming/FullyQualifiedNameResolver.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Legacy\Naming;
+namespace Rector\Transform\Naming;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Namespace_;

rules/Transform/NodeAnalyzer/SingletonClassMethodAnalyzer.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Legacy\NodeAnalyzer;
+namespace Rector\Transform\NodeAnalyzer;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Assign;

rules/Transform/NodeFactory/ClassMethodFactory.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Legacy\NodeFactory;
+namespace Rector\Transform\NodeFactory;
 
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;

rules/Transform/NodeFactory/StaticMethodClassFactory.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Legacy\NodeFactory;
+namespace Rector\Transform\NodeFactory;
 
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;