mirror of
https://github.com/rectorphp/rector.git
synced 2025-04-08 01:23:15 +02:00
Updated Rector to commit cdccb5199ddc160fb7945879cf1403f1c7289770
cdccb5199d
[AutoImport] Handle case insensitive name collide on auto import (#4829)
This commit is contained in:
parent
31a33d3c1b
commit
429b44fab4
@ -102,13 +102,14 @@ final class UseNodesToAddCollector implements NodeCollectorInterface
|
||||
}
|
||||
$fileConstantUseImportTypes = $this->constantUseImportTypesInFilePath[$filePath] ?? [];
|
||||
foreach ($fileConstantUseImportTypes as $fileConstantUseImportType) {
|
||||
// don't compare strtolower for use const as insensitive is allowed, see https://3v4l.org/lteVa
|
||||
if ($fileConstantUseImportType->getShortName() === $shortName) {
|
||||
return \true;
|
||||
}
|
||||
}
|
||||
$fileFunctionUseImportTypes = $this->functionUseImportTypesInFilePath[$filePath] ?? [];
|
||||
foreach ($fileFunctionUseImportTypes as $fileFunctionUseImportType) {
|
||||
if ($fileFunctionUseImportType->getShortName() === $shortName) {
|
||||
if (\strtolower($fileFunctionUseImportType->getShortName()) === \strtolower($shortName)) {
|
||||
return \true;
|
||||
}
|
||||
}
|
||||
@ -162,7 +163,7 @@ final class UseNodesToAddCollector implements NodeCollectorInterface
|
||||
{
|
||||
$fileUseImports = $this->useImportTypesInFilePath[$filePath] ?? [];
|
||||
foreach ($fileUseImports as $fileUseImport) {
|
||||
if ($fileUseImport->getShortName() === $shortName) {
|
||||
if (\strtolower($fileUseImport->getShortName()) === \strtolower($shortName)) {
|
||||
return \true;
|
||||
}
|
||||
}
|
||||
|
@ -19,12 +19,12 @@ final class VersionResolver
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '79d806c87a7b3df9ec8acc611178dd3cdd8c8d28';
|
||||
public const PACKAGE_VERSION = 'cdccb5199ddc160fb7945879cf1403f1c7289770';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-08-21 20:54:30';
|
||||
public const RELEASE_DATE = '2023-08-21 15:05:00';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
||||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit462d989c0c25af0fa2053130de4e4961::getLoader();
|
||||
return ComposerAutoloaderInit513343f8f36365e3b1799607bf5db06d::getLoader();
|
||||
|
10
vendor/composer/autoload_real.php
vendored
10
vendor/composer/autoload_real.php
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit462d989c0c25af0fa2053130de4e4961
|
||||
class ComposerAutoloaderInit513343f8f36365e3b1799607bf5db06d
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
@ -22,17 +22,17 @@ class ComposerAutoloaderInit462d989c0c25af0fa2053130de4e4961
|
||||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit462d989c0c25af0fa2053130de4e4961', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit513343f8f36365e3b1799607bf5db06d', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit462d989c0c25af0fa2053130de4e4961', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit513343f8f36365e3b1799607bf5db06d', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit462d989c0c25af0fa2053130de4e4961::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit513343f8f36365e3b1799607bf5db06d::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit462d989c0c25af0fa2053130de4e4961::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit513343f8f36365e3b1799607bf5db06d::$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
8
vendor/composer/autoload_static.php
vendored
@ -4,7 +4,7 @@
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit462d989c0c25af0fa2053130de4e4961
|
||||
class ComposerStaticInit513343f8f36365e3b1799607bf5db06d
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
@ -2611,9 +2611,9 @@ class ComposerStaticInit462d989c0c25af0fa2053130de4e4961
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit462d989c0c25af0fa2053130de4e4961::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit462d989c0c25af0fa2053130de4e4961::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit462d989c0c25af0fa2053130de4e4961::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit513343f8f36365e3b1799607bf5db06d::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit513343f8f36365e3b1799607bf5db06d::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit513343f8f36365e3b1799607bf5db06d::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user