mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-03-22 08:19:50 +01:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit 92b6e3a6d1e9a4289b5347e52f1cf379a68d74b4

Browse Source 
92b6e3a6d1 [TypeDeclaration] Use return bool for ParentClassMethodTypeOverrideGuard::hasParentClassMethod(), return ?MethodReflection for ParentClassMethodTypeOverrideGuard::getParentClassMethod() (#4703)
This commit is contained in:
Tomas Votruba 2023-08-07 13:20:45 +00:00
parent dd899d3abb
commit f4aa905f07
11 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php
View File

@ -7,7 +7,6 @@ use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Type\Type;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use Rector\NodeNameResolver\NodeNameResolver;
@ -49,14 +48,15 @@ final class ParentClassMethodTypeOverrideGuard
$this->staticTypeMapper = $staticTypeMapper;
$this->privatesAccessor = $privatesAccessor;
}
public function hasParentClassMethod(ClassMethod $classMethod) : ?bool
public function hasParentClassMethod(ClassMethod $classMethod) : bool
{
try {
$parentClassMethod = $this->resolveParentClassMethod($classMethod);
return $parentClassMethod instanceof MethodReflection;
} catch (UnresolvableClassException $exception) {
// we don't know all involved parents.
return null;
// we don't know all involved parents,
// marking as parent exists which usually means the method is guarded against overrides.
return \true;
}
}
public function getParentClassMethod(ClassMethod $classMethod) : ?MethodReflection
@ -64,8 +64,7 @@ final class ParentClassMethodTypeOverrideGuard
try {
return $this->resolveParentClassMethod($classMethod);
} catch (UnresolvableClassException $exception) {
// we don't know all involved parents.
throw new ShouldNotHappenException('Unable to resolve involved class. You are likely missing hasParentClassMethod() before calling getParentClassMethod().');
return null;
}
}
public function shouldSkipReturnTypeChange(ClassMethod $classMethod, Type $parentType) : bool

2
rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromPropertyTypeRector.php
View File

@ -121,7 +121,7 @@ CODE_SAMPLE
if (!$paramType instanceof Node) {
continue;
}
if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node) !== \false) {
if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node)) {
return null;
}
$param->type = $paramType;

2
rules/TypeDeclaration/Rector/ClassMethod/ParamTypeByMethodCallTypeRector.php
View File

@ -135,7 +135,7 @@ CODE_SAMPLE
if ($classMethod->params === []) {
return \true;
}
return $this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($classMethod) !== \false;
return $this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($classMethod);
}
/**
* @param \PhpParser\Node\Identifier|\PhpParser\Node\Name|\PhpParser\Node\NullableType|\PhpParser\Node\UnionType|\PhpParser\Node\ComplexType $paramType

2
rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector.php
View File

@ -177,7 +177,7 @@ CODE_SAMPLE
return \true;
}
if ($node instanceof ClassMethod) {
if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node) !== \false) {
if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node)) {
return \true;
}
if ($node->isMagic()) {

2
rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php
View File

@ -70,7 +70,7 @@ CODE_SAMPLE
public function refactor(Node $node) : ?Node
{
$hasChanged = \false;
if ($node instanceof ClassMethod && $this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node) !== \false) {
if ($node instanceof ClassMethod && $this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node)) {
return null;
}
foreach ($node->getParams() as $param) {

2
rules/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector.php
View File

@ -71,7 +71,7 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
if ($node instanceof ClassMethod && $this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node) !== \false) {
if ($node instanceof ClassMethod && $this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node)) {
return null;
}
$hasChanged = \false;

2
rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php
View File

@ -108,7 +108,7 @@ CODE_SAMPLE
if ($classMethod->isAbstract()) {
return null;
}
if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($classMethod) !== \false) {
if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($classMethod)) {
return null;
}
$originalParamType = $this->resolveParamOriginalType($param, $scope);

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '41a4d2456cde167c50c628f62aa5587689c0a8b5';
public const PACKAGE_VERSION = '92b6e3a6d1e9a4289b5347e52f1cf379a68d74b4';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-07 13:01:37';
public const RELEASE_DATE = '2023-08-07 13:16:17';
/**
* @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 ComposerAutoloaderInitbaa316b255ef95eb936dbd87b6717275::getLoader();
return ComposerAutoloaderInit07f692a9b7f057489054a15eec63fa36::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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