[DX] Remove MoveServicesBySuffixToDirectoryRector, better handle by P…

…HPStan + PHPStorm refacor (#1834)
rectorphp · Feb 18, 2022 · a4eff1e · a4eff1e
1 parent 323be2a
commit a4eff1e
Show file tree

Hide file tree

Showing 26 changed files with 402 additions and 636 deletions.
diff --git a/build/target-repository/docs/rector_rules_overview.md b/build/target-repository/docs/rector_rules_overview.md
diff --git a/composer.json b/composer.json
@@ -114,7 +114,6 @@
         },
         "classmap": [
             "stubs",
-            "rules-tests/Autodiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Expected",
             "rules-tests/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector/Expected",
             "rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source",
             "rules-tests/Renaming/Rector/Name/RenameClassRector/Source",

diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
@@ -305,7 +305,11 @@ public function removeByType(string $typeToRemove): void
             $typeToRemove
         ): ?int {
             if ($node instanceof PhpDocTagNode && is_a($node->value, $typeToRemove, true)) {
-                if (str_starts_with($node->name, '@psalm-') || str_starts_with($node->name, '@phpstan-')) {
+                if (str_starts_with($node->name, '@psalm-')) {
+                    return null;
+                }
+
+                if (str_starts_with($node->name, '@phpstan-')) {
                     return null;
                 }
 

diff --git a/...r/Class_/MoveServicesBySuffixToDirectoryRector/Expected/Command/ExpectedBananaCommand.php b/...r/Class_/MoveServicesBySuffixToDirectoryRector/Expected/Command/ExpectedBananaCommand.php
diff --git a/...Class_/MoveServicesBySuffixToDirectoryRector/Expected/Controller/MissPlacedController.php b/...Class_/MoveServicesBySuffixToDirectoryRector/Expected/Controller/MissPlacedController.php
diff --git a/..._/MoveServicesBySuffixToDirectoryRector/Expected/Mapper/Nested/AbstractBaseMapper.php.inc b/..._/MoveServicesBySuffixToDirectoryRector/Expected/Mapper/Nested/AbstractBaseMapper.php.inc
diff --git a/...vicesBySuffixToDirectoryRector/Expected/Mapper/Nested/AbstractBaseWithSpaceMapper.php.inc b/...vicesBySuffixToDirectoryRector/Expected/Mapper/Nested/AbstractBaseWithSpaceMapper.php.inc
diff --git a/...ry/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Expected/Mapper/UserMapper.php.inc b/...ry/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Expected/Mapper/UserMapper.php.inc
diff --git a/.../Class_/MoveServicesBySuffixToDirectoryRector/Expected/Mapper/UserWithSpaceMapper.php.inc b/.../Class_/MoveServicesBySuffixToDirectoryRector/Expected/Mapper/UserWithSpaceMapper.php.inc
diff --git a/...ss_/MoveServicesBySuffixToDirectoryRector/Expected/Repository/ExpectedAppleRepository.php b/...ss_/MoveServicesBySuffixToDirectoryRector/Expected/Repository/ExpectedAppleRepository.php
diff --git a/...or/Class_/MoveServicesBySuffixToDirectoryRector/Expected/config/expected_some_config.neon b/...or/Class_/MoveServicesBySuffixToDirectoryRector/Expected/config/expected_some_config.neon
diff --git a/...lass_/MoveServicesBySuffixToDirectoryRector/MoveServicesBySuffixToDirectoryRectorTest.php b/...lass_/MoveServicesBySuffixToDirectoryRector/MoveServicesBySuffixToDirectoryRectorTest.php
diff --git a/...ctor/Class_/MoveServicesBySuffixToDirectoryRector/Source/Command/MissPlacedController.php b/...ctor/Class_/MoveServicesBySuffixToDirectoryRector/Source/Command/MissPlacedController.php
diff --git a/...y/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Controller/BananaCommand.php b/...y/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Controller/BananaCommand.php
diff --git a/...ss_/MoveServicesBySuffixToDirectoryRector/Source/Controller/Nested/AbstractBaseMapper.php b/...ss_/MoveServicesBySuffixToDirectoryRector/Source/Controller/Nested/AbstractBaseMapper.php
diff --git a/...ervicesBySuffixToDirectoryRector/Source/Controller/Nested/AbstractBaseWithSpaceMapper.php b/...ervicesBySuffixToDirectoryRector/Source/Controller/Nested/AbstractBaseWithSpaceMapper.php
diff --git a/...iscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Controller/Orange.php b/...iscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Controller/Orange.php
diff --git a/...ery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Entity/AppleRepository.php b/...ery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Entity/AppleRepository.php
diff --git a/...iscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Entity/UserMapper.php b/...iscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Entity/UserMapper.php
diff --git a/...Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Entity/UserWithSpaceMapper.php b/...Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Entity/UserWithSpaceMapper.php
diff --git a/...y/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Mapper/SkipCorrectMapper.php b/...y/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/Mapper/SkipCorrectMapper.php
diff --git a/...lass_/MoveServicesBySuffixToDirectoryRector/Source/Repository/Fixture/AppleRepository.php b/...lass_/MoveServicesBySuffixToDirectoryRector/Source/Repository/Fixture/AppleRepository.php
diff --git a/...covery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/config/some_config.neon b/...covery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/Source/config/some_config.neon
diff --git a/...odiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/config/configured_rule.php b/...odiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector/config/configured_rule.php
diff --git a/rules/Autodiscovery/FileLocation/ExpectedFileLocationResolver.php b/rules/Autodiscovery/FileLocation/ExpectedFileLocationResolver.php