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

Updated Rector to commit 6424bae725296eb72307e5f4902715ea41dad3ba

Browse Source 
6424bae725 [TypeDeclaration] Using ClassMethodReturnTypeOverrideGuard on ReturnTypeFromStrictParamRector (#4878)
This commit is contained in:
Tomas Votruba 2023-08-29 16:52:48 +00:00
parent fc984ac23b
commit 97f92edab1
6 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php
View File

@ -136,7 +136,7 @@ final class ClassMethodReturnTypeOverrideGuard
$parentClassMethodReflection = $this->parentClassMethodTypeOverrideGuard->getParentClassMethod($classMethod);
// nothing to check
if (!$parentClassMethodReflection instanceof MethodReflection) {
return \true;
return !$this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($classMethod);
}
$parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($parentClassMethodReflection, $classMethod, $scope);
if ($parametersAcceptor instanceof FunctionVariantWithPhpDocs && !$parametersAcceptor->getNativeReturnType() instanceof MixedType) {

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

@ -24,7 +24,7 @@ use PHPStan\Type\UnionType;
use Rector\Core\Rector\AbstractScopeAwareRector;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard;
use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard;
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@ -35,17 +35,17 @@ final class ReturnTypeFromStrictParamRector extends AbstractScopeAwareRector imp
{
/**
* @readonly
* @var \Rector\VendorLocker\ParentClassMethodTypeOverrideGuard
* @var \Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard
*/
private $parentClassMethodTypeOverrideGuard;
private $classMethodReturnTypeOverrideGuard;
/**
* @readonly
* @var \Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer
*/
private $returnTypeInferer;
public function __construct(ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard, ReturnTypeInferer $returnTypeInferer)
public function __construct(ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard, ReturnTypeInferer $returnTypeInferer)
{
$this->parentClassMethodTypeOverrideGuard = $parentClassMethodTypeOverrideGuard;
$this->classMethodReturnTypeOverrideGuard = $classMethodReturnTypeOverrideGuard;
$this->returnTypeInferer = $returnTypeInferer;
}
public function getRuleDefinition() : RuleDefinition
@ -89,7 +89,7 @@ CODE_SAMPLE
if ($node->stmts === null) {
return null;
}
if ($this->shouldSkipNode($node)) {
if ($this->shouldSkipNode($node, $scope)) {
return null;
}
$return = $this->findCurrentScopeReturn($node->stmts);
@ -171,18 +171,13 @@ CODE_SAMPLE
/**
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure $node
*/
private function shouldSkipNode($node) : bool
private function shouldSkipNode($node, Scope $scope) : bool
{
if ($node->returnType !== null) {
return \true;
}
if ($node instanceof ClassMethod) {
if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node)) {
return \true;
}
if ($node->isMagic()) {
return \true;
}
if ($node instanceof ClassMethod && $this->classMethodReturnTypeOverrideGuard->shouldSkipClassMethod($node, $scope)) {
return \true;
}
$returnType = $this->returnTypeInferer->inferFunctionLike($node);
if ($returnType instanceof MixedType) {

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'ea2252a374c5ce46f6a19f93649aef43634ff997';
public const PACKAGE_VERSION = '6424bae725296eb72307e5f4902715ea41dad3ba';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-29 23:35:51';
public const RELEASE_DATE = '2023-08-29 23:50:04';
/**
* @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 ComposerAutoloaderInit897956a1577aae52550f42eea19fea3c::getLoader();
return ComposerAutoloaderInit21dbde0d9f3f9af9e1bd4144fa43d611::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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