Updated Rector to commit 9a95b6b13e7522da28576a3e615f319b417feedb

TomasVotruba · TomasVotruba · commit 6813895dc42b · 2025-10-08T07:23:57.000Z
rectorphp/rector-src@9a95b6b [dead-code] Skip substr casting removal on PHP 7.x, as can return false|string (#7449)
diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php
@@ -45,11 +45,7 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
         $namespace = $scope instanceof Scope ? $scope->getNamespace() : null;
         $namespace = strtolower((string) $namespace);
         $shortNameLowered = $fullyQualifiedObjectType->getShortNameLowered();
-        /**
-         * on php 7.x, substr() result can return false, so force (string) is needed
-         * @see https://github.com/rectorphp/rector-src/pull/7436
-         */
-        $subClassName = (string) substr($fullyQualifiedObjectType->getClassName(), 0, -strlen($fullyQualifiedObjectType->getShortName()) - 1);
+        $subClassName = substr($fullyQualifiedObjectType->getClassName(), 0, -strlen($fullyQualifiedObjectType->getShortName()) - 1);
         $fullyQualifiedObjectTypeNamespace = strtolower($subClassName);
         foreach ($classLikeNames as $classLikeName) {
             if (strtolower($classLikeName) !== $shortNameLowered) {
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'd57b45e163b919f164b0b8a4622679f35663ba49';
+    public const PACKAGE_VERSION = '9a95b6b13e7522da28576a3e615f319b417feedb';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-10-08 13:42:40';
+    public const RELEASE_DATE = '2025-10-08 09:20:27';
     /**
      * @var int
      */
diff --git a/src/NodeTypeResolver/NodeTypeResolver.php b/src/NodeTypeResolver/NodeTypeResolver.php
@@ -38,6 +38,7 @@
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ObjectWithoutClassType;
+use PHPStan\Type\StringType;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -54,9 +55,11 @@
 use Rector\NodeTypeResolver\NodeTypeCorrector\AccessoryNonEmptyStringTypeCorrector;
 use Rector\NodeTypeResolver\NodeTypeCorrector\GenericClassStringTypeCorrector;
 use Rector\NodeTypeResolver\PHPStan\ObjectWithoutClassTypeWithParentTypes;
+use Rector\Php\PhpVersionProvider;
 use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
 use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
 use Rector\TypeDeclaration\PHPStan\ObjectTypeSpecifier;
+use Rector\ValueObject\PhpVersion;
 final class NodeTypeResolver
 {
     /**
@@ -91,6 +94,10 @@ final class NodeTypeResolver
      * @readonly
      */
     private NodeNameResolver $nodeNameResolver;
+    /**
+     * @readonly
+     */
+    private PhpVersionProvider $phpVersionProvider;
     /**
      * @var string
      */
@@ -102,7 +109,7 @@ final class NodeTypeResolver
     /**
      * @param NodeTypeResolverInterface[] $nodeTypeResolvers
      */
-    public function __construct(ObjectTypeSpecifier $objectTypeSpecifier, ClassAnalyzer $classAnalyzer, GenericClassStringTypeCorrector $genericClassStringTypeCorrector, ReflectionProvider $reflectionProvider, AccessoryNonEmptyStringTypeCorrector $accessoryNonEmptyStringTypeCorrector, AccessoryNonEmptyArrayTypeCorrector $accessoryNonEmptyArrayTypeCorrector, RenamedClassesDataCollector $renamedClassesDataCollector, NodeNameResolver $nodeNameResolver, iterable $nodeTypeResolvers)
+    public function __construct(ObjectTypeSpecifier $objectTypeSpecifier, ClassAnalyzer $classAnalyzer, GenericClassStringTypeCorrector $genericClassStringTypeCorrector, ReflectionProvider $reflectionProvider, AccessoryNonEmptyStringTypeCorrector $accessoryNonEmptyStringTypeCorrector, AccessoryNonEmptyArrayTypeCorrector $accessoryNonEmptyArrayTypeCorrector, RenamedClassesDataCollector $renamedClassesDataCollector, NodeNameResolver $nodeNameResolver, PhpVersionProvider $phpVersionProvider, iterable $nodeTypeResolvers)
     {
         $this->objectTypeSpecifier = $objectTypeSpecifier;
         $this->classAnalyzer = $classAnalyzer;
@@ -112,6 +119,7 @@ public function __construct(ObjectTypeSpecifier $objectTypeSpecifier, ClassAnaly
         $this->accessoryNonEmptyArrayTypeCorrector = $accessoryNonEmptyArrayTypeCorrector;
         $this->renamedClassesDataCollector = $renamedClassesDataCollector;
         $this->nodeNameResolver = $nodeNameResolver;
+        $this->phpVersionProvider = $phpVersionProvider;
         foreach ($nodeTypeResolvers as $nodeTypeResolver) {
             if ($nodeTypeResolver instanceof NodeTypeResolverAwareInterface) {
                 $nodeTypeResolver->autowire($this);
@@ -527,6 +535,9 @@ private function resolveNativeTypeWithBuiltinMethodCallFallback(Expr $expr, Scop
             if (!$functionReflection instanceof NativeFunctionReflection) {
                 return $scope->getNativeType($expr);
             }
+            if ($this->isSubstrOnPHP74($expr)) {
+                return new UnionType([new StringType(), new ConstantBooleanType(\false)]);
+            }
             return $scope->getType($expr);
         }
         return $scope->getNativeType($expr);
@@ -554,4 +565,17 @@ private function isEnumTypeMatch($call, ObjectType $objectType): bool
         }
         return $classReflection->getName() === $objectType->getClassName();
     }
+    /**
+     * substr can return false on php 7.x and bellow
+     */
+    private function isSubstrOnPHP74(FuncCall $funcCall): bool
+    {
+        if ($funcCall->isFirstClassCallable()) {
+            return \false;
+        }
+        if (!$this->nodeNameResolver->isName($funcCall, 'substr')) {
+            return \false;
+        }
+        return !$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80);
+    }
 }
