From b32a8b1d6d26664fc009d0288f14dcc4a98c2065 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 18 Oct 2021 13:12:30 +0000 Subject: [PATCH] Updated Rector to commit 34b254affb2faa6152d9db717803320b9916082d https://github.com/rectorphp/rector-src/commit/34b254affb2faa6152d9db717803320b9916082d [Php73] Handle named argument on JsonThrowOnErrorRector (#1021) --- .../Rector/FuncCall/JsonThrowOnErrorRector.php | 7 +++++++ src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php b/rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php index da6499525a8..6cf820669a6 100644 --- a/rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php +++ b/rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php @@ -7,6 +7,7 @@ use PhpParser\Node; use PhpParser\Node\Arg; use PhpParser\Node\Expr\ConstFetch; use PhpParser\Node\Expr\FuncCall; +use PhpParser\Node\Identifier; use PhpParser\Node\Name; use PhpParser\Node\Scalar\LNumber; use Rector\Core\Rector\AbstractRector; @@ -65,6 +66,12 @@ CODE_SAMPLE if (!$this->isNames($funcCall, ['json_encode', 'json_decode'])) { return \true; } + $args = $funcCall->getArgs(); + foreach ($args as $arg) { + if ($arg->name instanceof \PhpParser\Node\Identifier) { + return \true; + } + } return (bool) $this->betterNodeFinder->findFirstNext($funcCall, function (\PhpParser\Node $node) : bool { if (!$node instanceof \PhpParser\Node\Expr\FuncCall) { return \false; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 8a04e546cb0..6b14224136a 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '33e5cab8d53facaa6753fc26b755e9ce3634d940'; + public const PACKAGE_VERSION = '34b254affb2faa6152d9db717803320b9916082d'; /** * @var string */ - public const RELEASE_DATE = '2021-10-18 10:39:54'; + public const RELEASE_DATE = '2021-10-18 14:57:23'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20211018\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index 5d8aa1cf23b..f3279dca0b8 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007::getLoader(); +return ComposerAutoloaderInit8a23179ad92d10336d9c6116b2605abf::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 1387889cd78..165bef0125f 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007 +class ComposerAutoloaderInit8a23179ad92d10336d9c6116b2605abf { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit8a23179ad92d10336d9c6116b2605abf', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit8a23179ad92d10336d9c6116b2605abf', '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\ComposerStaticInitfd06aadafc6e46d4e7c267c66d867007::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit8a23179ad92d10336d9c6116b2605abf::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitfd06aadafc6e46d4e7c267c66d867007::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit8a23179ad92d10336d9c6116b2605abf::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirefd06aadafc6e46d4e7c267c66d867007($fileIdentifier, $file); + composerRequire8a23179ad92d10336d9c6116b2605abf($fileIdentifier, $file); } return $loader; } } -function composerRequirefd06aadafc6e46d4e7c267c66d867007($fileIdentifier, $file) +function composerRequire8a23179ad92d10336d9c6116b2605abf($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 d9ada13d638..f4c84b2242a 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitfd06aadafc6e46d4e7c267c66d867007 +class ComposerStaticInit8a23179ad92d10336d9c6116b2605abf { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3894,9 +3894,9 @@ class ComposerStaticInitfd06aadafc6e46d4e7c267c66d867007 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitfd06aadafc6e46d4e7c267c66d867007::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitfd06aadafc6e46d4e7c267c66d867007::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitfd06aadafc6e46d4e7c267c66d867007::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit8a23179ad92d10336d9c6116b2605abf::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit8a23179ad92d10336d9c6116b2605abf::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit8a23179ad92d10336d9c6116b2605abf::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index be1406c2875..3eed050ab89 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('RectorPrefix20211018\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007', false) && !interface_exists('ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007', false) && !trait_exists('ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007', false)) { - spl_autoload_call('RectorPrefix20211018\ComposerAutoloaderInitfd06aadafc6e46d4e7c267c66d867007'); +if (!class_exists('ComposerAutoloaderInit8a23179ad92d10336d9c6116b2605abf', false) && !interface_exists('ComposerAutoloaderInit8a23179ad92d10336d9c6116b2605abf', false) && !trait_exists('ComposerAutoloaderInit8a23179ad92d10336d9c6116b2605abf', false)) { + spl_autoload_call('RectorPrefix20211018\ComposerAutoloaderInit8a23179ad92d10336d9c6116b2605abf'); } if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) { spl_autoload_call('RectorPrefix20211018\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20211018\print_node(...func_get_args()); } } -if (!function_exists('composerRequirefd06aadafc6e46d4e7c267c66d867007')) { - function composerRequirefd06aadafc6e46d4e7c267c66d867007() { - return \RectorPrefix20211018\composerRequirefd06aadafc6e46d4e7c267c66d867007(...func_get_args()); +if (!function_exists('composerRequire8a23179ad92d10336d9c6116b2605abf')) { + function composerRequire8a23179ad92d10336d9c6116b2605abf() { + return \RectorPrefix20211018\composerRequire8a23179ad92d10336d9c6116b2605abf(...func_get_args()); } } if (!function_exists('parseArgs')) {