Skip to content

Commit

Permalink
Updated Rector to commit 4f199368893906bf5d9f89b936e97297888de463
Browse files Browse the repository at this point in the history
rectorphp/rector-src@4f19936 [AutoImport] Skip case insensitive conflict defined class name on $rectorConfig->importNames() (#5076)
  • Loading branch information
TomasVotruba committed Sep 24, 2023
1 parent 4837e82 commit 9b44046
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion rules/CodingStyle/ClassNameImport/ShortNameResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\Core\Util\StringUtils;
use Rector\Core\ValueObject\Application\File;
use Rector\NodeNameResolver\NodeNameResolver;
Expand Down Expand Up @@ -100,7 +101,7 @@ public function resolveShortClassLikeNames(File $file) : array
$newStmts = $file->getNewStmts();
/** @var Namespace_[] $namespaces */
$namespaces = \array_filter($newStmts, static function (Stmt $stmt) : bool {
return $stmt instanceof Namespace_;
return $stmt instanceof Namespace_ || $stmt instanceof FileWithoutNamespace;
});
if (\count($namespaces) !== 1) {
// only handle single namespace nodes
Expand Down
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '803d9ec70934d3fa4a2d97d8e50bb38729b44d10';
public const PACKAGE_VERSION = '4f199368893906bf5d9f89b936e97297888de463';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-24 11:35:05';
public const RELEASE_DATE = '2023-09-24 16:49:08';
/**
* @var int
*/
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit6760f23dc945ca1bb9c0089c239c7e60::getLoader();
return ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e::getLoader();
10 changes: 5 additions & 5 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit6760f23dc945ca1bb9c0089c239c7e60
class ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e
{
private static $loader;

Expand All @@ -22,17 +22,17 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInit6760f23dc945ca1bb9c0089c239c7e60', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit6760f23dc945ca1bb9c0089c239c7e60', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e', 'loadClassLoader'));

require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit6760f23dc945ca1bb9c0089c239c7e60::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit635741106b572cb4bc1135212680fb0e::getInitializer($loader));

$loader->setClassMapAuthoritative(true);
$loader->register(true);

$filesToLoad = \Composer\Autoload\ComposerStaticInit6760f23dc945ca1bb9c0089c239c7e60::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit635741106b572cb4bc1135212680fb0e::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInit6760f23dc945ca1bb9c0089c239c7e60
class ComposerStaticInit635741106b572cb4bc1135212680fb0e
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
Expand Down Expand Up @@ -2601,9 +2601,9 @@ class ComposerStaticInit6760f23dc945ca1bb9c0089c239c7e60
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit6760f23dc945ca1bb9c0089c239c7e60::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit6760f23dc945ca1bb9c0089c239c7e60::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit6760f23dc945ca1bb9c0089c239c7e60::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit635741106b572cb4bc1135212680fb0e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit635741106b572cb4bc1135212680fb0e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit635741106b572cb4bc1135212680fb0e::$classMap;

}, null, ClassLoader::class);
}
Expand Down

0 comments on commit 9b44046

Please sign in to comment.