Better handling of constant strings

Author: paulbalandan

src/Rules/Functions/FactoriesFunctionArgumentTypeRule.php

@@ -89,11 +89,15 @@ public function processNode(Node $node, Scope $scope): array
                     return $ruleErrorBuilder;
                 }
 
-                return $ruleErrorBuilder->tip(sprintf(
-                    'If %s is a valid class string, you can add its possible namespace(s) in <fg=cyan>codeigniter.additional%sNamespaces</> in your <fg=yellow>%%configurationFile%%</>.',
-                    $nameType->describe(VerbosityLevel::precise()),
-                    ucfirst($function)
-                ));
+                foreach ($nameType->getConstantStrings() as $constantStringType) {
+                    $ruleErrorBuilder->addTip(sprintf(
+                        'If %s is a valid class string, you can add its possible namespace(s) in <fg=cyan>codeigniter.additional%sNamespaces</> in your <fg=yellow>%%configurationFile%%</>.',
+                        $constantStringType->describe(VerbosityLevel::precise()),
+                        ucfirst($function)
+                    ));
+                }
+
+                return $ruleErrorBuilder;
             };
 
             return [$addTip(RuleErrorBuilder::message(sprintf(

src/Type/FactoriesReturnTypeHelper.php

@@ -67,31 +67,25 @@ public function check(Type $type, string $function): Type
                 return $type->getClassStringObjectType();
             }
 
-            $constantStrings = $type->getConstantStrings();
-
-            if ($constantStrings === []) {
-                return new NullType();
-            }
-
-            $constantStringType = current($constantStrings);
-
-            if ($constantStringType->isClassStringType()->yes()) {
-                return $constantStringType->getClassStringObjectType();
-            }
+            foreach ($type->getConstantStrings() as $constantStringType) {
+                if ($constantStringType->isClassStringType()->yes()) {
+                    return $constantStringType->getClassStringObjectType();
+                }
 
-            $constantString = $constantStringType->getValue();
+                $constantString = $constantStringType->getValue();
 
-            $appName = $this->namespaceMap[$function] . $constantString;
+                $appName = $this->namespaceMap[$function] . $constantString;
 
-            if ($this->reflectionProvider->hasClass($appName)) {
-                return new ObjectType($appName);
-            }
+                if ($this->reflectionProvider->hasClass($appName)) {
+                    return new ObjectType($appName);
+                }
 
-            foreach ($this->additionalNamespacesMap[$function] as $additionalNamespace) {
-                $moduleClassName = $additionalNamespace . $constantString;
+                foreach ($this->additionalNamespacesMap[$function] as $additionalNamespace) {
+                    $moduleClassName = $additionalNamespace . $constantString;
 
-                if ($this->reflectionProvider->hasClass($moduleClassName)) {
-                    return new ObjectType($moduleClassName);
+                    if ($this->reflectionProvider->hasClass($moduleClassName)) {
+                        return new ObjectType($moduleClassName);
+                    }
                 }
             }
 

src/Type/ServicesReturnTypeHelper.php

@@ -31,16 +31,16 @@ final class ServicesReturnTypeHelper
     /**
      * @var array<int, string>
      */
-    private const IMPOSSIBLE_SERVICE_METHOD_NAMES = [
-        '__callStatic',
-        'buildServicesCache',
-        'createRequest',
-        'discoverServices',
-        'getSharedInstance',
-        'injectMock',
+    public const IMPOSSIBLE_SERVICE_METHOD_NAMES = [
+        '__callstatic',
+        'buildservicescache',
+        'createrequest',
+        'discoverservices',
+        'getsharedinstance',
+        'injectmock',
         'reset',
-        'resetSingle',
-        'serviceExists',
+        'resetsingle',
+        'serviceexists',
     ];
 
     /**
@@ -84,37 +84,35 @@ public function check(Type $type, Scope $scope): Type
                 return $traverse($type);
             }
 
-            $constantStrings = $type->getConstantStrings();
+            foreach ($type->getConstantStrings() as $constantStringType) {
+                $constantString = $constantStringType->getValue();
 
-            if ($constantStrings === []) {
-                return new NullType();
-            }
+                foreach (self::IMPOSSIBLE_SERVICE_METHOD_NAMES as $impossibleServiceMethodName) {
+                    if (strtolower($constantString) === $impossibleServiceMethodName) {
+                        return new NullType();
+                    }
+                }
 
-            $constantString = current($constantStrings)->getValue();
+                $methodReflection = null;
 
-            foreach (self::IMPOSSIBLE_SERVICE_METHOD_NAMES as $impossibleServiceMethodName) {
-                if (strtolower($constantString) === strtolower($impossibleServiceMethodName)) {
-                    return new NullType();
+                foreach (self::$servicesReflection as $servicesReflection) {
+                    if ($servicesReflection->hasMethod($constantString)) {
+                        $methodReflection = $servicesReflection->getMethod($constantString, $scope);
+                    }
                 }
-            }
-
-            $methodReflection = null;
 
-            foreach (self::$servicesReflection as $servicesReflection) {
-                if ($servicesReflection->hasMethod($constantString)) {
-                    $methodReflection = $servicesReflection->getMethod($constantString, $scope);
+                if ($methodReflection === null) {
+                    return new NullType();
                 }
-            }
 
-            if ($methodReflection === null) {
-                return new NullType();
-            }
+                if (! $methodReflection->isStatic() || ! $methodReflection->isPublic()) {
+                    return new NullType();
+                }
 
-            if (! $methodReflection->isStatic() || ! $methodReflection->isPublic()) {
-                return new NullType();
+                return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
             }
 
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return new NullType();
         });
     }
 }