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

Updated Rector to commit 3bda987e53

Browse Source 
3bda987e53 fix intersection type with single type (#1086)
This commit is contained in:
Tomas Votruba 2021-10-27 13:57:53 +00:00
parent f76af951dc
commit e76ecdb78b
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php
View File

@ -52,7 +52,8 @@ final class NormalizeTypeToRespectArrayScalarType
unset($types[$key]);
}
}
return new \PHPStan\Type\ArrayType($arrayType->getKeyType(), new \PHPStan\Type\IntersectionType($types));
$arrayItemType = \count($types) === 1 ? $types[0] : new \PHPStan\Type\IntersectionType($types);
return new \PHPStan\Type\ArrayType($arrayType->getKeyType(), $arrayItemType);
}
private function normalizeUnionType(\PHPStan\Type\UnionType $unionType) : \PHPStan\Type\UnionType
{

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'adff54933e8bd08957ae3b6b5d23a036081f0870';
public const PACKAGE_VERSION = '3bda987e53dad19b5f5ae3db86a06f6c8ae5ded4';
/**
* @var string
*/
public const RELEASE_DATE = '2021-10-27 15:29:53';
public const RELEASE_DATE = '2021-10-27 15:44:28';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211027\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 ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff::getLoader();
return ComposerAutoloaderInit473053f9a31283db9e1761562ddc3dc4::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff
class ComposerAutoloaderInit473053f9a31283db9e1761562ddc3dc4
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit473053f9a31283db9e1761562ddc3dc4', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit473053f9a31283db9e1761562ddc3dc4', '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\ComposerStaticInit26e0106e4df27ffb3aea78132ad318ff::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit473053f9a31283db9e1761562ddc3dc4::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit26e0106e4df27ffb3aea78132ad318ff::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit473053f9a31283db9e1761562ddc3dc4::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire26e0106e4df27ffb3aea78132ad318ff($fileIdentifier, $file);
composerRequire473053f9a31283db9e1761562ddc3dc4($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire26e0106e4df27ffb3aea78132ad318ff($fileIdentifier, $file)
function composerRequire473053f9a31283db9e1761562ddc3dc4($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 ComposerStaticInit26e0106e4df27ffb3aea78132ad318ff
class ComposerStaticInit473053f9a31283db9e1761562ddc3dc4
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3892,9 +3892,9 @@ class ComposerStaticInit26e0106e4df27ffb3aea78132ad318ff
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit26e0106e4df27ffb3aea78132ad318ff::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit26e0106e4df27ffb3aea78132ad318ff::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit26e0106e4df27ffb3aea78132ad318ff::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit473053f9a31283db9e1761562ddc3dc4::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit473053f9a31283db9e1761562ddc3dc4::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit473053f9a31283db9e1761562ddc3dc4::$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('RectorPrefix20211027\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff', false) && !interface_exists('ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff', false) && !trait_exists('ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff', false)) {
spl_autoload_call('RectorPrefix20211027\ComposerAutoloaderInit26e0106e4df27ffb3aea78132ad318ff');
if (!class_exists('ComposerAutoloaderInit473053f9a31283db9e1761562ddc3dc4', false) && !interface_exists('ComposerAutoloaderInit473053f9a31283db9e1761562ddc3dc4', false) && !trait_exists('ComposerAutoloaderInit473053f9a31283db9e1761562ddc3dc4', false)) {
spl_autoload_call('RectorPrefix20211027\ComposerAutoloaderInit473053f9a31283db9e1761562ddc3dc4');
}
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('RectorPrefix20211027\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211027\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire26e0106e4df27ffb3aea78132ad318ff')) {
function composerRequire26e0106e4df27ffb3aea78132ad318ff() {
return \RectorPrefix20211027\composerRequire26e0106e4df27ffb3aea78132ad318ff(...func_get_args());
if (!function_exists('composerRequire473053f9a31283db9e1761562ddc3dc4')) {
function composerRequire473053f9a31283db9e1761562ddc3dc4() {
return \RectorPrefix20211027\composerRequire473053f9a31283db9e1761562ddc3dc4(...func_get_args());
}
}
if (!function_exists('parseArgs')) {