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

Updated Rector to commit 12f380b343bc991d5b138206d68cd244d0aca776

Browse Source 
12f380b343 Add edge cases to skip (#2604)
This commit is contained in:
Tomas Votruba 2022-07-01 13:50:24 +00:00
parent 2524b7ef68
commit 84dff4485c
6 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rules/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php
View File

@ -79,6 +79,9 @@ CODE_SAMPLE
return null;
}
$returnTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($scalarReturnType, TypeKind::RETURN);
if (!$returnTypeNode instanceof Node) {
return null;
}
$node->returnType = $returnTypeNode;
return $node;
}

24
rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php
View File

@ -48,13 +48,8 @@ final class AlwaysStrictScalarExprAnalyzer
}
return null;
}
if ($expr instanceof FuncCall && $expr->name instanceof Name) {
$functionReflection = $this->reflectionProvider->getFunction($expr->name, null);
if (!$functionReflection instanceof NativeFunctionReflection) {
return null;
}
$parametersAcceptor = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants());
return $parametersAcceptor->getReturnType();
if ($expr instanceof FuncCall) {
return $this->resolveFuncCallType($expr);
}
return null;
}
@ -80,4 +75,19 @@ final class AlwaysStrictScalarExprAnalyzer
}
return null;
}
private function resolveFuncCallType(FuncCall $funcCall) : ?Type
{
if (!$funcCall->name instanceof Name) {
return null;
}
if (!$this->reflectionProvider->hasFunction($funcCall->name, null)) {
return null;
}
$functionReflection = $this->reflectionProvider->getFunction($funcCall->name, null);
if (!$functionReflection instanceof NativeFunctionReflection) {
return null;
}
$parametersAcceptor = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants());
return $parametersAcceptor->getReturnType();
}
}

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '89a7a4dfbb3e05a306c0f5b9950c28588d4f2af9';
public const PACKAGE_VERSION = '12f380b343bc991d5b138206d68cd244d0aca776';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-07-01 15:37:03';
public const RELEASE_DATE = '2022-07-01 13:44:45';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit9ec1e73f6a389993ebdd9f297324c601::getLoader();
return ComposerAutoloaderInitff1e44c833696380e46e3ef666f7b6ee::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit9ec1e73f6a389993ebdd9f297324c601
class ComposerAutoloaderInitff1e44c833696380e46e3ef666f7b6ee
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit9ec1e73f6a389993ebdd9f297324c601
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit9ec1e73f6a389993ebdd9f297324c601', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitff1e44c833696380e46e3ef666f7b6ee', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit9ec1e73f6a389993ebdd9f297324c601', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitff1e44c833696380e46e3ef666f7b6ee', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit9ec1e73f6a389993ebdd9f297324c601::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitff1e44c833696380e46e3ef666f7b6ee::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit9ec1e73f6a389993ebdd9f297324c601::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitff1e44c833696380e46e3ef666f7b6ee::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire9ec1e73f6a389993ebdd9f297324c601($fileIdentifier, $file);
composerRequireff1e44c833696380e46e3ef666f7b6ee($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit9ec1e73f6a389993ebdd9f297324c601
* @param string $file
* @return void
*/
function composerRequire9ec1e73f6a389993ebdd9f297324c601($fileIdentifier, $file)
function composerRequireff1e44c833696380e46e3ef666f7b6ee($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 ComposerStaticInit9ec1e73f6a389993ebdd9f297324c601
class ComposerStaticInitff1e44c833696380e46e3ef666f7b6ee
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3417,9 +3417,9 @@ class ComposerStaticInit9ec1e73f6a389993ebdd9f297324c601
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit9ec1e73f6a389993ebdd9f297324c601::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit9ec1e73f6a389993ebdd9f297324c601::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit9ec1e73f6a389993ebdd9f297324c601::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitff1e44c833696380e46e3ef666f7b6ee::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitff1e44c833696380e46e3ef666f7b6ee::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitff1e44c833696380e46e3ef666f7b6ee::$classMap;
}, null, ClassLoader::class);
}