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

Updated Rector to commit 7cdd03ed77

Browse Source 
7cdd03ed77 [PHP 8.1] Fix IntersectionTypesRector for non-object types (#1495)
This commit is contained in:
Tomas Votruba 2021-12-14 14:39:36 +00:00
parent e04672ace0
commit a440c65f29
6 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rules/Php81/Rector/FunctionLike/IntersectionTypesRector.php
View File

@ -9,6 +9,7 @@ use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PHPStan\Type\IntersectionType;
use PHPStan\Type\TypeWithClassName;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\PhpVersionFeature;
@ -91,6 +92,9 @@ CODE_SAMPLE
if (!$paramType instanceof \PHPStan\Type\IntersectionType) {
continue;
}
if (!$this->isIntersectionableType($paramType)) {
continue;
}
$phpParserIntersectionType = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($paramType, \Rector\PHPStanStaticTypeMapper\Enum\TypeKind::PARAM());
if (!$phpParserIntersectionType instanceof \PhpParser\Node\IntersectionType) {
continue;
@ -99,4 +103,17 @@ CODE_SAMPLE
$this->hasChanged = \true;
}
}
/**
* Only class-type are supported https://wiki.php.net/rfc/pure-intersection-types#supported_types
*/
private function isIntersectionableType(\PHPStan\Type\IntersectionType $intersectionType) : bool
{
foreach ($intersectionType->getTypes() as $intersectionedType) {
if ($intersectionedType instanceof \PHPStan\Type\TypeWithClassName) {
continue;
}
return \false;
}
return \true;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '0127d15e07d0db0ef98d230929984c2991dfde22';
public const PACKAGE_VERSION = '7cdd03ed7733e2d8d12d68e5750a89b7f0dda829';
/**
* @var string
*/
public const RELEASE_DATE = '2021-12-14 13:30:51';
public const RELEASE_DATE = '2021-12-14 14:22:38';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211214\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc::getLoader();
return ComposerAutoloaderInitcbee6bf1ebafa9718d4919e8805e81a1::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc
class ComposerAutoloaderInitcbee6bf1ebafa9718d4919e8805e81a1
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitcbee6bf1ebafa9718d4919e8805e81a1', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitcbee6bf1ebafa9718d4919e8805e81a1', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit2e15af082b745b00e83c5e00abbf7efc::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitcbee6bf1ebafa9718d4919e8805e81a1::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit2e15af082b745b00e83c5e00abbf7efc::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitcbee6bf1ebafa9718d4919e8805e81a1::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire2e15af082b745b00e83c5e00abbf7efc($fileIdentifier, $file);
composerRequirecbee6bf1ebafa9718d4919e8805e81a1($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire2e15af082b745b00e83c5e00abbf7efc($fileIdentifier, $file)
function composerRequirecbee6bf1ebafa9718d4919e8805e81a1($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit2e15af082b745b00e83c5e00abbf7efc
class ComposerStaticInitcbee6bf1ebafa9718d4919e8805e81a1
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3823,9 +3823,9 @@ class ComposerStaticInit2e15af082b745b00e83c5e00abbf7efc
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit2e15af082b745b00e83c5e00abbf7efc::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit2e15af082b745b00e83c5e00abbf7efc::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit2e15af082b745b00e83c5e00abbf7efc::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitcbee6bf1ebafa9718d4919e8805e81a1::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitcbee6bf1ebafa9718d4919e8805e81a1::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitcbee6bf1ebafa9718d4919e8805e81a1::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211214\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc', false) && !interface_exists('ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc', false) && !trait_exists('ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc', false)) {
spl_autoload_call('RectorPrefix20211214\ComposerAutoloaderInit2e15af082b745b00e83c5e00abbf7efc');
if (!class_exists('ComposerAutoloaderInitcbee6bf1ebafa9718d4919e8805e81a1', false) && !interface_exists('ComposerAutoloaderInitcbee6bf1ebafa9718d4919e8805e81a1', false) && !trait_exists('ComposerAutoloaderInitcbee6bf1ebafa9718d4919e8805e81a1', false)) {
spl_autoload_call('RectorPrefix20211214\ComposerAutoloaderInitcbee6bf1ebafa9718d4919e8805e81a1');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20211214\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -78,9 +78,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211214\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire2e15af082b745b00e83c5e00abbf7efc')) {
function composerRequire2e15af082b745b00e83c5e00abbf7efc() {
return \RectorPrefix20211214\composerRequire2e15af082b745b00e83c5e00abbf7efc(...func_get_args());
if (!function_exists('composerRequirecbee6bf1ebafa9718d4919e8805e81a1')) {
function composerRequirecbee6bf1ebafa9718d4919e8805e81a1() {
return \RectorPrefix20211214\composerRequirecbee6bf1ebafa9718d4919e8805e81a1(...func_get_args());
}
}
if (!function_exists('scanPath')) {