Updated Rector to commit 712237ec22

712237ec22 Error message improvements (#2242)

rules/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector.php

@@ -24,6 +24,10 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
  */
 final class DowngradeStreamIsattyRector extends \Rector\Core\Rector\AbstractRector
 {
+    /**
+     * @var \PhpParser\Node\Expr\Closure|null
+     */
+    private $cachedClosure;
     /**
      * @readonly
      * @var \Rector\Core\PhpParser\Parser\InlineCodeParser
@@ -113,6 +117,9 @@ CODE_SAMPLE
     }
     private function createClosure() : \PhpParser\Node\Expr\Closure
     {
+        if ($this->cachedClosure instanceof \PhpParser\Node\Expr\Closure) {
+            return clone $this->cachedClosure;
+        }
         $stmts = $this->inlineCodeParser->parse(__DIR__ . '/../../snippet/isatty_closure.php.inc');
         /** @var Expression $expression */
         $expression = $stmts[0];
@@ -120,6 +127,7 @@ CODE_SAMPLE
         if (!$expr instanceof \PhpParser\Node\Expr\Closure) {
             throw new \Rector\Core\Exception\ShouldNotHappenException();
         }
+        $this->cachedClosure = $expr;
         return $expr;
     }
 }

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = 'ede1106a69f3ef7aa665fcfada9906e56029bd28';
+    public const PACKAGE_VERSION = '712237ec22769c8b256cd9e8356e8dc99bdcb819';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2022-05-06 09:09:50';
+    public const RELEASE_DATE = '2022-05-06 07:36:43';
     /**
      * @var string
      */

src/Rector/AbstractRector.php

@@ -48,14 +48,14 @@ abstract class AbstractRector extends \PhpParser\NodeVisitorAbstract implements
     /**
      * @var string
      */
-    private const MESSAGE = <<<CODE_SAMPLE
-Array of nodes must not be empty, ensure "%s->refactor()" returns non-empty array for Nodes.
+    private const EMPTY_NODE_ARRAY_MESSAGE = <<<CODE_SAMPLE
+Array of nodes cannot be empty. Ensure "%s->refactor()" returns non-empty array for Nodes.
 
-You can also either return null for no change:
+A) Return null for no change:
 
     return null;
 
-or remove the Node if not needed via
+B) Remove the Node:
 
     \$this->removeNode(\$node);
     return \$node;
@@ -210,7 +210,8 @@ CODE_SAMPLE;
             return null;
         }
         if ($node === []) {
-            throw new \Rector\Core\Exception\ShouldNotHappenException(\sprintf(self::MESSAGE, static::class));
+            $errorMessage = \sprintf(self::EMPTY_NODE_ARRAY_MESSAGE, static::class);
+            throw new \Rector\Core\Exception\ShouldNotHappenException($errorMessage);
         }
         /** @var Node[]|Node $node */
         $this->createdByRuleDecorator->decorate($node, $originalNode, static::class);

src/Rector/AbstractScopeAwareRector.php

@@ -22,7 +22,8 @@ abstract class AbstractScopeAwareRector extends \Rector\Core\Rector\AbstractRect
     {
         $scope = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
         if (!$scope instanceof \PHPStan\Analyser\Scope) {
-            $errorMessage = \sprintf('Scope not available on "%s" node, but is required by a refactorWithScope() method of "%s" rule. Fix scope refresh on changed nodes first', \get_class($node), static::class);
+            $parent = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE);
+            $errorMessage = \sprintf('Scope not available on "%s" node with parent node of "%s", but is required by a refactorWithScope() method of "%s" rule. Fix scope refresh on changed nodes first', \get_class($node), \get_class($parent), static::class);
             throw new \Rector\Core\Exception\ShouldNotHappenException($errorMessage);
         }
         return $this->refactorWithScope($node, $scope);

vendor/autoload.php

@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991::getLoader();
+return ComposerAutoloaderInit51eab5937a895c395b9c60a5d1817c08::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991
+class ComposerAutoloaderInit51eab5937a895c395b9c60a5d1817c08
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit51eab5937a895c395b9c60a5d1817c08', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit51eab5937a895c395b9c60a5d1817c08', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitafe4c3454dcbaeedd317313d9908d991::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit51eab5937a895c395b9c60a5d1817c08::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInitafe4c3454dcbaeedd317313d9908d991::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit51eab5937a895c395b9c60a5d1817c08::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequireafe4c3454dcbaeedd317313d9908d991($fileIdentifier, $file);
+            composerRequire51eab5937a895c395b9c60a5d1817c08($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991
  * @param string $file
  * @return void
  */
-function composerRequireafe4c3454dcbaeedd317313d9908d991($fileIdentifier, $file)
+function composerRequire51eab5937a895c395b9c60a5d1817c08($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitafe4c3454dcbaeedd317313d9908d991
+class ComposerStaticInit51eab5937a895c395b9c60a5d1817c08
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -3883,9 +3883,9 @@ class ComposerStaticInitafe4c3454dcbaeedd317313d9908d991
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitafe4c3454dcbaeedd317313d9908d991::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitafe4c3454dcbaeedd317313d9908d991::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitafe4c3454dcbaeedd317313d9908d991::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit51eab5937a895c395b9c60a5d1817c08::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit51eab5937a895c395b9c60a5d1817c08::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit51eab5937a895c395b9c60a5d1817c08::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/scoper-autoload.php

@@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
 if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
     spl_autoload_call('RectorPrefix20220506\AutoloadIncluder');
 }
-if (!class_exists('ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991', false) && !interface_exists('ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991', false) && !trait_exists('ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991', false)) {
-    spl_autoload_call('RectorPrefix20220506\ComposerAutoloaderInitafe4c3454dcbaeedd317313d9908d991');
+if (!class_exists('ComposerAutoloaderInit51eab5937a895c395b9c60a5d1817c08', false) && !interface_exists('ComposerAutoloaderInit51eab5937a895c395b9c60a5d1817c08', false) && !trait_exists('ComposerAutoloaderInit51eab5937a895c395b9c60a5d1817c08', false)) {
+    spl_autoload_call('RectorPrefix20220506\ComposerAutoloaderInit51eab5937a895c395b9c60a5d1817c08');
 }
 if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
     spl_autoload_call('RectorPrefix20220506\Helmich\TypoScriptParser\Parser\AST\Statement');
@@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
         return \RectorPrefix20220506\print_node(...func_get_args());
     }
 }
-if (!function_exists('composerRequireafe4c3454dcbaeedd317313d9908d991')) {
-    function composerRequireafe4c3454dcbaeedd317313d9908d991() {
-        return \RectorPrefix20220506\composerRequireafe4c3454dcbaeedd317313d9908d991(...func_get_args());
+if (!function_exists('composerRequire51eab5937a895c395b9c60a5d1817c08')) {
+    function composerRequire51eab5937a895c395b9c60a5d1817c08() {
+        return \RectorPrefix20220506\composerRequire51eab5937a895c395b9c60a5d1817c08(...func_get_args());
     }
 }
 if (!function_exists('scanPath')) {