octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-29 15:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit bac8c0691d7eee55e38924b49d7fac64f61456d8

Browse Source 
bac8c0691d [CodeQuality] Mirror comment on ShortenElseIfRector (#3334)
This commit is contained in:
Tomas Votruba 2023-02-04 14:18:19 +00:00
parent 5c98e6b30d
commit 6f9bc2e5e6
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rules/CodeQuality/Rector/If_/ShortenElseIfRector.php
View File

@ -7,7 +7,10 @@ use PhpParser\Node;
use PhpParser\Node\Stmt\Else_;
use PhpParser\Node\Stmt\ElseIf_;
use PhpParser\Node\Stmt\If_;
use PhpParser\Node\Stmt\Nop;
use Rector\BetterPhpDocParser\Comment\CommentsMerger;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -15,6 +18,15 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
*/
final class ShortenElseIfRector extends AbstractRector
{
/**
* @readonly
* @var \Rector\BetterPhpDocParser\Comment\CommentsMerger
*/
private $commentsMerger;
public function __construct(CommentsMerger $commentsMerger)
{
$this->commentsMerger = $commentsMerger;
}
public function getRuleDefinition() : RuleDefinition
{
return new RuleDefinition('Shortens else/if to elseif', [new CodeSample(<<<'CODE_SAMPLE'
@ -79,6 +91,14 @@ CODE_SAMPLE
if ($refactored !== null) {
$if = $refactored;
}
if ($if->stmts === []) {
$nop = new Nop();
$nop->setAttribute(AttributeKey::COMMENTS, $if->getComments());
$if->stmts[] = $nop;
} else {
$currentStmt = \current($if->stmts);
$this->commentsMerger->keepChildren($currentStmt, $if);
}
$node->elseifs[] = new ElseIf_($if->cond, $if->stmts);
$node->else = $if->else;
$node->elseifs = \array_merge($node->elseifs, $if->elseifs);

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '2cf94e2631cb3c13505d44a7078ac91b236ab0ac';
public const PACKAGE_VERSION = 'bac8c0691d7eee55e38924b49d7fac64f61456d8';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-02-04 14:03:11';
public const RELEASE_DATE = '2023-02-04 14:12:44';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit1141438bb00731bea40e22ade94c0226
class ComposerStaticInit4195fc8dc351014e1f3049889bf8ea41
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3083,9 +3083,9 @@ class ComposerStaticInit1141438bb00731bea40e22ade94c0226
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit1141438bb00731bea40e22ade94c0226::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1141438bb00731bea40e22ade94c0226::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit1141438bb00731bea40e22ade94c0226::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit4195fc8dc351014e1f3049889bf8ea41::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit4195fc8dc351014e1f3049889bf8ea41::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit4195fc8dc351014e1f3049889bf8ea41::$classMap;
}, null, ClassLoader::class);
}