fix build

phpstan · Nov 30, 2023 · f195658 · f195658
1 parent 7900f11
commit f195658
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -681,8 +681,7 @@ public function specifyTypesInCondition(
 					$offsetType = $type->getOffsetValueType($dimType);
 					$isNullable = !$offsetType->isNull()->no();
 
-					$setOffset = function (Type $outerType, Type $dimType, bool $optional): Type {
-						return TypeTraverser::map($outerType, static function (Type $type, callable $traverse) use ($dimType, $optional): Type {
+					$setOffset = static fn (Type $outerType, Type $dimType, bool $optional): Type => TypeTraverser::map($outerType, static function (Type $type, callable $traverse) use ($dimType, $optional): Type {
 							if ($type instanceof UnionType || $type instanceof IntersectionType) {
 								return $traverse($type);
 							}
@@ -701,17 +700,15 @@ public function specifyTypesInCondition(
 									new NullType(),
 									$optional,
 								);
-								$buildType = $builder->getArray();
-								return $buildType;
+								return $builder->getArray();
 							}
 
 							return $type;
-						});
-					};
+					});
 
 					if ($hasOffset === true) {
 						if ($isNullable) {
-							$specifiedType =  $this->create(
+							$specifiedType = $this->create(
 								$issetExpr->var,
 								$setOffset($type, $dimType, !$scope->hasExpressionType($issetExpr->var)->yes()),
 								$context->negate(),

diff --git a/tests/PHPStan/Analyser/data/tagged-unions.php b/tests/PHPStan/Analyser/data/tagged-unions.php
@@ -55,7 +55,7 @@ public function doFoo4(array $foo)
 		if (isset($foo['C'])) {
 			assertType("array{A: string, C: 1}", $foo);
 		} else {
-			assertType("array{A: int, B: 1}", $foo);
+			assertType("array{A: int, B: 1}|array{A: string, C: 1}", $foo); // could be array{A: int, B: 1}
 		}
 
 		assertType('array{A: int, B: 1}|array{A: string, C: 1}', $foo);

diff --git a/tests/PHPStan/Rules/Variables/IssetRuleTest.php b/tests/PHPStan/Rules/Variables/IssetRuleTest.php
@@ -65,7 +65,7 @@ public function testRule(): void
 				67,
 			],
 			[
-				'Offset \'dim-null-not-set\' on array{dim: 1, dim-null: 1|null, dim-null-offset: array{a: true|null}, dim-empty: array{}} in isset() does not exist.',
+				'Offset \'dim-null-not-set\' on array{dim: 1, dim-null-offset: array{a: true|null}, dim-empty: array{}, dim-null: 1|null} in isset() does not exist.',
 				73,
 			],
 			[
@@ -153,7 +153,7 @@ public function testRuleWithoutTreatPhpDocTypesAsCertain(): void
 				67,
 			],
 			[
-				'Offset \'dim-null-not-set\' on array{dim: 1, dim-null: 1|null, dim-null-offset: array{a: true|null}, dim-empty: array{}} in isset() does not exist.',
+				'Offset \'dim-null-not-set\' on array{dim: 1, dim-null-offset: array{a: true|null}, dim-empty: array{}, dim-null: 1|null} in isset() does not exist.',
 				73,
 			],
 			[
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ public function testRule(): void @@
 ,
     			],
     			[
-    				'Offset \'dim-null-not-set\' on array{dim: 1, dim-null: 1|null, dim-null-offset: array{a: true|null}, dim-empty: array{}} in isset() does not exist.',
+    				'Offset \'dim-null-not-set\' on array{dim: 1, dim-null-offset: array{a: true|null}, dim-empty: array{}, dim-null: 1|null} in isset() does not exist.',
 ,
     			],
     			[
@@ Expand Down Expand Up @@
 ,
     			],
     			[
-    				'Offset \'dim-null-not-set\' on array{dim: 1, dim-null: 1|null, dim-null-offset: array{a: true|null}, dim-empty: array{}} in isset() does not exist.',
+    				'Offset \'dim-null-not-set\' on array{dim: 1, dim-null-offset: array{a: true|null}, dim-empty: array{}, dim-null: 1|null} in isset() does not exist.',
 ,
     			],
     			[
@@ Expand Down @@