Updated Rector to commit 0348124a5535b99712da4debc136d2e73647b97a

TomasVotruba · TomasVotruba · commit d36c8ad1a530 · 2024-04-03T14:37:39.000Z
rectorphp/rector-src@0348124 [CodeQuality] Skip Switch_ always returned on ExplicitReturnNullRector (#5800)
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -1802,12 +1802,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
-                "reference": "6845db43ccd69ef990d399ff845a53ad66fa8085"
+                "reference": "84b87bc5183d97dfb3582a9dd43c3607b0b51856"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/6845db43ccd69ef990d399ff845a53ad66fa8085",
-                "reference": "6845db43ccd69ef990d399ff845a53ad66fa8085",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/84b87bc5183d97dfb3582a9dd43c3607b0b51856",
+                "reference": "84b87bc5183d97dfb3582a9dd43c3607b0b51856",
                 "shasum": ""
             },
             "require": {
@@ -1830,7 +1830,7 @@
                 "tomasvotruba\/class-leak": "^0.2",
                 "tracy\/tracy": "^2.10"
             },
-            "time": "2024-03-08T15:37:45+00:00",
+            "time": "2024-04-03T14:33:28+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
diff --git a/vendor/rector/extension-installer/src/GeneratedConfig.php b/vendor/rector/extension-installer/src/GeneratedConfig.php
@@ -9,7 +9,7 @@
  */
 final class GeneratedConfig
 {
-    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main b3da143'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 05e44cf'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 6845db4'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main c8b6413'));
+    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main b3da143'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 05e44cf'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 84b87bc'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main c8b6413'));
     private function __construct()
     {
     }
diff --git a/vendor/rector/rector-phpunit/rules/CodeQuality/Rector/ClassMethod/DataProviderArrayItemsNewLinedRector.php b/vendor/rector/rector-phpunit/rules/CodeQuality/Rector/ClassMethod/DataProviderArrayItemsNewLinedRector.php
@@ -31,13 +31,7 @@ final class DataProviderArrayItemsNewLinedRector extends AbstractRector
     private $betterNodeFinder;
     public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer, BetterNodeFinder $betterNodeFinder)
     {
-        /**
-         * @readonly
-         */
         $this->testsNodeAnalyzer = $testsNodeAnalyzer;
-        /**
-         * @readonly
-         */
         $this->betterNodeFinder = $betterNodeFinder;
     }
     public function getRuleDefinition() : RuleDefinition
diff --git a/vendor/rector/rector-phpunit/rules/CodeQuality/Rector/Class_/TestWithToDataProviderRector.php b/vendor/rector/rector-phpunit/rules/CodeQuality/Rector/Class_/TestWithToDataProviderRector.php
@@ -56,6 +56,10 @@ final class TestWithToDataProviderRector extends AbstractRector
      * @var \Rector\NodeManipulator\ClassInsertManipulator
      */
     private $classInsertManipulator;
+    /**
+     * @var bool
+     */
+    private $hasChanged = \false;
     public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer, PhpDocInfoFactory $phpDocInfoFactory, PhpDocTagRemover $phpDocTagRemover, DocBlockUpdater $docBlockUpdater, ClassInsertManipulator $classInsertManipulator)
     {
         $this->testsNodeAnalyzer = $testsNodeAnalyzer;
@@ -111,19 +115,22 @@ public function refactor(Node $node) : ?Node
         if (!$this->testsNodeAnalyzer->isInTestClass($node)) {
             return null;
         }
+        $this->hasChanged = \false;
         foreach ($node->stmts as $classMethod) {
             if (!$classMethod instanceof ClassMethod) {
                 continue;
             }
             $this->refactorClassMethod($node, $classMethod);
         }
+        if (!$this->hasChanged) {
+            return null;
+        }
         return $node;
     }
     private function refactorClassMethod(Class_ $class, ClassMethod $classMethod) : void
     {
         $arrayItemsSingleLine = [];
         $arrayMultiLine = null;
-        $hasChanged = \false;
         $phpDocInfo = $this->phpDocInfoFactory->createFromNode($classMethod);
         if (!$phpDocInfo instanceof PhpDocInfo) {
             return;
@@ -144,9 +151,11 @@ private function refactorClassMethod(Class_ $class, ClassMethod $classMethod) :
                 $arrayItemsSingleLine[] = new ArrayItem($this->createArrayItem($values[0]));
             }
             //cleanup
-            $hasChanged = $this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $testWithPhpDocTagNode);
+            if ($this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $testWithPhpDocTagNode)) {
+                $this->hasChanged = \true;
+            }
         }
-        if (!$hasChanged) {
+        if (!$this->hasChanged) {
             return;
         }
         $dataProviderName = $this->generateDataProviderName($classMethod);

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*/`
`10`	`10`	`final class GeneratedConfig`
`11`	`11`	`{`
`12`		- public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main b3da143'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 05e44cf'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 6845db4'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main c8b6413'));
	`12`	+ public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main b3da143'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 05e44cf'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 84b87bc'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main c8b6413'));
`13`	`13`	`private function __construct()`
`14`	`14`	`{`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,7 @@ final class DataProviderArrayItemsNewLinedRector extends AbstractRector`
`31`	`31`	`private $betterNodeFinder;`
`32`	`32`	`public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer, BetterNodeFinder $betterNodeFinder)`
`33`	`33`	`{`
`34`		`- /**`
`35`		`- * @readonly`
`36`		`- */`
`37`	`34`	`$this->testsNodeAnalyzer = $testsNodeAnalyzer;`
`38`		`- /**`
`39`		`- * @readonly`
`40`		`- */`
`41`	`35`	`$this->betterNodeFinder = $betterNodeFinder;`
`42`	`36`	`}`
`43`	`37`	`public function getRuleDefinition() : RuleDefinition`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ final class TestWithToDataProviderRector extends AbstractRector`
`56`	`56`	`* @var \Rector\NodeManipulator\ClassInsertManipulator`
`57`	`57`	`*/`
`58`	`58`	`private $classInsertManipulator;`
	`59`	`+ /**`
	`60`	`+ * @var bool`
	`61`	`+ */`
	`62`	`+ private $hasChanged = \false;`
`59`	`63`	`public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer, PhpDocInfoFactory $phpDocInfoFactory, PhpDocTagRemover $phpDocTagRemover, DocBlockUpdater $docBlockUpdater, ClassInsertManipulator $classInsertManipulator)`
`60`	`64`	`{`
`61`	`65`	`$this->testsNodeAnalyzer = $testsNodeAnalyzer;`
`@@ -111,19 +115,22 @@ public function refactor(Node $node) : ?Node`
`111`	`115`	`if (!$this->testsNodeAnalyzer->isInTestClass($node)) {`
`112`	`116`	`return null;`
`113`	`117`	`}`
	`118`	`+ $this->hasChanged = \false;`
`114`	`119`	`foreach ($node->stmts as $classMethod) {`
`115`	`120`	`if (!$classMethod instanceof ClassMethod) {`
`116`	`121`	`continue;`
`117`	`122`	`}`
`118`	`123`	`$this->refactorClassMethod($node, $classMethod);`
`119`	`124`	`}`
	`125`	`+ if (!$this->hasChanged) {`
	`126`	`+ return null;`
	`127`	`+ }`
`120`	`128`	`return $node;`
`121`	`129`	`}`
`122`	`130`	`private function refactorClassMethod(Class_ $class, ClassMethod $classMethod) : void`
`123`	`131`	`{`
`124`	`132`	`$arrayItemsSingleLine = [];`
`125`	`133`	`$arrayMultiLine = null;`
`126`		`- $hasChanged = \false;`
`127`	`134`	`$phpDocInfo = $this->phpDocInfoFactory->createFromNode($classMethod);`
`128`	`135`	`if (!$phpDocInfo instanceof PhpDocInfo) {`
`129`	`136`	`return;`
`@@ -144,9 +151,11 @@ private function refactorClassMethod(Class_ $class, ClassMethod $classMethod) :`
`144`	`151`	`$arrayItemsSingleLine[] = new ArrayItem($this->createArrayItem($values[0]));`
`145`	`152`	`}`
`146`	`153`	`//cleanup`
`147`		`- $hasChanged = $this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $testWithPhpDocTagNode);`
	`154`	`+ if ($this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $testWithPhpDocTagNode)) {`
	`155`	`+ $this->hasChanged = \true;`
	`156`	`+ }`
`148`	`157`	`}`
`149`		`- if (!$hasChanged) {`
	`158`	`+ if (!$this->hasChanged) {`
`150`	`159`	`return;`
`151`	`160`	`}`
`152`	`161`	`$dataProviderName = $this->generateDataProviderName($classMethod);`