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

Updated Rector to commit 0f22f0c55f3993933486e4472ac2bf400fa43bb7

Browse Source 
0f22f0c55f Fix AddClosureReturnTypeRector for union types of mutually related classes (#1983)
This commit is contained in:
Tomas Votruba 2022-03-31 18:16:59 +00:00
parent 3ff16a724b
commit 79340ccaa4
6 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
View File

@ -305,10 +305,7 @@ final class UnionTypeMapper implements \Rector\PHPStanStaticTypeMapper\Contract\
}
private function areTypeWithClassNamesRelated(\PHPStan\Type\TypeWithClassName $firstType, \PHPStan\Type\TypeWithClassName $secondType) : bool
{
if ($firstType->accepts($secondType, \false)->yes()) {
return \true;
}
return $secondType->accepts($firstType, \false)->yes();
return $firstType->accepts($secondType, \false)->yes();
}
private function correctObjectType(\PHPStan\Type\TypeWithClassName $typeWithClassName) : \PHPStan\Type\TypeWithClassName
{

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '7ddcb7939a2c306c9490c18e4e72e25a801c24bf';
public const PACKAGE_VERSION = '0f22f0c55f3993933486e4472ac2bf400fa43bb7';
/**
* @var string
*/
public const RELEASE_DATE = '2022-03-31 15:50:31';
public const RELEASE_DATE = '2022-03-31 18:10:53';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220331\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 ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127::getLoader();
return ComposerAutoloaderInitef9e2f475bd52ebb9776cb0bb7ba153e::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127
class ComposerAutoloaderInitef9e2f475bd52ebb9776cb0bb7ba153e
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitef9e2f475bd52ebb9776cb0bb7ba153e', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitef9e2f475bd52ebb9776cb0bb7ba153e', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
\Composer\Autoload\ComposerStaticInit5cda200a58fcc6c5b69ab3cf84d4f127::getInitializer($loader)();
\Composer\Autoload\ComposerStaticInitef9e2f475bd52ebb9776cb0bb7ba153e::getInitializer($loader)();
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit5cda200a58fcc6c5b69ab3cf84d4f127::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitef9e2f475bd52ebb9776cb0bb7ba153e::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire5cda200a58fcc6c5b69ab3cf84d4f127($fileIdentifier, $file);
composerRequireef9e2f475bd52ebb9776cb0bb7ba153e($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127
* @param string $file
* @return void
*/
function composerRequire5cda200a58fcc6c5b69ab3cf84d4f127($fileIdentifier, $file)
function composerRequireef9e2f475bd52ebb9776cb0bb7ba153e($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 ComposerStaticInit5cda200a58fcc6c5b69ab3cf84d4f127
class ComposerStaticInitef9e2f475bd52ebb9776cb0bb7ba153e
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -3841,9 +3841,9 @@ class ComposerStaticInit5cda200a58fcc6c5b69ab3cf84d4f127
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit5cda200a58fcc6c5b69ab3cf84d4f127::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5cda200a58fcc6c5b69ab3cf84d4f127::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5cda200a58fcc6c5b69ab3cf84d4f127::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitef9e2f475bd52ebb9776cb0bb7ba153e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitef9e2f475bd52ebb9776cb0bb7ba153e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitef9e2f475bd52ebb9776cb0bb7ba153e::$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('RectorPrefix20220331\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127', false) && !interface_exists('ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127', false) && !trait_exists('ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127', false)) {
spl_autoload_call('RectorPrefix20220331\ComposerAutoloaderInit5cda200a58fcc6c5b69ab3cf84d4f127');
if (!class_exists('ComposerAutoloaderInitef9e2f475bd52ebb9776cb0bb7ba153e', false) && !interface_exists('ComposerAutoloaderInitef9e2f475bd52ebb9776cb0bb7ba153e', false) && !trait_exists('ComposerAutoloaderInitef9e2f475bd52ebb9776cb0bb7ba153e', false)) {
spl_autoload_call('RectorPrefix20220331\ComposerAutoloaderInitef9e2f475bd52ebb9776cb0bb7ba153e');
}
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('RectorPrefix20220331\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220331\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire5cda200a58fcc6c5b69ab3cf84d4f127')) {
function composerRequire5cda200a58fcc6c5b69ab3cf84d4f127() {
return \RectorPrefix20220331\composerRequire5cda200a58fcc6c5b69ab3cf84d4f127(...func_get_args());
if (!function_exists('composerRequireef9e2f475bd52ebb9776cb0bb7ba153e')) {
function composerRequireef9e2f475bd52ebb9776cb0bb7ba153e() {
return \RectorPrefix20220331\composerRequireef9e2f475bd52ebb9776cb0bb7ba153e(...func_get_args());
}
}
if (!function_exists('scanPath')) {