move Rector-rule based packages from /packages to /rules

composer.json

@@ -48,74 +48,74 @@
     "autoload": {
         "psr-4": {
             "Rector\\Core\\": "src",
-            "Rector\\Autodiscovery\\": "packages/autodiscovery/src",
-            "Rector\\Architecture\\": "packages/architecture/src",
+            "Rector\\Autodiscovery\\": "rules/autodiscovery/src",
+            "Rector\\Architecture\\": "rules/architecture/src",
             "Rector\\AttributeAwarePhpDoc\\": "packages/attribute-aware-php-doc/src",
             "Rector\\BetterPhpDocParser\\": "packages/better-php-doc-parser/src",
-            "Rector\\CakePHP\\": "packages/cakephp/src",
-            "Rector\\Celebrity\\": "packages/celebrity/src",
-            "Rector\\CodeQuality\\": "packages/code-quality/src",
-            "Rector\\CodingStyle\\": "packages/coding-style/src",
+            "Rector\\CakePHP\\": "rules/cakephp/src",
+            "Rector\\Celebrity\\": "rules/celebrity/src",
+            "Rector\\CodeQuality\\": "rules/code-quality/src",
+            "Rector\\CodingStyle\\": "rules/coding-style/src",
             "Rector\\ConsoleDiffer\\": "packages/console-differ/src",
-            "Rector\\DeadCode\\": "packages/dead-code/src",
-            "Rector\\Doctrine\\": "packages/doctrine/src",
-            "Rector\\DoctrineCodeQuality\\": "packages/doctrine-code-quality/src",
-            "Rector\\FrameworkMigration\\": "packages/framework-migration/src",
+            "Rector\\DeadCode\\": "rules/dead-code/src",
+            "Rector\\Doctrine\\": "rules/doctrine/src",
+            "Rector\\DoctrineCodeQuality\\": "rules/doctrine-code-quality/src",
+            "Rector\\FrameworkMigration\\": "rules/framework-migration/src",
             "Rector\\FileSystemRector\\": "packages/file-system-rector/src",
-            "Rector\\ElasticSearchDSL\\": "packages/elastic-search-dsl/src",
-            "Rector\\Guzzle\\": "packages/guzzle/src",
-            "Rector\\Laravel\\": "packages/laravel/src",
+            "Rector\\ElasticSearchDSL\\": "rules/elastic-search-dsl/src",
+            "Rector\\Guzzle\\": "rules/guzzle/src",
+            "Rector\\Laravel\\": "rules/laravel/src",
             "Rector\\Legacy\\": "packages/legacy/src",
-            "Rector\\MysqlToMysqli\\": "packages/mysql-to-mysqli/src",
-            "Rector\\NetteTesterToPHPUnit\\": "packages/nette-tester-to-phpunit/src",
-            "Rector\\NetteToSymfony\\": "packages/nette-to-symfony/src",
+            "Rector\\MysqlToMysqli\\": "rules/mysql-to-mysqli/src",
+            "Rector\\NetteTesterToPHPUnit\\": "rules/nette-tester-to-phpunit/src",
+            "Rector\\NetteToSymfony\\": "rules/nette-to-symfony/src",
             "Rector\\Nette\\": "packages/nette/src",
             "Rector\\NodeCollector\\": "packages/node-collector/src",
             "Rector\\NodeTypeResolver\\": "packages/node-type-resolver/src",
             "Rector\\NodeNameResolver\\": "packages/node-name-resolver/src",
-            "Rector\\PHPStan\\": "packages/phpstan/src",
+            "Rector\\PHPStan\\": "rules/phpstan/src",
             "Rector\\PHPStanStaticTypeMapper\\": "packages/phpstan-static-type-mapper/src",
-            "Rector\\PHPUnitSymfony\\": "packages/phpunit-symfony/src",
-            "Rector\\PHPUnit\\": "packages/phpunit/src",
-            "Rector\\PSR4\\": "packages/psr4/src",
-            "Rector\\PhpSpecToPHPUnit\\": "packages/php-spec-to-phpunit/src",
-            "Rector\\Php52\\": "packages/php-52/src",
-            "Rector\\Php53\\": "packages/php-53/src",
-            "Rector\\Php54\\": "packages/php-54/src",
-            "Rector\\Php55\\": "packages/php-55/src",
-            "Rector\\Php56\\": "packages/php-56/src",
-            "Rector\\Php70\\": "packages/php-70/src",
-            "Rector\\Php71\\": "packages/php-71/src",
-            "Rector\\Php72\\": "packages/php-72/src",
-            "Rector\\Php73\\": "packages/php-73/src",
-            "Rector\\Php74\\": "packages/php-74/src",
-            "Rector\\Php80\\": "packages/php-80/src",
-            "Rector\\RemovingStatic\\": "packages/removing-static/src",
-            "Rector\\Renaming\\": "packages/renaming/src",
-            "Rector\\Restoration\\": "packages/restoration/src",
+            "Rector\\PHPUnitSymfony\\": "rules/phpunit-symfony/src",
+            "Rector\\PHPUnit\\": "rules/phpunit/src",
+            "Rector\\PSR4\\": "rules/psr4/src",
+            "Rector\\PhpSpecToPHPUnit\\": "rules/php-spec-to-phpunit/src",
+            "Rector\\Php52\\": "rules/php-52/src",
+            "Rector\\Php53\\": "rules/php-53/src",
+            "Rector\\Php54\\": "rules/php-54/src",
+            "Rector\\Php55\\": "rules/php-55/src",
+            "Rector\\Php56\\": "rules/php-56/src",
+            "Rector\\Php70\\": "rules/php-70/src",
+            "Rector\\Php71\\": "rules/php-71/src",
+            "Rector\\Php72\\": "rules/php-72/src",
+            "Rector\\Php73\\": "rules/php-73/src",
+            "Rector\\Php74\\": "rules/php-74/src",
+            "Rector\\Php80\\": "rules/php-80/src",
+            "Rector\\RemovingStatic\\": "rules/removing-static/src",
+            "Rector\\Renaming\\": "rules/renaming/src",
+            "Rector\\Restoration\\": "rules/restoration/src",
             "Rector\\Refactoring\\": "packages/refactoring/src",
-            "Rector\\SOLID\\": "packages/solid/src",
-            "Rector\\Sensio\\": "packages/sensio/src",
-            "Rector\\Shopware\\": "packages/shopware/src",
-            "Rector\\Silverstripe\\": "packages/silverstripe/src",
+            "Rector\\SOLID\\": "rules/solid/src",
+            "Rector\\Sensio\\": "rules/sensio/src",
+            "Rector\\Shopware\\": "rules/shopware/src",
+            "Rector\\Silverstripe\\": "rules/silverstripe/src",
             "Rector\\StaticTypeMapper\\": "packages/static-type-mapper/src",
-            "Rector\\Sylius\\": "packages/sylius/src",
-            "Rector\\SymfonyCodeQuality\\": "packages/symfony-code-quality/src",
-            "Rector\\SymfonyPHPUnit\\": "packages/symfony-phpunit/src",
-            "Rector\\Symfony\\": "packages/symfony/src",
-            "Rector\\Twig\\": "packages/twig/src",
-            "Rector\\TypeDeclaration\\": "packages/type-declaration/src",
+            "Rector\\Sylius\\": "rules/sylius/src",
+            "Rector\\SymfonyCodeQuality\\": "rules/symfony-code-quality/src",
+            "Rector\\SymfonyPHPUnit\\": "rules/symfony-phpunit/src",
+            "Rector\\Symfony\\": "rules/symfony/src",
+            "Rector\\Twig\\": "rules/twig/src",
+            "Rector\\TypeDeclaration\\": "rules/type-declaration/src",
             "Rector\\VendorLocker\\": "packages/vendor-locker/src",
-            "Rector\\ZendToSymfony\\": "packages/zend-to-symfony/src",
+            "Rector\\ZendToSymfony\\": "rules/zend-to-symfony/src",
             "Rector\\RectorGenerator\\": "packages/rector-generator/src",
-            "Rector\\StrictCodeQuality\\": "packages/strict-code-quality/src",
+            "Rector\\StrictCodeQuality\\": "rules/strict-code-quality/src",
             "Rector\\DynamicTypeAnalysis\\": "packages/dynamic-type-analysis/src",
-            "Rector\\PhpDeglobalize\\": "packages/php-deglobalize/src",
-            "Rector\\Phalcon\\": "packages/phalcon/src",
-            "Rector\\DoctrineGedmoToKnplabs\\": "packages/doctrine-gedmo-to-knplabs/src",
-            "Rector\\MinimalScope\\": "packages/minimal-scope/src",
+            "Rector\\PhpDeglobalize\\": "rules/php-deglobalize/src",
+            "Rector\\Phalcon\\": "rules/phalcon/src",
+            "Rector\\DoctrineGedmoToKnplabs\\": "rules/doctrine-gedmo-to-knplabs/src",
+            "Rector\\MinimalScope\\": "rules/minimal-scope/src",
             "Rector\\Polyfill\\": "packages/polyfill/src",
-            "Rector\\CakePHPToSymfony\\": "packages/cakephp-to-symfony/src"
+            "Rector\\CakePHPToSymfony\\": "rules/cakephp-to-symfony/src"
         },
         "files": [
             "src/functions/rector_dump_function.php"
@@ -124,94 +124,94 @@
     "autoload-dev": {
         "psr-4": {
             "Rector\\Core\\Tests\\": "tests",
-            "Rector\\Autodiscovery\\Tests\\": "packages/autodiscovery/tests",
-            "Rector\\Architecture\\Tests\\": "packages/architecture/tests",
+            "Rector\\Autodiscovery\\Tests\\": "rules/autodiscovery/tests",
+            "Rector\\Architecture\\Tests\\": "rules/architecture/tests",
             "Rector\\BetterPhpDocParser\\Tests\\": "packages/better-php-doc-parser/tests",
-            "Rector\\CakePHP\\Tests\\": "packages/cakephp/tests",
-            "Rector\\Celebrity\\Tests\\": "packages/celebrity/tests",
-            "Rector\\CodeQuality\\Tests\\": "packages/code-quality/tests",
-            "Rector\\CodingStyle\\Tests\\": "packages/coding-style/tests",
-            "Rector\\DeadCode\\Tests\\": "packages/dead-code/tests",
-            "Rector\\Doctrine\\Tests\\": "packages/doctrine/tests",
-            "Rector\\DoctrineCodeQuality\\Tests\\": "packages/doctrine-code-quality/tests",
-            "Rector\\ElasticSearchDSL\\Tests\\": "packages/elastic-search-dsl/tests",
-            "Rector\\Guzzle\\Tests\\": "packages/guzzle/tests",
-            "Rector\\Laravel\\Tests\\": "packages/laravel/tests",
+            "Rector\\CakePHP\\Tests\\": "rules/cakephp/tests",
+            "Rector\\Celebrity\\Tests\\": "rules/celebrity/tests",
+            "Rector\\CodeQuality\\Tests\\": "rules/code-quality/tests",
+            "Rector\\CodingStyle\\Tests\\": "rules/coding-style/tests",
+            "Rector\\DeadCode\\Tests\\": "rules/dead-code/tests",
+            "Rector\\Doctrine\\Tests\\": "rules/doctrine/tests",
+            "Rector\\DoctrineCodeQuality\\Tests\\": "rules/doctrine-code-quality/tests",
+            "Rector\\ElasticSearchDSL\\Tests\\": "rules/elastic-search-dsl/tests",
+            "Rector\\Guzzle\\Tests\\": "rules/guzzle/tests",
+            "Rector\\Laravel\\Tests\\": "rules/laravel/tests",
             "Rector\\Legacy\\Tests\\": "packages/legacy/tests",
-            "Rector\\MysqlToMysqli\\Tests\\": "packages/mysql-to-mysqli/tests",
-            "Rector\\NetteTesterToPHPUnit\\Tests\\": "packages/nette-tester-to-phpunit/tests",
-            "Rector\\NetteToSymfony\\Tests\\": "packages/nette-to-symfony/tests",
+            "Rector\\MysqlToMysqli\\Tests\\": "rules/mysql-to-mysqli/tests",
+            "Rector\\NetteTesterToPHPUnit\\Tests\\": "rules/nette-tester-to-phpunit/tests",
+            "Rector\\NetteToSymfony\\Tests\\": "rules/nette-to-symfony/tests",
             "Rector\\Nette\\Tests\\": "packages/nette/tests",
             "Rector\\NodeTypeResolver\\Tests\\": "packages/node-type-resolver/tests",
             "Rector\\PHPStanExtensions\\": "utils/PHPStanExtensions/src",
-            "Rector\\PHPStan\\Tests\\": "packages/phpstan/tests",
-            "Rector\\PHPUnitSymfony\\Tests\\": "packages/phpunit-symfony/tests",
-            "Rector\\PHPUnit\\Tests\\": "packages/phpunit/tests",
-            "Rector\\PSR4\\Tests\\": "packages/psr4/tests",
-            "Rector\\PhpSpecToPHPUnit\\Tests\\": "packages/php-spec-to-phpunit/tests",
-            "Rector\\Php52\\Tests\\": "packages/php-52/tests",
-            "Rector\\Php53\\Tests\\": "packages/php-53/tests",
-            "Rector\\Php54\\Tests\\": "packages/php-54/tests",
-            "Rector\\Php55\\Tests\\": "packages/php-55/tests",
-            "Rector\\Php56\\Tests\\": "packages/php-56/tests",
-            "Rector\\Php70\\Tests\\": "packages/php-70/tests",
-            "Rector\\Php71\\Tests\\": "packages/php-71/tests",
-            "Rector\\Php72\\Tests\\": "packages/php-72/tests",
-            "Rector\\Php73\\Tests\\": "packages/php-73/tests",
-            "Rector\\Php74\\Tests\\": "packages/php-74/tests",
-            "Rector\\Php80\\Tests\\": "packages/php-80/tests",
-            "Rector\\RemovingStatic\\Tests\\": "packages/removing-static/tests",
-            "Rector\\Renaming\\Tests\\": "packages/renaming/tests",
-            "Rector\\Restoration\\Tests\\": "packages/restoration/tests",
-            "Rector\\SOLID\\Tests\\": "packages/solid/tests",
-            "Rector\\Sensio\\Tests\\": "packages/sensio/tests",
-            "Rector\\Shopware\\Tests\\": "packages/shopware/tests",
-            "Rector\\Silverstripe\\Tests\\": "packages/silverstripe/tests",
-            "Rector\\Sylius\\Tests\\": "packages/sylius/tests",
-            "Rector\\SymfonyCodeQuality\\Tests\\": "packages/symfony-code-quality/tests",
-            "Rector\\SymfonyPHPUnit\\Tests\\": "packages/symfony-phpunit/tests",
-            "Rector\\Symfony\\Tests\\": "packages/symfony/tests",
-            "Rector\\Twig\\Tests\\": "packages/twig/tests",
-            "Rector\\TypeDeclaration\\Tests\\": "packages/type-declaration/tests",
-            "Rector\\ZendToSymfony\\Tests\\": "packages/zend-to-symfony/tests",
-            "Rector\\StrictCodeQuality\\Tests\\": "packages/strict-code-quality/tests",
+            "Rector\\PHPStan\\Tests\\": "rules/phpstan/tests",
+            "Rector\\PHPUnitSymfony\\Tests\\": "rules/phpunit-symfony/tests",
+            "Rector\\PHPUnit\\Tests\\": "rules/phpunit/tests",
+            "Rector\\PSR4\\Tests\\": "rules/psr4/tests",
+            "Rector\\PhpSpecToPHPUnit\\Tests\\": "rules/php-spec-to-phpunit/tests",
+            "Rector\\Php52\\Tests\\": "rules/php-52/tests",
+            "Rector\\Php53\\Tests\\": "rules/php-53/tests",
+            "Rector\\Php54\\Tests\\": "rules/php-54/tests",
+            "Rector\\Php55\\Tests\\": "rules/php-55/tests",
+            "Rector\\Php56\\Tests\\": "rules/php-56/tests",
+            "Rector\\Php70\\Tests\\": "rules/php-70/tests",
+            "Rector\\Php71\\Tests\\": "rules/php-71/tests",
+            "Rector\\Php72\\Tests\\": "rules/php-72/tests",
+            "Rector\\Php73\\Tests\\": "rules/php-73/tests",
+            "Rector\\Php74\\Tests\\": "rules/php-74/tests",
+            "Rector\\Php80\\Tests\\": "rules/php-80/tests",
+            "Rector\\RemovingStatic\\Tests\\": "rules/removing-static/tests",
+            "Rector\\Renaming\\Tests\\": "rules/renaming/tests",
+            "Rector\\Restoration\\Tests\\": "rules/restoration/tests",
+            "Rector\\SOLID\\Tests\\": "rules/solid/tests",
+            "Rector\\Sensio\\Tests\\": "rules/sensio/tests",
+            "Rector\\Shopware\\Tests\\": "rules/shopware/tests",
+            "Rector\\Silverstripe\\Tests\\": "rules/silverstripe/tests",
+            "Rector\\Sylius\\Tests\\": "rules/sylius/tests",
+            "Rector\\SymfonyCodeQuality\\Tests\\": "rules/symfony-code-quality/tests",
+            "Rector\\SymfonyPHPUnit\\Tests\\": "rules/symfony-phpunit/tests",
+            "Rector\\Symfony\\Tests\\": "rules/symfony/tests",
+            "Rector\\Twig\\Tests\\": "rules/twig/tests",
+            "Rector\\TypeDeclaration\\Tests\\": "rules/type-declaration/tests",
+            "Rector\\ZendToSymfony\\Tests\\": "rules/zend-to-symfony/tests",
+            "Rector\\StrictCodeQuality\\Tests\\": "rules/strict-code-quality/tests",
             "Rector\\DynamicTypeAnalysis\\Tests\\": "packages/dynamic-type-analysis/tests",
-            "Rector\\PhpDeglobalize\\Tests\\": "packages/php-deglobalize/tests",
-            "Rector\\Phalcon\\Tests\\": "packages/phalcon/tests",
+            "Rector\\PhpDeglobalize\\Tests\\": "rules/php-deglobalize/tests",
+            "Rector\\Phalcon\\Tests\\": "rules/phalcon/tests",
             "Rector\\Utils\\DocumentationGenerator\\": "utils/DocumentationGenerator/src",
             "Rector\\Utils\\PHPStanAttributeTypeSyncer\\": "utils/PHPStanAttributeTypeSyncer/src",
             "Rector\\Utils\\PHPStanStaticTypeMapperChecker\\": "utils/PHPStanStaticTypeMapperChecker/src",
-            "Rector\\DoctrineGedmoToKnplabs\\Tests\\": "packages/doctrine-gedmo-to-knplabs/tests",
-            "Rector\\MinimalScope\\Tests\\": "packages/minimal-scope/tests",
+            "Rector\\DoctrineGedmoToKnplabs\\Tests\\": "rules/doctrine-gedmo-to-knplabs/tests",
+            "Rector\\MinimalScope\\Tests\\": "rules/minimal-scope/tests",
             "Rector\\Polyfill\\Tests\\": "packages/polyfill/tests",
-            "Rector\\CakePHPToSymfony\\Tests\\": "packages/cakephp-to-symfony/tests"
+            "Rector\\CakePHPToSymfony\\Tests\\": "rules/cakephp-to-symfony/tests"
         },
         "classmap": [
             "tests/Source",
             "tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/Source",
             "tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/Source",
             "tests/Issues/Issue1243/Source",
-            "packages/cakephp/tests/Rector/Name/ImplicitShortClassNameUseStatementRector/Source",
-            "packages/symfony/tests/Rector/FrameworkBundle/AbstractToConstructorInjectionRectorSource",
-            "packages/symfony/tests/Rector/FrameworkBundle/ContainerGetToConstructorInjectionRector/Source",
+            "rules/cakephp/tests/Rector/Name/ImplicitShortClassNameUseStatementRector/Source",
+            "rules/symfony/tests/Rector/FrameworkBundle/AbstractToConstructorInjectionRectorSource",
+            "rules/symfony/tests/Rector/FrameworkBundle/ContainerGetToConstructorInjectionRector/Source",
             "packages/node-type-resolver/tests/PerNodeTypeResolver/ParamTypeResolver/Source",
             "packages/node-type-resolver/tests/PerNodeTypeResolver/PropertyTypeResolver/Source",
-            "packages/autodiscovery/tests/Rector/FileSystem/MoveInterfacesToContractNamespaceDirectoryRector/Expected",
-            "packages/autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Expected",
-            "packages/cakephp/tests/Rector/StaticCall/AppUsesStaticCallToUseStatementRector/Source",
-            "packages/cakephp-to-symfony/tests/Rector/Class_/CakePHPControllerComponentToSymfonyRector/Source",
-            "packages/cakephp-to-symfony/tests/Rector/Class_/CakePHPModelToDoctrineEntityRector/Source"
+            "rules/autodiscovery/tests/Rector/FileSystem/MoveInterfacesToContractNamespaceDirectoryRector/Expected",
+            "rules/autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Expected",
+            "rules/cakephp/tests/Rector/StaticCall/AppUsesStaticCallToUseStatementRector/Source",
+            "rules/cakephp-to-symfony/tests/Rector/Class_/CakePHPControllerComponentToSymfonyRector/Source",
+            "rules/cakephp-to-symfony/tests/Rector/Class_/CakePHPModelToDoctrineEntityRector/Source"
         ],
         "files": [
-            "packages/dead-code/tests/Rector/MethodCall/RemoveDefaultArgumentValueRector/Source/UserDefined.php",
-            "packages/type-declaration/tests/Rector/Property/CompleteVarDocTypePropertyRector/Source/EventDispatcher.php",
-            "packages/type-declaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Source/MyBar.php",
-            "packages/renaming/tests/Rector/Class_/RenameClassRector/Source/SomeInterface.php",
-            "packages/renaming/tests/Rector/Class_/RenameClassRector/Source/ClassImportingSameName.php",
-            "packages/renaming/tests/Rector/Class_/RenameClassRector/Source/Twig_Extension_Sandbox.php",
-            "packages/renaming/tests/Rector/Class_/RenameClassRector/Source/TwigFilter.php",
-            "packages/renaming/tests/Rector/Class_/RenameClassRector/Source/Manual_Twig_Filter.php",
-            "packages/solid/tests/Rector/ClassMethod/UseInterfaceOverImplementationInConstructorRector/Source/Apple.php",
+            "rules/dead-code/tests/Rector/MethodCall/RemoveDefaultArgumentValueRector/Source/UserDefined.php",
+            "rules/type-declaration/tests/Rector/Property/CompleteVarDocTypePropertyRector/Source/EventDispatcher.php",
+            "rules/type-declaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Source/MyBar.php",
+            "rules/renaming/tests/Rector/Class_/RenameClassRector/Source/SomeInterface.php",
+            "rules/renaming/tests/Rector/Class_/RenameClassRector/Source/ClassImportingSameName.php",
+            "rules/renaming/tests/Rector/Class_/RenameClassRector/Source/Twig_Extension_Sandbox.php",
+            "rules/renaming/tests/Rector/Class_/RenameClassRector/Source/TwigFilter.php",
+            "rules/renaming/tests/Rector/Class_/RenameClassRector/Source/Manual_Twig_Filter.php",
+            "rules/solid/tests/Rector/ClassMethod/UseInterfaceOverImplementationInConstructorRector/Source/Apple.php",
             "tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/Source/ChangeMeAnotherNamespace.php"
         ]
     },
@@ -222,9 +222,9 @@
             "@phpstan",
             "@docs"
         ],
-        "check-cs": "vendor/bin/ecs check bin packages src tests utils compiler --ansi",
+        "check-cs": "vendor/bin/ecs check --ansi",
         "fix-cs": [
-            "vendor/bin/ecs check bin packages src tests utils compiler --fix --ansi",
+            "vendor/bin/ecs check --fix --ansi",
             "ci/clean_trailing_spaces.sh"
         ],
         "phpstan": "vendor/bin/phpstan analyse --ansi --error-format symplify",

config/config.yaml

@@ -1,5 +1,6 @@
 imports:
     - { resource: '../packages/**/config/config.yaml' }
+    - { resource: '../rules/**/config/config.yaml' }
     - { resource: 'services.yaml' }
     # only in local repository
     # ignore errors, because utils are not part of composer package nor rector.phar

ecs.yaml

@@ -20,13 +20,21 @@ services:
             - 'NodeVisitorAbstract'
 
 parameters:
+    paths:
+        - "bin"
+        - "src"
+        - "packages"
+        - "rules"
+        - "tests"
+        - "utils"
+
     sets:
-      - 'psr12'
-      - 'php70'
-      - 'php71'
-      - 'symplify'
-      - 'common'
-      - 'clean-code'
+      - "psr12"
+      - "php70"
+      - "php71"
+      - "symplify"
+      - "common"
+      - "clean-code"
 
     exclude_files:
         - '*tests/**Source/*.php'
@@ -35,7 +43,6 @@ parameters:
         - '*tests/*/Expected/*'
         - '*utils/ContributorTools/templates/*'
         - 'stubs/*'
-        - '*/Expected/*'
         # exclude
         - 'src/Rector/AbstractRector.php'
         - 'src/PhpParser/BetterNodeDumper.php'
@@ -54,7 +61,7 @@ parameters:
         Symplify\CodingStandard\Fixer\Order\PrivateMethodOrderByUseFixer: null
 
         PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer:
-            - 'packages/php-74/src/Rector/Double/RealToFloatTypeCastRector.php'
+            - 'rules/php-74/src/Rector/Double/RealToFloatTypeCastRector.php'
 
         Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenReferenceSniff: null
 
@@ -78,19 +85,19 @@ parameters:
             - "packages/node-type-resolver/src/NodeTypeResolver.php"
             - "packages/better-php-doc-parser/src/Printer/OriginalSpacingRestorer.php"
             # @todo split to multiple rectors
-            - "packages/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php"
+            - "rules/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php"
 
             - "packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/ColumnTagValueNode.php"
             - "packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/JoinColumnTagValueNode.php"
-            - "packages/coding-style/src/Rector/ClassMethod/NewlineBeforeNewAssignSetRector.php"
+            - "rules/coding-style/src/Rector/ClassMethod/NewlineBeforeNewAssignSetRector.php"
 
             # per node logic
             - 'utils/DocumentationGenerator/src/Command/DumpNodesCommand.php'
             # copied 3rd party logic
-            - 'packages/php-70/src/EregToPcreTransformer.php'
+            - 'rules/php-70/src/EregToPcreTransformer.php'
             # dev
             - 'packages/type-declaration/src/Rector/FunctionLike/*TypeDeclarationRector.php'
-            - 'packages/php-70/src/Rector/If_/IfToSpaceshipRector.php'
+            - 'rules/php-70/src/Rector/If_/IfToSpaceshipRector.php'
 
         Symplify\CodingStandard\Sniffs\ControlStructure\SprintfOverContactSniff:
             # respects inherited pattern for better comparing
@@ -111,13 +118,13 @@ parameters:
 
         Symplify\CodingStandard\Sniffs\Debug\CommentedOutCodeSniff.Found:
             # notes
-            - 'packages/php-72/src/Rector/Each/ListEachRector.php'
-            - 'packages/dead-code/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php'
-            - 'packages/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php'
-            - 'packages/cakephp-to-symfony/tests/Rector/Class_/CakePHPModelToDoctrineRepositoryRector/CakePHPModelToDoctrineRepositoryRectorTest.php'
+            - 'rules/php-72/src/Rector/Each/ListEachRector.php'
+            - 'rules/dead-code/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php'
+            - 'rules/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php'
+            - 'rules/cakephp-to-symfony/tests/Rector/Class_/CakePHPModelToDoctrineRepositoryRector/CakePHPModelToDoctrineRepositoryRectorTest.php'
 
         PhpCsFixer\Fixer\PhpUnit\PhpUnitStrictFixer:
-            - 'packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfo/PhpDocInfoTest.php'
+            - 'rules/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfo/PhpDocInfoTest.php'
             # intentional "assertEquals()"
             - 'tests/PhpParser/Node/NodeFactoryTest.php'
             - '*TypeResolverTest.php'
@@ -135,7 +142,7 @@ parameters:
             - 'packages/polyfill/src/ConditionEvaluator.php'
 
         SlevomatCodingStandard\Sniffs\Namespaces\ReferenceUsedNamesOnlySniff.PartialUse:
-            - "packages/dead-code/src/Rector/Plus/RemoveDeadZeroAndOneOperationRector.php"
-            - "packages/php-56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php"
+            - "rules/dead-code/src/Rector/Plus/RemoveDeadZeroAndOneOperationRector.php"
+            - "rules/php-56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php"
 
     line_ending: "\n"

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfo/PhpDocInfoTest.php

@@ -73,19 +73,19 @@ final class PhpDocInfoTest extends AbstractKernelTestCase
             new PreSlashStringType(),
         ]);
 
-        $this->assertEquals($expectedUnionType, $paramType);
+        $this->assertSame($expectedUnionType, $paramType);
     }
 
     public function testGetVarType(): void
     {
         $expectedObjectType = new ObjectType('SomeType');
-        $this->assertEquals($expectedObjectType, $this->phpDocInfo->getVarType());
+        $this->assertSame($expectedObjectType, $this->phpDocInfo->getVarType());
     }
 
     public function testGetReturnType(): void
     {
         $expectedObjectType = new ObjectType('SomeType');
-        $this->assertEquals($expectedObjectType, $this->phpDocInfo->getReturnType());
+        $this->assertSame($expectedObjectType, $this->phpDocInfo->getReturnType());
     }
 
     public function testReplaceTagByAnother(): void

packages/node-type-resolver/config/config.yaml

@@ -15,7 +15,8 @@ services:
     Rector\Core\PhpParser\Printer\BetterStandardPrinter: null
     Rector\Core\PhpParser\Node\BetterNodeFinder: null
 
-    # PHPStan
+    # PHPStan - this is the cleanest way to include another container
+    # without injecting full container to Rector Symfony Continaer scope
     PHPStan\Reflection\ReflectionProvider:
         factory: ['@Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory', 'createReflectionProvider']