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 81f3299a0d1a50b0d4c7a0d8b56c5677491fb1f8

Browse Source 
81f3299a0d Add BinaryOpAnalyzer locally
This commit is contained in:
Tomas Votruba 2022-08-07 08:40:30 +00:00
parent eb23cc5b15
commit 966de41565
8 changed files with 90 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rules/Php80/Rector/Identical/StrEndsWithRector.php
View File

@ -15,9 +15,9 @@ use PhpParser\Node\Expr\UnaryMinus;
use PhpParser\Node\Scalar\LNumber;
use PhpParser\Node\Scalar\String_;
use Rector\Core\NodeAnalyzer\ArgsAnalyzer;
use Rector\Core\NodeAnalyzer\BinaryOpAnalyzer;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\Nette\NodeAnalyzer\BinaryOpAnalyzer;
use Rector\Nette\ValueObject\FuncCallAndExpr;
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@ -31,7 +31,7 @@ final class StrEndsWithRector extends AbstractRector implements MinPhpVersionInt
{
/**
* @readonly
* @var \Rector\Nette\NodeAnalyzer\BinaryOpAnalyzer
* @var \Rector\Core\NodeAnalyzer\BinaryOpAnalyzer
*/
private $binaryOpAnalyzer;
/**

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '86682e4848dcfaecdb6dac7d07ffcb4cd47e69bf';
public const PACKAGE_VERSION = '81f3299a0d1a50b0d4c7a0d8b56c5677491fb1f8';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-08-06 21:47:35';
public const RELEASE_DATE = '2022-08-07 10:35:16';
/**
* @var int
*/

37
src/NodeAnalyzer/BinaryOpAnalyzer.php Normal file
View File

@ -0,0 +1,37 @@
<?php
declare (strict_types=1);
namespace Rector\Core\NodeAnalyzer;
use PhpParser\Node\Expr\BinaryOp;
use PhpParser\Node\Expr\FuncCall;
use Rector\Core\ValueObject\FuncCallAndExpr;
use Rector\NodeNameResolver\NodeNameResolver;
final class BinaryOpAnalyzer
{
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
public function __construct(NodeNameResolver $nodeNameResolver)
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function matchFuncCallAndOtherExpr(BinaryOp $binaryOp, string $funcCallName) : ?FuncCallAndExpr
{
if ($binaryOp->left instanceof FuncCall) {
if (!$this->nodeNameResolver->isName($binaryOp->left, $funcCallName)) {
return null;
}
return new FuncCallAndExpr($binaryOp->left, $binaryOp->right);
}
if ($binaryOp->right instanceof FuncCall) {
if (!$this->nodeNameResolver->isName($binaryOp->right, $funcCallName)) {
return null;
}
return new FuncCallAndExpr($binaryOp->right, $binaryOp->left);
}
return null;
}
}

33
src/ValueObject/FuncCallAndExpr.php Normal file
View File

@ -0,0 +1,33 @@
<?php
declare (strict_types=1);
namespace Rector\Core\ValueObject;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\FuncCall;
final class FuncCallAndExpr
{
/**
* @readonly
* @var \PhpParser\Node\Expr\FuncCall
*/
private $funcCall;
/**
* @readonly
* @var \PhpParser\Node\Expr
*/
private $expr;
public function __construct(FuncCall $funcCall, Expr $expr)
{
$this->funcCall = $funcCall;
$this->expr = $expr;
}
public function getFuncCall() : FuncCall
{
return $this->funcCall;
}
public function getExpr() : Expr
{
return $this->expr;
}
}

2
vendor/autoload.php vendored
View File

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

2
vendor/composer/autoload_classmap.php vendored
View File

@ -1554,6 +1554,7 @@ return array(
'Rector\\Core\\Kernel\\RectorKernel' => $baseDir . '/src/Kernel/RectorKernel.php',
'Rector\\Core\\Logging\\CurrentRectorProvider' => $baseDir . '/src/Logging/CurrentRectorProvider.php',
'Rector\\Core\\NodeAnalyzer\\ArgsAnalyzer' => $baseDir . '/src/NodeAnalyzer/ArgsAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\BinaryOpAnalyzer' => $baseDir . '/src/NodeAnalyzer/BinaryOpAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\CallAnalyzer' => $baseDir . '/src/NodeAnalyzer/CallAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\ClassAnalyzer' => $baseDir . '/src/NodeAnalyzer/ClassAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\CoalesceAnalyzer' => $baseDir . '/src/NodeAnalyzer/CoalesceAnalyzer.php',
@ -1652,6 +1653,7 @@ return array(
'Rector\\Core\\ValueObject\\Bootstrap\\BootstrapConfigs' => $baseDir . '/src/ValueObject/Bootstrap/BootstrapConfigs.php',
'Rector\\Core\\ValueObject\\Configuration' => $baseDir . '/src/ValueObject/Configuration.php',
'Rector\\Core\\ValueObject\\Error\\SystemError' => $baseDir . '/src/ValueObject/Error/SystemError.php',
'Rector\\Core\\ValueObject\\FuncCallAndExpr' => $baseDir . '/src/ValueObject/FuncCallAndExpr.php',
'Rector\\Core\\ValueObject\\MethodName' => $baseDir . '/src/ValueObject/MethodName.php',
'Rector\\Core\\ValueObject\\PhpVersion' => $baseDir . '/src/ValueObject/PhpVersion.php',
'Rector\\Core\\ValueObject\\PhpVersionFeature' => $baseDir . '/src/ValueObject/PhpVersionFeature.php',

14
vendor/composer/autoload_real.php vendored
View File

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

10
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit05f6966bbd0efcd58412a246bfc79a7c
class ComposerStaticInit1863c32f22038906f632ac4bf6fa8eea
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -1861,6 +1861,7 @@ class ComposerStaticInit05f6966bbd0efcd58412a246bfc79a7c
'Rector\\Core\\Kernel\\RectorKernel' => __DIR__ . '/../..' . '/src/Kernel/RectorKernel.php',
'Rector\\Core\\Logging\\CurrentRectorProvider' => __DIR__ . '/../..' . '/src/Logging/CurrentRectorProvider.php',
'Rector\\Core\\NodeAnalyzer\\ArgsAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/ArgsAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\BinaryOpAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/BinaryOpAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\CallAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/CallAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\ClassAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/ClassAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\CoalesceAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/CoalesceAnalyzer.php',
@ -1959,6 +1960,7 @@ class ComposerStaticInit05f6966bbd0efcd58412a246bfc79a7c
'Rector\\Core\\ValueObject\\Bootstrap\\BootstrapConfigs' => __DIR__ . '/../..' . '/src/ValueObject/Bootstrap/BootstrapConfigs.php',
'Rector\\Core\\ValueObject\\Configuration' => __DIR__ . '/../..' . '/src/ValueObject/Configuration.php',
'Rector\\Core\\ValueObject\\Error\\SystemError' => __DIR__ . '/../..' . '/src/ValueObject/Error/SystemError.php',
'Rector\\Core\\ValueObject\\FuncCallAndExpr' => __DIR__ . '/../..' . '/src/ValueObject/FuncCallAndExpr.php',
'Rector\\Core\\ValueObject\\MethodName' => __DIR__ . '/../..' . '/src/ValueObject/MethodName.php',
'Rector\\Core\\ValueObject\\PhpVersion' => __DIR__ . '/../..' . '/src/ValueObject/PhpVersion.php',
'Rector\\Core\\ValueObject\\PhpVersionFeature' => __DIR__ . '/../..' . '/src/ValueObject/PhpVersionFeature.php',
@ -3384,9 +3386,9 @@ class ComposerStaticInit05f6966bbd0efcd58412a246bfc79a7c
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit05f6966bbd0efcd58412a246bfc79a7c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit05f6966bbd0efcd58412a246bfc79a7c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit05f6966bbd0efcd58412a246bfc79a7c::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit1863c32f22038906f632ac4bf6fa8eea::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1863c32f22038906f632ac4bf6fa8eea::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit1863c32f22038906f632ac4bf6fa8eea::$classMap;
}, null, ClassLoader::class);
}