Different logic: verify equal before substr on ClassLikeNameClassNameImportSkipVoter (#7450)

* verify string equal first before substr with negative -1

* fix

* move logic to separate service

* [ci-review] Rector Rectify

* add test fixture for shortname import in class name

* more test

* skip

* eol

* eol

---------

Co-authored-by: GitHub Action <[email protected]>

Author: samsonasik

rector.php

@@ -4,7 +4,6 @@
 
 use Rector\CodingStyle\Rector\String_\UseClassKeywordForClassNameResolutionRector;
 use Rector\Config\RectorConfig;
-use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
 use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 
@@ -53,9 +52,4 @@
             __DIR__ . '/src/Configuration/RectorConfigBuilder.php',
             __DIR__ . '/src/Console/Notifier.php',
         ],
-
-        // on php 7.x, substr() result can return false, so force (string) is needed
-        RecastingRemovalRector::class => [
-            __DIR__ . '/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php',
-        ],
     ]);

rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php

@@ -6,6 +6,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;
@@ -24,7 +25,8 @@
 final readonly class ClassLikeNameClassNameImportSkipVoter implements ClassNameImportSkipVoterInterface
 {
     public function __construct(
-        private ShortNameResolver $shortNameResolver
+        private ShortNameResolver $shortNameResolver,
+        private NamespaceBeforeClassNameResolver $namespaceBeforeClassNameResolver
     ) {
     }
 
@@ -46,13 +48,7 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
         $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) {

rules/CodingStyle/ClassNameImport/NamespaceBeforeClassNameResolver.php

@@ -0,0 +1,24 @@
+<?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
+        );
+    }
+}

tests/Issues/AutoImport/Fixture/long_namespace_in_class_name.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Foo\Bar\Baz\Bat;
+
+class LongNamespaceInClassName
+{
+    public \App\Foo\Bar\Baz\Bat\LongNamespaceInClassName $obj;
+}
+
+?>
+-----
+<?php
+
+namespace App\Foo\Bar\Baz\Bat;
+
+class LongNamespaceInClassName
+{
+    public LongNamespaceInClassName $obj;
+}
+
+?>

tests/Issues/AutoImport/Fixture/short_name_import_in_class_name.php.inc

@@ -0,0 +1,6 @@
+<?php
+
+class SkipShortNameImportInClassName
+{
+    public \SkipShortNameImportInClassName $obj;
+}