[CodingStyle] Remove YieldClassMethodToArrayClassMethodRector, rather…

… PHPStorm job (#576) Co-authored-by: GitHub Action <action@github.com>
rectorphp · Aug 2, 2021 · b348090 · b348090
1 parent 00fb10f
commit b348090
Show file tree

Hide file tree

Showing 62 changed files with 344 additions and 625 deletions.
diff --git a/build/target-repository/docs/rector_rules_overview.md b/build/target-repository/docs/rector_rules_overview.md
@@ -1,4 +1,4 @@
-# 476 Rules Overview
+# 475 Rules Overview
 
 <br>
 
@@ -14,7 +14,7 @@
 
 - [CodeQualityStrict](#codequalitystrict) (1)
 
-- [CodingStyle](#codingstyle) (39)
+- [CodingStyle](#codingstyle) (38)
 
 - [Composer](#composer) (6)
 
@@ -2375,7 +2375,7 @@ return static function (ContainerConfigurator $containerConfigurator): void {
     $services->set(ReturnArrayClassMethodToYieldRector::class)
         ->call('configure', [[
             ReturnArrayClassMethodToYieldRector::METHODS_TO_YIELDS => ValueObjectInliner::inline([
-                new ReturnArrayClassMethodToYield('EventSubscriberInterface', 'getSubscribedEvents'),
+                new ReturnArrayClassMethodToYield('PHPUnit\Framework\TestCase', '*provide*'),
             ]),
         ]]);
 };
@@ -2384,12 +2384,14 @@ return static function (ContainerConfigurator $containerConfigurator): void {
 ↓
 
 ```diff
- class SomeEventSubscriber implements EventSubscriberInterface
+ use PHPUnit\Framework\TestCase;
+
+ final class SomeTest implements TestCase
  {
-     public static function getSubscribedEvents()
+     public static function provideData()
      {
--        return ['event' => 'callback'];
-+        yield 'event' => 'callback';
+-        return [['some text']];
++        yield ['some text'];
      }
  }
 ```
@@ -2670,45 +2672,6 @@ Wrap encapsed variables in curly braces
 
 <br>
 
-### YieldClassMethodToArrayClassMethodRector
-
-Turns yield return to array return in specific type and method
-
-:wrench: **configure it!**
-
-- class: [`Rector\CodingStyle\Rector\ClassMethod\YieldClassMethodToArrayClassMethodRector`](../rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php)
-
-```php
-use Rector\CodingStyle\Rector\ClassMethod\YieldClassMethodToArrayClassMethodRector;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-
-    $services->set(YieldClassMethodToArrayClassMethodRector::class)
-        ->call('configure', [[
-            YieldClassMethodToArrayClassMethodRector::METHODS_BY_TYPE => [
-                'EventSubscriberInterface' => ['getSubscribedEvents'],
-
-            ], ]]);
-};
-```
-
-↓
-
-```diff
- class SomeEventSubscriber implements EventSubscriberInterface
- {
-     public static function getSubscribedEvents()
-     {
--        yield 'event' => 'callback';
-+        return ['event' => 'callback'];
-     }
- }
-```
-
-<br>
-
 ## Composer
 
 ### AddPackageToRequireComposerRector

diff --git a/composer.json b/composer.json
@@ -38,16 +38,16 @@
         "symfony/http-kernel": "^5.3",
         "symfony/process": "^5.3",
         "symfony/yaml": "^5.3",
-        "symplify/astral": "^9.4.14",
-        "symplify/autowire-array-parameter": "^9.4.14",
-        "symplify/composer-json-manipulator": "^9.4.14",
-        "symplify/console-color-diff": "^9.4.14",
-        "symplify/package-builder": "^9.4.14",
-        "symplify/rule-doc-generator-contracts": "^9.4.14",
-        "symplify/simple-php-doc-parser": "^9.4.14",
-        "symplify/skipper": "^9.4.14",
-        "symplify/smart-file-system": "^9.4.14",
-        "symplify/symfony-php-config": "^9.4.14",
+        "symplify/astral": "^9.4.24",
+        "symplify/autowire-array-parameter": "^9.4.24",
+        "symplify/composer-json-manipulator": "^9.4.24",
+        "symplify/console-color-diff": "^9.4.24",
+        "symplify/package-builder": "^9.4.24",
+        "symplify/rule-doc-generator-contracts": "^9.4.24",
+        "symplify/simple-php-doc-parser": "^9.4.24",
+        "symplify/skipper": "^9.4.24",
+        "symplify/smart-file-system": "^9.4.24",
+        "symplify/symfony-php-config": "^9.4.24",
         "tracy/tracy": "^2.8",
         "webmozart/assert": "^1.10"
     },
@@ -58,13 +58,13 @@
         "phpunit/phpunit": "^9.5",
         "rector/phpstan-rules": "^0.3.3",
         "rector/rector-generator": "^0.3",
-        "symplify/coding-standard": "^9.4.14",
-        "symplify/easy-ci": "^9.4.14",
+        "symplify/coding-standard": "^9.4.24",
+        "symplify/easy-ci": "^9.4.23",
         "symplify/easy-coding-standard": "^9.4.7",
-        "symplify/easy-testing": "dev-main#049d83e as 9.5.x-dev",
-        "symplify/phpstan-extensions": "^9.4.14",
-        "symplify/phpstan-rules": "^9.4.14",
-        "symplify/rule-doc-generator": "^9.4.14",
+        "symplify/easy-testing": "^9.4.24",
+        "symplify/phpstan-extensions": "^9.4.24",
+        "symplify/phpstan-rules": "^9.4.24",
+        "symplify/rule-doc-generator": "^9.4.24",
         "timeweb/phpstan-enum": "^2.3"
     },
     "replace": {

diff --git a/config/set/code-quality-strict.php b/config/set/code-quality-strict.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
-use Rector\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector;
+use Rector\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\CodingStyle\Rector\MethodCall\UseMessageVariableForSprintfInSymfonyStyleRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

diff --git a/packages/NodeTypeResolver/Contract/NodeTypeResolverInterface.php b/packages/NodeTypeResolver/Contract/NodeTypeResolverInterface.php
@@ -7,12 +7,18 @@
 use PhpParser\Node;
 use PHPStan\Type\Type;
 
+/**
+ * @template TNode as Node
+ */
 interface NodeTypeResolverInterface
 {
     /**
-     * @return array<class-string<Node>>
+     * @return array<class-string<TNode>>
      */
     public function getNodeClasses(): array;
 
+    /**
+     * @param TNode $node
+     */
     public function resolve(Node $node): Type;
 }
diff --git a/packages/NodeTypeResolver/NodeTypeResolver/PropertyTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/PropertyTypeResolver.php
@@ -36,13 +36,13 @@ public function getNodeClasses(): array
     }
 
     /**
-     * @param Property $propertyNode
+     * @param Property $node
      */
-    public function resolve(Node $propertyNode): Type
+    public function resolve(Node $node): Type
     {
         // fake property to local PropertyFetch → PHPStan understands that
-        $propertyFetch = new PropertyFetch(new Variable('this'), (string) $propertyNode->props[0]->name);
-        $propertyFetch->setAttribute(AttributeKey::SCOPE, $propertyNode->getAttribute(AttributeKey::SCOPE));
+        $propertyFetch = new PropertyFetch(new Variable('this'), (string) $node->props[0]->name);
+        $propertyFetch->setAttribute(AttributeKey::SCOPE, $node->getAttribute(AttributeKey::SCOPE));
 
         return $this->nodeTypeResolver->resolve($propertyFetch);
     }

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php
@@ -32,11 +32,11 @@ public function getNodeClasses(): array
     }
 
     /**
-     * @param Trait_ $traitNode
+     * @param Trait_ $node
      */
-    public function resolve(Node $traitNode): Type
+    public function resolve(Node $node): Type
     {
-        $traitName = (string) $traitNode->namespacedName;
+        $traitName = (string) $node->namespacedName;
         if (! $this->reflectionProvider->hasClass($traitName)) {
             return new MixedType();
         }

diff --git a/packages/PHPStanStaticTypeMapper/Contract/TypeMapperInterface.php b/packages/PHPStanStaticTypeMapper/Contract/TypeMapperInterface.php
@@ -31,5 +31,5 @@ public function mapToPHPStanPhpDocTypeNode(Type $type, TypeKind $typeKind): Type
      * @param T $type
      * @return Name|NullableType|UnionType|null
      */
-    public function mapToPhpParserNode(Type $type, TypeKind $typeTypeKind): ?Node;
+    public function mapToPhpParserNode(Type $type, TypeKind $typeKind): ?Node;
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -88,7 +88,6 @@ parameters:
             paths:
                 - rules/Php70/EregToPcreTransformer.php
                 - packages/NodeTypeResolver/NodeTypeResolver.php
-                - rules/CodeQualityStrict/Rector/Variable/MoveVariableDeclarationNearReferenceRector.php
                 - rules/Php80/Rector/If_/NullsafeOperatorRector.php
                 - rules/Renaming/NodeManipulator/ClassRenamer.php
                 - rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php
@@ -536,3 +535,13 @@ parameters:
             message: '#"@\\var_export\(new \\Rector\\Caching\\ValueObject\\CacheItem\(\$variableKey, \$data\), true\)" is forbidden to use#'
             paths:
                 - packages/Caching/ValueObject/Storage/FileCacheStorage.php
+
+        -
+            message: '#Arguments names conflicts with parent class method\: "\$(.*?)" should be "\$(.*?)"\. This will break named arguments#'
+            paths:
+                - src/PhpParser/Printer/BetterStandardPrinter.php
+                - packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php
+                - packages/BetterPhpDocParser/PhpDocParser/BetterTypeParser.php
+
+        # resolve later
+        -  '#Variables "\$(.*?)" are overridden\. This can lead to unwanted bugs, please pick a different name to avoid it#'
diff --git a/rector.php b/rector.php
@@ -4,8 +4,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Rector\CodingStyle\Enum\PreferenceSelfThis;
+use Rector\CodingStyle\Rector\ClassMethod\ReturnArrayClassMethodToYieldRector;
 use Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector;
 use Rector\CodingStyle\Rector\String_\SplitStringClassConstantToClassConstFetchRector;
+use Rector\CodingStyle\ValueObject\ReturnArrayClassMethodToYield;
 use Rector\Core\Configuration\Option;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Nette\Set\NetteSetList;
@@ -41,19 +43,26 @@
     ]);
 
     $services = $containerConfigurator->services();
-
     $services->set(InferParamFromClassMethodReturnRector::class)
         ->call('configure', [[
             InferParamFromClassMethodReturnRector::INFER_PARAMS_FROM_CLASS_METHOD_RETURNS => $configuration,
         ]]);
 
+    // phpunit
     $services->set(PreferThisOrSelfMethodCallRector::class)
         ->call('configure', [[
             PreferThisOrSelfMethodCallRector::TYPE_TO_PREFERENCE => [
                 TestCase::class => ValueObjectInliner::inline(PreferenceSelfThis::PREFER_THIS()),
             ],
         ]]);
 
+    $services->set(ReturnArrayClassMethodToYieldRector::class)
+        ->call('configure', [[
+            ReturnArrayClassMethodToYieldRector::METHODS_TO_YIELDS => ValueObjectInliner::inline([
+                new ReturnArrayClassMethodToYield('PHPUnit\Framework\TestCase', '*provide*'),
+            ]),
+        ]]);
+
     $parameters = $containerConfigurator->parameters();
 
     $parameters->set(Option::PATHS, [

diff --git a/...arReferenceRector/Fixture/fixture.php.inc → ...arReferenceRector/Fixture/fixture.php.inc b/...arReferenceRector/Fixture/fixture.php.inc → ...arReferenceRector/Fixture/fixture.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class Fixture
 {
@@ -17,7 +17,7 @@ class Fixture
 -----
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class Fixture
 {

diff --git a/...ixture/fixture_used_only_after_if.php.inc → ...ixture/fixture_used_only_after_if.php.inc b/...ixture/fixture_used_only_after_if.php.inc → ...ixture/fixture_used_only_after_if.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class FixtureUsedOnlyAfterIf
 {
@@ -18,7 +18,7 @@ class FixtureUsedOnlyAfterIf
 -----
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class FixtureUsedOnlyAfterIf
 {

diff --git a/...xture/fixture_variable_in_closure.php.inc → ...xture/fixture_variable_in_closure.php.inc b/...xture/fixture_variable_in_closure.php.inc → ...xture/fixture_variable_in_closure.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 function variableInClosure()
 {
@@ -16,7 +16,7 @@ function variableInClosure()
 -----
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 function variableInClosure()
 {

diff --git a/...e_variable_in_closure_with_return.php.inc → ...e_variable_in_closure_with_return.php.inc b/...e_variable_in_closure_with_return.php.inc → ...e_variable_in_closure_with_return.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 function variableInClosureWithReturn()
 {
@@ -16,7 +16,7 @@ function variableInClosureWithReturn()
 -----
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 function variableInClosureWithReturn()
 {

diff --git a/...e/fixture_variable_multiple_usage.php.inc → ...e/fixture_variable_multiple_usage.php.inc b/...e/fixture_variable_multiple_usage.php.inc → ...e/fixture_variable_multiple_usage.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 function variableWithMultipleUsages()
 {
@@ -15,7 +15,7 @@ function variableWithMultipleUsages()
 -----
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 function variableWithMultipleUsages()
 {

diff --git a/...Fixture/skip_array_dim_fetch_next.php.inc → ...Fixture/skip_array_dim_fetch_next.php.inc b/...Fixture/skip_array_dim_fetch_next.php.inc → ...Fixture/skip_array_dim_fetch_next.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class SkipArrayDimFetchNext
 {

diff --git a/.../skip_array_dim_fetch_next_as_key.php.inc → .../skip_array_dim_fetch_next_as_key.php.inc b/.../skip_array_dim_fetch_next_as_key.php.inc → .../skip_array_dim_fetch_next_as_key.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class SkipArrayDimFetchNextAsKey
 {

diff --git a/.../skip_assign_expr_array_dim_fetch.php.inc → .../skip_assign_expr_array_dim_fetch.php.inc b/.../skip_assign_expr_array_dim_fetch.php.inc → .../skip_assign_expr_array_dim_fetch.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 final class SkipAssignExprArrayDimFetch
 {

diff --git a/...declared_in_extra_parent_previous.php.inc → ...declared_in_extra_parent_previous.php.inc b/...declared_in_extra_parent_previous.php.inc → ...declared_in_extra_parent_previous.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class SkipDeclaredInExtraParentPrevious
 {

diff --git a/...ceRector/Fixture/skip_expr_reused.php.inc → ...ceRector/Fixture/skip_expr_reused.php.inc b/...ceRector/Fixture/skip_expr_reused.php.inc → ...ceRector/Fixture/skip_expr_reused.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class SkipExprReused
 {

diff --git a/...Rector/Fixture/skip_expr_var_used.php.inc → ...Rector/Fixture/skip_expr_var_used.php.inc b/...Rector/Fixture/skip_expr_var_used.php.inc → ...Rector/Fixture/skip_expr_var_used.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Variable\MoveVariableDeclarationNearReferenceRector\Fixture;
 
 class SkipExprVarUsed
 {