octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-03 18:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 5ad522ddaa

Browse Source 
5ad522ddaa [DowngradePhp80] Handle coalesce and truthy ternary directly without assign (#567)
This commit is contained in:
Tomas Votruba 2021-08-01 16:58:17 +00:00
parent a6fffa8856
commit 139baa203b
6 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php
View File

@ -87,6 +87,12 @@ CODE_SAMPLE
if ($node->expr instanceof \PhpParser\Node\Expr\Assign) {
return $this->processAssign($node, $node->expr);
}
if ($node->expr instanceof \PhpParser\Node\Expr\BinaryOp\Coalesce) {
return $this->processCoalesce($node->expr, null);
}
if ($node->expr instanceof \PhpParser\Node\Expr\Ternary) {
return $this->processTernary($node->expr, null);
}
return $node;
}
/**
@ -98,17 +104,17 @@ CODE_SAMPLE
return null;
}
if ($assign->expr instanceof \PhpParser\Node\Expr\BinaryOp\Coalesce) {
return $this->processCoalesce($assign, $assign->expr);
return $this->processCoalesce($assign->expr, $assign);
}
if ($assign->expr instanceof \PhpParser\Node\Expr\Throw_) {
return new \PhpParser\Node\Stmt\Expression($assign->expr);
}
if ($assign->expr instanceof \PhpParser\Node\Expr\Ternary) {
return $this->processTernary($assign, $assign->expr);
return $this->processTernary($assign->expr, $assign);
}
return $expression;
}
private function processTernary(\PhpParser\Node\Expr\Assign $assign, \PhpParser\Node\Expr\Ternary $ternary) : ?\PhpParser\Node\Stmt\If_
private function processTernary(\PhpParser\Node\Expr\Ternary $ternary, ?\PhpParser\Node\Expr\Assign $assign) : ?\PhpParser\Node\Stmt\If_
{
if (!$ternary->else instanceof \PhpParser\Node\Expr\Throw_) {
return null;
@ -118,11 +124,14 @@ CODE_SAMPLE
return null;
}
$if = $this->ifManipulator->createIfExpr($inversedTernaryCond, new \PhpParser\Node\Stmt\Expression($ternary->else));
if (!$assign instanceof \PhpParser\Node\Expr\Assign) {
return $if;
}
$assign->expr = $ternary->if === null ? $ternary->cond : $ternary->if;
$this->addNodeAfterNode(new \PhpParser\Node\Stmt\Expression($assign), $if);
return $if;
}
private function processCoalesce(\PhpParser\Node\Expr\Assign $assign, \PhpParser\Node\Expr\BinaryOp\Coalesce $coalesce) : ?\PhpParser\Node\Stmt\If_
private function processCoalesce(\PhpParser\Node\Expr\BinaryOp\Coalesce $coalesce, ?\PhpParser\Node\Expr\Assign $assign) : ?\PhpParser\Node\Stmt\If_
{
if (!$coalesce->right instanceof \PhpParser\Node\Expr\Throw_) {
return null;
@ -131,8 +140,11 @@ CODE_SAMPLE
return null;
}
$booleanNot = new \PhpParser\Node\Expr\BooleanNot(new \PhpParser\Node\Expr\Isset_([$coalesce->left]));
$assign->expr = $coalesce->left;
$if = $this->ifManipulator->createIfExpr($booleanNot, new \PhpParser\Node\Stmt\Expression($coalesce->right));
if (!$assign instanceof \PhpParser\Node\Expr\Assign) {
return $if;
}
$assign->expr = $coalesce->left;
$this->addNodeAfterNode(new \PhpParser\Node\Stmt\Expression($assign), $if);
return $if;
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '5607f90669f9414d042673b7d35070c848f89a5f';
public const PACKAGE_VERSION = '5ad522ddaa3cecb343da84fd2184ef6ed24f1e60';
/**
* @var string
*/
public const RELEASE_DATE = '2021-08-01 18:45:08';
public const RELEASE_DATE = '2021-08-01 18:46:52';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210801\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2::getLoader();
return ComposerAutoloaderInit7eb8d6a73ea613b143f2738aa31f3d47::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2
class ComposerAutoloaderInit7eb8d6a73ea613b143f2738aa31f3d47
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit7eb8d6a73ea613b143f2738aa31f3d47', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit7eb8d6a73ea613b143f2738aa31f3d47', '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\ComposerStaticInit8121c2ffa92640756a15529865208ec2::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit7eb8d6a73ea613b143f2738aa31f3d47::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit8121c2ffa92640756a15529865208ec2::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit7eb8d6a73ea613b143f2738aa31f3d47::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire8121c2ffa92640756a15529865208ec2($fileIdentifier, $file);
composerRequire7eb8d6a73ea613b143f2738aa31f3d47($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire8121c2ffa92640756a15529865208ec2($fileIdentifier, $file)
function composerRequire7eb8d6a73ea613b143f2738aa31f3d47($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

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

10
vendor/scoper-autoload.php vendored
View File

@ -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('RectorPrefix20210801\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2', false) && !interface_exists('ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2', false) && !trait_exists('ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2', false)) {
spl_autoload_call('RectorPrefix20210801\ComposerAutoloaderInit8121c2ffa92640756a15529865208ec2');
if (!class_exists('ComposerAutoloaderInit7eb8d6a73ea613b143f2738aa31f3d47', false) && !interface_exists('ComposerAutoloaderInit7eb8d6a73ea613b143f2738aa31f3d47', false) && !trait_exists('ComposerAutoloaderInit7eb8d6a73ea613b143f2738aa31f3d47', false)) {
spl_autoload_call('RectorPrefix20210801\ComposerAutoloaderInit7eb8d6a73ea613b143f2738aa31f3d47');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210801\Doctrine\Inflector\Inflector');
@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210801\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire8121c2ffa92640756a15529865208ec2')) {
function composerRequire8121c2ffa92640756a15529865208ec2() {
return \RectorPrefix20210801\composerRequire8121c2ffa92640756a15529865208ec2(...func_get_args());
if (!function_exists('composerRequire7eb8d6a73ea613b143f2738aa31f3d47')) {
function composerRequire7eb8d6a73ea613b143f2738aa31f3d47() {
return \RectorPrefix20210801\composerRequire7eb8d6a73ea613b143f2738aa31f3d47(...func_get_args());
}
}
if (!function_exists('parseArgs')) {