diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php index de6ef8ecbcb..c361f7d7cce 100644 --- a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php +++ b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php @@ -10,6 +10,7 @@ use Rector\Core\NodeManipulator\IfManipulator; use Rector\Core\Rector\AbstractRector; use Rector\DeadCode\NodeManipulator\CountManipulator; use Rector\DeadCode\UselessIfCondBeforeForeachDetector; +use Rector\NodeTypeResolver\Node\AttributeKey; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; /** @@ -80,7 +81,12 @@ CODE_SAMPLE if (!$this->isUselessBeforeForeachCheck($node)) { return null; } - return $node->stmts[0]; + $stmt = $node->stmts[0]; + $ifComments = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::COMMENTS) ?? []; + $stmtComments = $stmt->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::COMMENTS) ?? []; + $comments = \array_merge($ifComments, $stmtComments); + $stmt->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::COMMENTS, $comments); + return $stmt; } private function isUselessBeforeForeachCheck(\PhpParser\Node\Stmt\If_ $if) : bool { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 6de3d89c212..22c7a11f22d 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = 'b64b1b26e0ed01f77e5afe5b018091990e31624a'; + public const PACKAGE_VERSION = '72df0f63c5015db2db86bf1b17a0d8393ad90911'; /** * @var string */ - public const RELEASE_DATE = '2021-08-07 13:32:14'; + public const RELEASE_DATE = '2021-08-07 13:32:36'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210807\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index 816d9e6f2e4..b13eaeca08c 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62::getLoader(); +return ComposerAutoloaderInit407e188b6cfd40b64ba27e8ffe8ed0d6::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 90cdb8abd78..7cb835c164a 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62 +class ComposerAutoloaderInit407e188b6cfd40b64ba27e8ffe8ed0d6 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit407e188b6cfd40b64ba27e8ffe8ed0d6', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit407e188b6cfd40b64ba27e8ffe8ed0d6', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit43b8a3e1d0b50832c9f040d5e5988b62::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit407e188b6cfd40b64ba27e8ffe8ed0d6::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit43b8a3e1d0b50832c9f040d5e5988b62::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit407e188b6cfd40b64ba27e8ffe8ed0d6::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire43b8a3e1d0b50832c9f040d5e5988b62($fileIdentifier, $file); + composerRequire407e188b6cfd40b64ba27e8ffe8ed0d6($fileIdentifier, $file); } return $loader; } } -function composerRequire43b8a3e1d0b50832c9f040d5e5988b62($fileIdentifier, $file) +function composerRequire407e188b6cfd40b64ba27e8ffe8ed0d6($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index e89e7b6820f..b9eb8895252 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit43b8a3e1d0b50832c9f040d5e5988b62 +class ComposerStaticInit407e188b6cfd40b64ba27e8ffe8ed0d6 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3846,9 +3846,9 @@ class ComposerStaticInit43b8a3e1d0b50832c9f040d5e5988b62 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit43b8a3e1d0b50832c9f040d5e5988b62::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit43b8a3e1d0b50832c9f040d5e5988b62::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit43b8a3e1d0b50832c9f040d5e5988b62::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit407e188b6cfd40b64ba27e8ffe8ed0d6::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit407e188b6cfd40b64ba27e8ffe8ed0d6::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit407e188b6cfd40b64ba27e8ffe8ed0d6::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 4f8adf82542..a5f8dbbc84e 100644 --- a/vendor/scoper-autoload.php +++ b/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('RectorPrefix20210807\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62', false) && !interface_exists('ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62', false) && !trait_exists('ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62', false)) { - spl_autoload_call('RectorPrefix20210807\ComposerAutoloaderInit43b8a3e1d0b50832c9f040d5e5988b62'); +if (!class_exists('ComposerAutoloaderInit407e188b6cfd40b64ba27e8ffe8ed0d6', false) && !interface_exists('ComposerAutoloaderInit407e188b6cfd40b64ba27e8ffe8ed0d6', false) && !trait_exists('ComposerAutoloaderInit407e188b6cfd40b64ba27e8ffe8ed0d6', false)) { + spl_autoload_call('RectorPrefix20210807\ComposerAutoloaderInit407e188b6cfd40b64ba27e8ffe8ed0d6'); } if (!class_exists('AjaxLogin', false) && !interface_exists('AjaxLogin', false) && !trait_exists('AjaxLogin', false)) { spl_autoload_call('RectorPrefix20210807\AjaxLogin'); @@ -3305,9 +3305,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210807\print_node(...func_get_args()); } } -if (!function_exists('composerRequire43b8a3e1d0b50832c9f040d5e5988b62')) { - function composerRequire43b8a3e1d0b50832c9f040d5e5988b62() { - return \RectorPrefix20210807\composerRequire43b8a3e1d0b50832c9f040d5e5988b62(...func_get_args()); +if (!function_exists('composerRequire407e188b6cfd40b64ba27e8ffe8ed0d6')) { + function composerRequire407e188b6cfd40b64ba27e8ffe8ed0d6() { + return \RectorPrefix20210807\composerRequire407e188b6cfd40b64ba27e8ffe8ed0d6(...func_get_args()); } } if (!function_exists('parseArgs')) {