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

Updated Rector to commit 405d9f8f9ccee80ee0d2d9c0704ef028238b38cd

Browse Source 
405d9f8f9c [Naming] Remove parent attribute usage on ExpectedNameResolver (#4180)
This commit is contained in:
Tomas Votruba 2023-06-11 10:16:46 +00:00
parent c718a1c775
commit 8ea0fec420
6 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rules/Naming/Naming/ExpectedNameResolver.php
View File

@ -19,8 +19,8 @@ use PHPStan\Type\ObjectType;
use PHPStan\Type\Type;
use Rector\Naming\ExpectedNameResolver\MatchParamTypeExpectedNameResolver;
use Rector\Naming\ValueObject\ExpectedName;
use Rector\Naming\ValueObject\VariableAndCallForeach;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
final class ExpectedNameResolver
@ -141,11 +141,9 @@ final class ExpectedNameResolver
}
return null;
}
/**
* @param \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Expr\FuncCall $expr
*/
public function resolveForForeach($expr) : ?string
public function resolveForForeach(VariableAndCallForeach $variableAndCallForeach) : ?string
{
$expr = $variableAndCallForeach->getCall();
if ($this->isDynamicNameCall($expr)) {
return null;
}
@ -159,7 +157,7 @@ final class ExpectedNameResolver
}
$innerReturnedType = null;
if ($returnedType instanceof ArrayType) {
$innerReturnedType = $this->resolveReturnTypeFromArrayType($expr, $returnedType);
$innerReturnedType = $this->resolveReturnTypeFromArrayType($returnedType);
if (!$innerReturnedType instanceof Type) {
return null;
}
@ -194,15 +192,8 @@ final class ExpectedNameResolver
}
return $expr->name instanceof FuncCall;
}
/**
* @param \PhpParser\Node\Expr\FuncCall|\PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall $expr
*/
private function resolveReturnTypeFromArrayType($expr, ArrayType $arrayType) : ?Type
private function resolveReturnTypeFromArrayType(ArrayType $arrayType) : ?Type
{
$parentNode = $expr->getAttribute(AttributeKey::PARENT_NODE);
if (!$parentNode instanceof Foreach_) {
return null;
}
if (!$arrayType->getItemType() instanceof ObjectType) {
return null;
}

2
rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php
View File

@ -96,7 +96,7 @@ CODE_SAMPLE
if (!$variableAndCallForeach instanceof VariableAndCallForeach) {
return null;
}
$expectedName = $this->expectedNameResolver->resolveForForeach($variableAndCallForeach->getCall());
$expectedName = $this->expectedNameResolver->resolveForForeach($variableAndCallForeach);
if ($expectedName === null) {
return null;
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'f7b43d4565fb27cf53c77a86bf7d4afd8f5a556f';
public const PACKAGE_VERSION = '405d9f8f9ccee80ee0d2d9c0704ef028238b38cd';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-11 16:32:09';
public const RELEASE_DATE = '2023-06-11 17:12:39';
/**
* @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 ComposerAutoloaderInit1b852f0e8d373a095568827d71f67799::getLoader();
return ComposerAutoloaderInite2344e7f695ffca0f67f4f7d8d961212::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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