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

Updated Rector to commit a467f764ec

Browse Source 
a467f764ec [DowngradePhp80] Add DowngradeThrowExprRector (#533)
This commit is contained in:
Tomas Votruba 2021-07-28 16:54:48 +00:00
parent f8f5156f46
commit 8e55ca0a2c
7 changed files with 138 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php Normal file
View File

@ -0,0 +1,117 @@
<?php
declare (strict_types=1);
namespace Rector\DowngradePhp80\Rector\Expression;
use PhpParser\Node;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\BinaryOp\Coalesce;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Expr\Isset_;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Expr\Throw_;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\If_;
use Rector\Core\NodeManipulator\IfManipulator;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* @changelog https://wiki.php.net/rfc/throw_expression
*
* @see \Rector\Tests\DowngradePhp80\Rector\Expression\DowngradeThrowExprRector\DowngradeThrowExprRectorTest
*/
final class DowngradeThrowExprRector extends \Rector\Core\Rector\AbstractRector
{
/**
* @var \Rector\Core\NodeManipulator\IfManipulator
*/
private $ifManipulator;
public function __construct(\Rector\Core\NodeManipulator\IfManipulator $ifManipulator)
{
$this->ifManipulator = $ifManipulator;
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Downgrade throw as expr', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'
class SomeClass
{
public function run()
{
$id = $somethingNonexistent ?? throw new RuntimeException();
}
}
CODE_SAMPLE
, <<<'CODE_SAMPLE'
class SomeClass
{
public function run()
{
if (!isset($somethingNonexistent)) {
throw new RuntimeException();
}
$id = $somethingNonexistent;
}
}
CODE_SAMPLE
)]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes() : array
{
return [\PhpParser\Node\Stmt\Expression::class];
}
/**
* @param Expression $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
if ($node->expr instanceof \PhpParser\Node\Expr\Throw_) {
return null;
}
if ($node->expr instanceof \PhpParser\Node\Expr\Assign) {
return $this->processAssign($node, $node->expr);
}
return $node;
}
/**
* @return \PhpParser\Node\Stmt\If_|\PhpParser\Node\Stmt\Expression|null
*/
private function processAssign(\PhpParser\Node\Stmt\Expression $expression, \PhpParser\Node\Expr\Assign $assign)
{
if (!$this->hasThrowInAssignExpr($assign)) {
return null;
}
if ($assign->expr instanceof \PhpParser\Node\Expr\BinaryOp\Coalesce) {
return $this->processCoalesce($assign, $assign->expr);
}
if ($assign->expr instanceof \PhpParser\Node\Expr\Throw_) {
return new \PhpParser\Node\Stmt\Expression($assign->expr);
}
return $expression;
}
private function processCoalesce(\PhpParser\Node\Expr\Assign $assign, \PhpParser\Node\Expr\BinaryOp\Coalesce $coalesce) : ?\PhpParser\Node\Stmt\If_
{
if (!$coalesce->right instanceof \PhpParser\Node\Expr\Throw_) {
return null;
}
if (!$coalesce->left instanceof \PhpParser\Node\Expr\Variable && !$coalesce->left instanceof \PhpParser\Node\Expr\PropertyFetch && !$coalesce->left instanceof \PhpParser\Node\Expr\StaticPropertyFetch) {
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));
$this->addNodeAfterNode(new \PhpParser\Node\Stmt\Expression($assign), $if);
return $if;
}
private function hasThrowInAssignExpr(\PhpParser\Node\Expr\Assign $assign) : bool
{
return (bool) $this->betterNodeFinder->findFirst($assign->expr, function (\PhpParser\Node $node) : bool {
return $node instanceof \PhpParser\Node\Expr\Throw_;
});
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '32ef12c2635d6c109d4b963ba4ea08e49d2b01c0';
public const PACKAGE_VERSION = 'a467f764ec34703a3dab0bd861775f16656b8ac8';
/**
* @var string
*/
public const RELEASE_DATE = '2021-07-28 18:34:40';
public const RELEASE_DATE = '2021-07-28 18:42:54';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210728\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 ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269::getLoader();
return ComposerAutoloaderInit5f5984635b44005fd2612b74457aaa39::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2169,6 +2169,7 @@ return array(
'Rector\\DowngradePhp80\\Rector\\Class_\\DowngradeAttributeToAnnotationRector' => $baseDir . '/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php',
'Rector\\DowngradePhp80\\Rector\\Class_\\DowngradePropertyPromotionRector' => $baseDir . '/rules/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector.php',
'Rector\\DowngradePhp80\\Rector\\Expression\\DowngradeMatchToSwitchRector' => $baseDir . '/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php',
'Rector\\DowngradePhp80\\Rector\\Expression\\DowngradeThrowExprRector' => $baseDir . '/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php',
'Rector\\DowngradePhp80\\Rector\\FuncCall\\DowngradeStrContainsRector' => $baseDir . '/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrContainsRector.php',
'Rector\\DowngradePhp80\\Rector\\FuncCall\\DowngradeStrEndsWithRector' => $baseDir . '/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector.php',
'Rector\\DowngradePhp80\\Rector\\FuncCall\\DowngradeStrStartsWithRector' => $baseDir . '/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector.php',

14
vendor/composer/autoload_real.php vendored
View File

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

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269
class ComposerStaticInit5f5984635b44005fd2612b74457aaa39
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -2524,6 +2524,7 @@ class ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269
'Rector\\DowngradePhp80\\Rector\\Class_\\DowngradeAttributeToAnnotationRector' => __DIR__ . '/../..' . '/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php',
'Rector\\DowngradePhp80\\Rector\\Class_\\DowngradePropertyPromotionRector' => __DIR__ . '/../..' . '/rules/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector.php',
'Rector\\DowngradePhp80\\Rector\\Expression\\DowngradeMatchToSwitchRector' => __DIR__ . '/../..' . '/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php',
'Rector\\DowngradePhp80\\Rector\\Expression\\DowngradeThrowExprRector' => __DIR__ . '/../..' . '/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php',
'Rector\\DowngradePhp80\\Rector\\FuncCall\\DowngradeStrContainsRector' => __DIR__ . '/../..' . '/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrContainsRector.php',
'Rector\\DowngradePhp80\\Rector\\FuncCall\\DowngradeStrEndsWithRector' => __DIR__ . '/../..' . '/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector.php',
'Rector\\DowngradePhp80\\Rector\\FuncCall\\DowngradeStrStartsWithRector' => __DIR__ . '/../..' . '/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector.php',
@ -3848,9 +3849,9 @@ class ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit5f5984635b44005fd2612b74457aaa39::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5f5984635b44005fd2612b74457aaa39::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5f5984635b44005fd2612b74457aaa39::$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('RectorPrefix20210728\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269', false) && !interface_exists('ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269', false) && !trait_exists('ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269', false)) {
spl_autoload_call('RectorPrefix20210728\ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269');
if (!class_exists('ComposerAutoloaderInit5f5984635b44005fd2612b74457aaa39', false) && !interface_exists('ComposerAutoloaderInit5f5984635b44005fd2612b74457aaa39', false) && !trait_exists('ComposerAutoloaderInit5f5984635b44005fd2612b74457aaa39', false)) {
spl_autoload_call('RectorPrefix20210728\ComposerAutoloaderInit5f5984635b44005fd2612b74457aaa39');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210728\Doctrine\Inflector\Inflector');
@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210728\print_node(...func_get_args());
}
}
if (!function_exists('composerRequirec121df7c8e2e2cd855dc7d10d13a9269')) {
function composerRequirec121df7c8e2e2cd855dc7d10d13a9269() {
return \RectorPrefix20210728\composerRequirec121df7c8e2e2cd855dc7d10d13a9269(...func_get_args());
if (!function_exists('composerRequire5f5984635b44005fd2612b74457aaa39')) {
function composerRequire5f5984635b44005fd2612b74457aaa39() {
return \RectorPrefix20210728\composerRequire5f5984635b44005fd2612b74457aaa39(...func_get_args());
}
}
if (!function_exists('parseArgs')) {