Updated Rector to commit b4eb417407360b419e71eaa7609209a1597441e2

rectorphp/rector-src@b4eb417 Remove ReturnArrayClassMethodToYieldRector, add to PHPUnit Rector (#4213)

Author: TomasVotruba

docs/rector_rules_overview.md

@@ -1,4 +1,4 @@
-# 370 Rules Overview
+# 368 Rules Overview
 
 <br>
 
@@ -8,7 +8,7 @@
 
 - [CodeQuality](#codequality) (71)
 
-- [CodingStyle](#codingstyle) (34)
+- [CodingStyle](#codingstyle) (32)
 
 - [DeadCode](#deadcode) (43)
 
@@ -2004,47 +2004,6 @@ Use ++$value or --$value  instead of `$value++` or `$value--`
 
 <br>
 
-### PreferThisOrSelfMethodCallRector
-
-Changes `$this->...` and static:: to self:: or vise versa for given types
-
-:wrench: **configure it!**
-
-- class: [`Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector`](../rules/CodingStyle/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php)
-
-```php
-<?php
-
-declare(strict_types=1);
-
-use PHPUnit\Framework\TestCase;
-use Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector;
-use Rector\Config\RectorConfig;
-
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->ruleWithConfiguration(PreferThisOrSelfMethodCallRector::class, [
-        TestCase::class => 'prefer_self',
-    ]);
-};
-```
-
-↓
-
-```diff
- use PHPUnit\Framework\TestCase;
-
- final class SomeClass extends TestCase
- {
-     public function run()
-     {
--        $this->assertEquals('a', 'a');
-+        self::assertEquals('a', 'a');
-     }
- }
-```
-
-<br>
-
 ### RemoveFinalFromConstRector
 
 Remove final from constants in classes defined as final
@@ -2061,49 +2020,6 @@ Remove final from constants in classes defined as final
 
 <br>
 
-### ReturnArrayClassMethodToYieldRector
-
-Turns array return to yield return in specific type and method
-
-:wrench: **configure it!**
-
-- class: [`Rector\CodingStyle\Rector\ClassMethod\ReturnArrayClassMethodToYieldRector`](../rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php)
-
-```php
-<?php
-
-declare(strict_types=1);
-
-use Rector\CodingStyle\Rector\ClassMethod\ReturnArrayClassMethodToYieldRector;
-use Rector\CodingStyle\ValueObject\ReturnArrayClassMethodToYield;
-use Rector\Config\RectorConfig;
-
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->ruleWithConfiguration(ReturnArrayClassMethodToYieldRector::class, [
-        new ReturnArrayClassMethodToYield('PHPUnit\Framework\TestCase', '*provide*'),
-    ]);
-};
-```
-
-↓
-
-```diff
- use PHPUnit\Framework\TestCase;
-
- final class SomeTest implements TestCase
- {
-     public static function provideData()
-     {
--        return [
--            ['some text']
--        ];
-+        yield ['some text'];
-     }
- }
-```
-
-<br>
-
 ### SeparateMultiUseImportsRector
 
 Split multi use imports and trait statements to standalone lines

packages/NodeTypeResolver/NodeTypeResolver/ClassMethodOrClassConstTypeResolver.php

@@ -3,16 +3,15 @@
 declare (strict_types=1);
 namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
-use PHPStan\Reflection\ClassReflection;
-use PHPStan\Type\ObjectType;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Reflection\ClassReflection;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\Type;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
-use Rector\NodeTypeResolver\NodeTypeResolver;
 use RectorPrefix202306\Symfony\Contracts\Service\Attribute\Required;
 /**
  * @implements NodeTypeResolverInterface<ClassMethod|ClassConst>

rules/CodingStyle/ValueObject/ReturnArrayClassMethodToYield.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'fd3c90cb6434670821709fb556f42d55247c3024';
+    public const PACKAGE_VERSION = 'b4eb417407360b419e71eaa7609209a1597441e2';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-06-13 20:49:02';
+    public const RELEASE_DATE = '2023-06-13 16:19:45';
     /**
      * @var int
      */

src/Application/VersionResolver.php

@@ -17,6 +17,9 @@
 use Rector\Core\Util\StringUtils;
 use Rector\Core\ValueObject\SprintfStringAndArgs;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+/**
+ * @api used in phpunit
+ */
 final class NodeTransformer
 {
     /**
@@ -25,7 +28,7 @@ final class NodeTransformer
      */
     private const PERCENT_TEXT_REGEX = '#^%\\w$#';
     /**
-     * @api symfony
+     * @api used in phpunit symfony
      *
      * From:
      * - sprintf("Hi %s", $name);

src/PhpParser/NodeTransformer.php

@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit4d107198729b80233f7764afa811445a::getLoader();
+return ComposerAutoloaderInitcd5f3d0e402afc71925a1564afc7644a::getLoader();

vendor/autoload.php

@@ -1464,7 +1464,6 @@
     'Rector\\CodingStyle\\Rector\\ClassMethod\\FuncGetArgsToVariadicParamRector' => $baseDir . '/rules/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector.php',
     'Rector\\CodingStyle\\Rector\\ClassMethod\\MakeInheritedMethodVisibilitySameAsParentRector' => $baseDir . '/rules/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector.php',
     'Rector\\CodingStyle\\Rector\\ClassMethod\\NewlineBeforeNewAssignSetRector' => $baseDir . '/rules/CodingStyle/Rector/ClassMethod/NewlineBeforeNewAssignSetRector.php',
-    'Rector\\CodingStyle\\Rector\\ClassMethod\\ReturnArrayClassMethodToYieldRector' => $baseDir . '/rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php',
     'Rector\\CodingStyle\\Rector\\ClassMethod\\UnSpreadOperatorRector' => $baseDir . '/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php',
     'Rector\\CodingStyle\\Rector\\Class_\\AddArrayDefaultToArrayPropertyRector' => $baseDir . '/rules/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php',
     'Rector\\CodingStyle\\Rector\\Closure\\StaticClosureRector' => $baseDir . '/rules/CodingStyle/Rector/Closure/StaticClosureRector.php',
@@ -1490,7 +1489,6 @@
     'Rector\\CodingStyle\\Reflection\\VendorLocationDetector' => $baseDir . '/rules/CodingStyle/Reflection/VendorLocationDetector.php',
     'Rector\\CodingStyle\\TypeAnalyzer\\IterableTypeAnalyzer' => $baseDir . '/rules/CodingStyle/TypeAnalyzer/IterableTypeAnalyzer.php',
     'Rector\\CodingStyle\\ValueObject\\ObjectMagicMethods' => $baseDir . '/rules/CodingStyle/ValueObject/ObjectMagicMethods.php',
-    'Rector\\CodingStyle\\ValueObject\\ReturnArrayClassMethodToYield' => $baseDir . '/rules/CodingStyle/ValueObject/ReturnArrayClassMethodToYield.php',
     'Rector\\Comments\\CommentRemover' => $baseDir . '/packages/Comments/CommentRemover.php',
     'Rector\\Comments\\NodeDocBlock\\DocBlockUpdater' => $baseDir . '/packages/Comments/NodeDocBlock/DocBlockUpdater.php',
     'Rector\\Comments\\NodeTraverser\\CommentRemovingNodeTraverser' => $baseDir . '/packages/Comments/NodeTraverser/CommentRemovingNodeTraverser.php',
@@ -2102,9 +2100,11 @@
     'Rector\\PHPStanStaticTypeMapper\\Utils\\TypeUnwrapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/Utils/TypeUnwrapper.php',
     'Rector\\PHPStanStaticTypeMapper\\ValueObject\\UnionTypeAnalysis' => $baseDir . '/packages/PHPStanStaticTypeMapper/ValueObject/UnionTypeAnalysis.php',
     'Rector\\PHPUnit\\Naming\\TestClassNameResolver' => $vendorDir . '/rector/rector-phpunit/src/Naming/TestClassNameResolver.php',
+    'Rector\\PHPUnit\\NodeAnalyzer\\ArgumentMover' => $vendorDir . '/rector/rector-phpunit/src/NodeAnalyzer/ArgumentMover.php',
     'Rector\\PHPUnit\\NodeAnalyzer\\AssertCallAnalyzer' => $vendorDir . '/rector/rector-phpunit/src/NodeAnalyzer/AssertCallAnalyzer.php',
     'Rector\\PHPUnit\\NodeAnalyzer\\IdentifierManipulator' => $vendorDir . '/rector/rector-phpunit/src/NodeAnalyzer/IdentifierManipulator.php',
     'Rector\\PHPUnit\\NodeAnalyzer\\MockedVariableAnalyzer' => $vendorDir . '/rector/rector-phpunit/src/NodeAnalyzer/MockedVariableAnalyzer.php',
+    'Rector\\PHPUnit\\NodeAnalyzer\\ParamAndArgFromArrayResolver' => $vendorDir . '/rector/rector-phpunit/src/NodeAnalyzer/ParamAndArgFromArrayResolver.php',
     'Rector\\PHPUnit\\NodeAnalyzer\\SetUpMethodDecorator' => $vendorDir . '/rector/rector-phpunit/src/NodeAnalyzer/SetUpMethodDecorator.php',
     'Rector\\PHPUnit\\NodeAnalyzer\\TestsNodeAnalyzer' => $vendorDir . '/rector/rector-phpunit/src/NodeAnalyzer/TestsNodeAnalyzer.php',
     'Rector\\PHPUnit\\NodeFactory\\ArgumentShiftingFactory' => $vendorDir . '/rector/rector-phpunit/src/NodeFactory/ArgumentShiftingFactory.php',
@@ -2116,8 +2116,6 @@
     'Rector\\PHPUnit\\NodeFactory\\ExpectExceptionMessageRegExpFactory' => $vendorDir . '/rector/rector-phpunit/src/NodeFactory/ExpectExceptionMessageRegExpFactory.php',
     'Rector\\PHPUnit\\NodeFactory\\ExpectExceptionMethodCallFactory' => $vendorDir . '/rector/rector-phpunit/src/NodeFactory/ExpectExceptionMethodCallFactory.php',
     'Rector\\PHPUnit\\NodeFinder\\DataProviderClassMethodFinder' => $vendorDir . '/rector/rector-phpunit/src/NodeFinder/DataProviderClassMethodFinder.php',
-    'Rector\\PHPUnit\\NodeManipulator\\ArgumentMover' => $vendorDir . '/rector/rector-phpunit/src/NodeManipulator/ArgumentMover.php',
-    'Rector\\PHPUnit\\NodeManipulator\\ParamAndArgFromArrayResolver' => $vendorDir . '/rector/rector-phpunit/src/NodeManipulator/ParamAndArgFromArrayResolver.php',
     'Rector\\PHPUnit\\PhpDoc\\DataProviderMethodRenamer' => $vendorDir . '/rector/rector-phpunit/src/PhpDoc/DataProviderMethodRenamer.php',
     'Rector\\PHPUnit\\PhpDoc\\PhpDocValueToNodeMapper' => $vendorDir . '/rector/rector-phpunit/src/PhpDoc/PhpDocValueToNodeMapper.php',
     'Rector\\PHPUnit\\Rector\\ClassMethod\\AddDoesNotPerformAssertionToNonAssertingTestRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector.php',
@@ -2140,6 +2138,7 @@
     'Rector\\PHPUnit\\Rector\\Class_\\RemoveDataProviderTestPrefixRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/Class_/RemoveDataProviderTestPrefixRector.php',
     'Rector\\PHPUnit\\Rector\\Class_\\StaticDataProviderClassMethodRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/Class_/StaticDataProviderClassMethodRector.php',
     'Rector\\PHPUnit\\Rector\\Class_\\TestListenerToHooksRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/Class_/TestListenerToHooksRector.php',
+    'Rector\\PHPUnit\\Rector\\Class_\\YieldDataProviderRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/Class_/YieldDataProviderRector.php',
     'Rector\\PHPUnit\\Rector\\Foreach_\\SimplifyForeachInstanceOfRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/Foreach_/SimplifyForeachInstanceOfRector.php',
     'Rector\\PHPUnit\\Rector\\MethodCall\\AssertCompareToSpecificMethodRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/MethodCall/AssertCompareToSpecificMethodRector.php',
     'Rector\\PHPUnit\\Rector\\MethodCall\\AssertComparisonToSpecificMethodRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/MethodCall/AssertComparisonToSpecificMethodRector.php',

vendor/composer/autoload_classmap.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit4d107198729b80233f7764afa811445a
+class ComposerAutoloaderInitcd5f3d0e402afc71925a1564afc7644a
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit4d107198729b80233f7764afa811445a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitcd5f3d0e402afc71925a1564afc7644a', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit4d107198729b80233f7764afa811445a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitcd5f3d0e402afc71925a1564afc7644a', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit4d107198729b80233f7764afa811445a::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitcd5f3d0e402afc71925a1564afc7644a::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit4d107198729b80233f7764afa811445a::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitcd5f3d0e402afc71925a1564afc7644a::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;