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

Updated Rector to commit 4b34887e678f90e4d9a8b4838333091465c28dc7

Browse Source 
4b34887e67 [Php80] Handle crash parent default empty array/string param on AddParamBasedOnParentClassMethodRector (#4833)
This commit is contained in:
Tomas Votruba 2023-08-23 11:33:01 +00:00
parent 4878abddc8
commit ef0d7bee6c
5 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php
View File

@ -7,11 +7,15 @@ use PhpParser\Comment;
use PhpParser\Node;
use PhpParser\Node\ComplexType;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\ConstFetch;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Param;
use PhpParser\Node\Scalar\DNumber;
use PhpParser\Node\Scalar\LNumber;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Reflection\MethodReflection;
use Rector\Core\PhpParser\AstResolver;
@ -179,8 +183,7 @@ CODE_SAMPLE
}
$paramDefault = $parentClassMethodParam->default;
if ($paramDefault instanceof Expr) {
$printParamDefault = $this->betterStandardPrinter->print($paramDefault);
$paramDefault = new ConstFetch(new Name($printParamDefault));
$paramDefault = $this->resolveParamDefault($paramDefault);
}
$paramName = $this->nodeNameResolver->getName($parentClassMethodParam);
$paramType = $this->resolveParamType($parentClassMethodParam);
@ -192,6 +195,24 @@ CODE_SAMPLE
}
return $node;
}
private function resolveParamDefault(Expr $expr) : Expr
{
// re-create to avoid TokenStream error
$printParamDefault = $this->betterStandardPrinter->print($expr);
if ($printParamDefault === '[]') {
return new Array_([]);
}
if ($expr instanceof String_ && $expr->value === '') {
return new String_($expr->value);
}
if ($expr instanceof LNumber) {
return new LNumber($expr->value);
}
if ($expr instanceof DNumber) {
return new DNumber($expr->value);
}
return new ConstFetch(new Name($printParamDefault));
}
/**
* @return null|\PhpParser\Node\Identifier|\PhpParser\Node\Name|\PhpParser\Node\ComplexType
*/

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '4163578c36fff9b049f1a3da51570fc5f62e3794';
public const PACKAGE_VERSION = '4b34887e678f90e4d9a8b4838333091465c28dc7';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-23 13:06:25';
public const RELEASE_DATE = '2023-08-23 18:29:26';
/**
* @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 ComposerAutoloaderInit3ccb63c2c4fe825429895e1542809bdf::getLoader();
return ComposerAutoloaderInit0c1cbd1b21ce40fab1374c1cd52c00dd::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit3ccb63c2c4fe825429895e1542809bdf
class ComposerAutoloaderInit0c1cbd1b21ce40fab1374c1cd52c00dd
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit3ccb63c2c4fe825429895e1542809bdf
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit3ccb63c2c4fe825429895e1542809bdf', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0c1cbd1b21ce40fab1374c1cd52c00dd', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit3ccb63c2c4fe825429895e1542809bdf', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0c1cbd1b21ce40fab1374c1cd52c00dd', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit3ccb63c2c4fe825429895e1542809bdf::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit0c1cbd1b21ce40fab1374c1cd52c00dd::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit3ccb63c2c4fe825429895e1542809bdf::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit0c1cbd1b21ce40fab1374c1cd52c00dd::$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 ComposerStaticInit3ccb63c2c4fe825429895e1542809bdf
class ComposerStaticInit0c1cbd1b21ce40fab1374c1cd52c00dd
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2610,9 +2610,9 @@ class ComposerStaticInit3ccb63c2c4fe825429895e1542809bdf
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit3ccb63c2c4fe825429895e1542809bdf::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit3ccb63c2c4fe825429895e1542809bdf::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit3ccb63c2c4fe825429895e1542809bdf::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit0c1cbd1b21ce40fab1374c1cd52c00dd::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0c1cbd1b21ce40fab1374c1cd52c00dd::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0c1cbd1b21ce40fab1374c1cd52c00dd::$classMap;
}, null, ClassLoader::class);
}