Updated Rector to commit 7ccb174abecda973a5f37b174c1343866dc82c5c

rectorphp/rector-src@7ccb174 Different logic: verify equal before substr on ClassLikeNameClassNameImportSkipVoter (#7450)

Author: TomasVotruba

rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php

@@ -5,6 +5,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use Rector\CodingStyle\ClassNameImport\NamespaceBeforeClassNameResolver;
 use Rector\CodingStyle\ClassNameImport\ShortNameResolver;
 use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -25,9 +26,14 @@ final class ClassLikeNameClassNameImportSkipVoter implements ClassNameImportSkip
      * @readonly
      */
     private ShortNameResolver $shortNameResolver;
-    public function __construct(ShortNameResolver $shortNameResolver)
+    /**
+     * @readonly
+     */
+    private NamespaceBeforeClassNameResolver $namespaceBeforeClassNameResolver;
+    public function __construct(ShortNameResolver $shortNameResolver, NamespaceBeforeClassNameResolver $namespaceBeforeClassNameResolver)
     {
         $this->shortNameResolver = $shortNameResolver;
+        $this->namespaceBeforeClassNameResolver = $namespaceBeforeClassNameResolver;
     }
     public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool
     {
@@ -45,7 +51,7 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
         $namespace = $scope instanceof Scope ? $scope->getNamespace() : null;
         $namespace = strtolower((string) $namespace);
         $shortNameLowered = $fullyQualifiedObjectType->getShortNameLowered();
-        $subClassName = substr($fullyQualifiedObjectType->getClassName(), 0, -strlen($fullyQualifiedObjectType->getShortName()) - 1);
+        $subClassName = $this->namespaceBeforeClassNameResolver->resolve($fullyQualifiedObjectType);
         $fullyQualifiedObjectTypeNamespace = strtolower($subClassName);
         foreach ($classLikeNames as $classLikeName) {
             if (strtolower($classLikeName) !== $shortNameLowered) {

rules/CodingStyle/ClassNameImport/NamespaceBeforeClassNameResolver.php

@@ -0,0 +1,15 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\CodingStyle\ClassNameImport;
+
+use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
+final class NamespaceBeforeClassNameResolver
+{
+    public function resolve(FullyQualifiedObjectType $fullyQualifiedObjectType): string
+    {
+        $className = $fullyQualifiedObjectType->getClassName();
+        $shortName = $fullyQualifiedObjectType->getShortName();
+        return $className === $shortName ? '' : substr($className, 0, -strlen($shortName) - 1);
+    }
+}

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '9a95b6b13e7522da28576a3e615f319b417feedb';
+    public const PACKAGE_VERSION = '7ccb174abecda973a5f37b174c1343866dc82c5c';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-10-08 09:20:27';
+    public const RELEASE_DATE = '2025-10-08 14:53:58';
     /**
      * @var int
      */

vendor/composer/autoload_classmap.php

@@ -1242,6 +1242,7 @@
     'Rector\\CodingStyle\\ClassNameImport\\ClassNameImportSkipVoter\\ShortClassImportSkipVoter' => $baseDir . '/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ShortClassImportSkipVoter.php',
     'Rector\\CodingStyle\\ClassNameImport\\ClassNameImportSkipVoter\\UsesClassNameImportSkipVoter' => $baseDir . '/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/UsesClassNameImportSkipVoter.php',
     'Rector\\CodingStyle\\ClassNameImport\\ClassNameImportSkipper' => $baseDir . '/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php',
+    'Rector\\CodingStyle\\ClassNameImport\\NamespaceBeforeClassNameResolver' => $baseDir . '/rules/CodingStyle/ClassNameImport/NamespaceBeforeClassNameResolver.php',
     'Rector\\CodingStyle\\ClassNameImport\\ShortNameResolver' => $baseDir . '/rules/CodingStyle/ClassNameImport/ShortNameResolver.php',
     'Rector\\CodingStyle\\ClassNameImport\\UseImportsTraverser' => $baseDir . '/rules/CodingStyle/ClassNameImport/UseImportsTraverser.php',
     'Rector\\CodingStyle\\ClassNameImport\\UsedImportsResolver' => $baseDir . '/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php',

vendor/composer/autoload_static.php

@@ -1490,6 +1490,7 @@ class ComposerStaticInitaec8d909b4f5341922f1774ccd2ec774
         'Rector\\CodingStyle\\ClassNameImport\\ClassNameImportSkipVoter\\ShortClassImportSkipVoter' => __DIR__ . '/../..' . '/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ShortClassImportSkipVoter.php',
         'Rector\\CodingStyle\\ClassNameImport\\ClassNameImportSkipVoter\\UsesClassNameImportSkipVoter' => __DIR__ . '/../..' . '/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/UsesClassNameImportSkipVoter.php',
         'Rector\\CodingStyle\\ClassNameImport\\ClassNameImportSkipper' => __DIR__ . '/../..' . '/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php',
+        'Rector\\CodingStyle\\ClassNameImport\\NamespaceBeforeClassNameResolver' => __DIR__ . '/../..' . '/rules/CodingStyle/ClassNameImport/NamespaceBeforeClassNameResolver.php',
         'Rector\\CodingStyle\\ClassNameImport\\ShortNameResolver' => __DIR__ . '/../..' . '/rules/CodingStyle/ClassNameImport/ShortNameResolver.php',
         'Rector\\CodingStyle\\ClassNameImport\\UseImportsTraverser' => __DIR__ . '/../..' . '/rules/CodingStyle/ClassNameImport/UseImportsTraverser.php',
         'Rector\\CodingStyle\\ClassNameImport\\UsedImportsResolver' => __DIR__ . '/../..' . '/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php',