Fix and add more cases

Author: VincentLanglet

src/Reflection/InitializerExprTypeResolver.php

@@ -588,7 +588,9 @@ public function resolveConcatType(Type $left, Type $right): Type
 
 		$leftNumericStringNonEmpty = TypeCombinator::remove($leftStringType, new ConstantStringType(''));
 		if ($leftNumericStringNonEmpty->isNumericString()->yes()) {
-			$allowedRightPattern = $left->isInteger()->yes() ? '#^[0-9.]+$#' : '#^[0-9]+$#';
+			$allowedRightPattern = $left->isInteger()->yes()
+				? '#^(\d+|\d+.\d+)([eE][+-]?\d+)?$#' // non-negative integer, float or scientific string
+				: '#^\d+$#'; // non-negative integer string
 
 			$allRightConstantsZeroOrMore = false;
 			foreach ($rightConstantStrings as $rightConstantString) {

tests/PHPStan/Analyser/nsrt/bug-11129.php

@@ -51,6 +51,17 @@ public function foo(
 		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $i.$maybeFloatConstStrings);
 		assertType('lowercase-string&non-falsy-string&uppercase-string', $maybeFloatConstStrings.$i);
 
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $i.'1');
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $i.'1.0');
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $i.'1.1.1');
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $i.'-1');
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $i.'-1.0');
+		assertType('lowercase-string&non-falsy-string&numeric-string', $i.'10e-3');
+		assertType('lowercase-string&non-falsy-string', $i.'-10e-3');
+		assertType('non-falsy-string&numeric-string&uppercase-string', $i.'10E3');
+		assertType('non-falsy-string&uppercase-string', $i.'-10E3');
+		assertType('non-falsy-string', $i.'10eE3');
+
 		assertType('lowercase-string&non-empty-string&numeric-string&uppercase-string', $i.$bool);
 		assertType('lowercase-string&non-empty-string&uppercase-string', $bool.$i);
 		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $positiveInt.$bool);
@@ -75,7 +86,7 @@ public function foo(
 		// https://3v4l.org/Ia4r0
 		$scientificFloatAsString = '3e4';
 		assertType('non-falsy-string', $numericString.$scientificFloatAsString);
-		assertType('lowercase-string&non-falsy-string', $i.$scientificFloatAsString);
+		assertType('lowercase-string&non-falsy-string&numeric-string', $i.$scientificFloatAsString);
 		assertType('non-falsy-string', $scientificFloatAsString.$numericString);
 		assertType('lowercase-string&non-falsy-string', $scientificFloatAsString.$i);
 	}