Fixed accepting ConstantArrayType

phpstan · May 3, 2020 · 34edb50 · 34edb50
1 parent 61cb5aa
commit 34edb50
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 71 deletions.
diff --git a/src/Rules/RuleLevelHelper.php b/src/Rules/RuleLevelHelper.php
@@ -7,7 +7,6 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\CompoundType;
-use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
@@ -63,52 +62,6 @@ public function accepts(Type $acceptingType, Type $acceptedType, bool $strictTyp
 			$acceptedType = TypeCombinator::removeNull($acceptedType);
 		}
 
-		if (
-			$acceptedType->isArray()->yes()
-			&& $acceptingType->isArray()->yes()
-			&& !$acceptingType instanceof ConstantArrayType
-		) {
-			$acceptedConstantArrays = TypeUtils::getConstantArrays($acceptedType);
-			if (count($acceptedConstantArrays) > 0) {
-				foreach ($acceptedConstantArrays as $acceptedConstantArray) {
-					foreach ($acceptedConstantArray->getKeyTypes() as $i => $keyType) {
-						$valueType = $acceptedConstantArray->getValueTypes()[$i];
-						if (
-							!self::accepts(
-								$acceptingType->getIterableKeyType(),
-								$keyType,
-								$strictTypes
-							) || !self::accepts(
-								$acceptingType->getIterableValueType(),
-								$valueType,
-								$strictTypes
-							)
-						) {
-							return false;
-						}
-					}
-				}
-
-				return true;
-			}
-
-			if (
-				!self::accepts(
-					$acceptingType->getIterableKeyType(),
-					$acceptedType->getIterableKeyType(),
-					$strictTypes
-				) || !self::accepts(
-					$acceptingType->getIterableValueType(),
-					$acceptedType->getIterableValueType(),
-					$strictTypes
-				)
-			) {
-				return false;
-			}
-
-			return true;
-		}
-
 		if ($acceptingType instanceof UnionType && !$acceptedType instanceof CompoundType) {
 			foreach ($acceptingType->getTypes() as $innerType) {
 				if (self::accepts($innerType, $acceptedType, $strictTypes)) {
@@ -122,7 +75,8 @@ public function accepts(Type $acceptingType, Type $acceptedType, bool $strictTyp
 		if (
 			$acceptedType->isArray()->yes()
 			&& $acceptingType->isArray()->yes()
-			&& !$acceptingType instanceof ConstantArrayType
+			&& count(TypeUtils::getConstantArrays($acceptedType)) === 0
+			&& count(TypeUtils::getConstantArrays($acceptingType)) === 0
 		) {
 			return self::accepts(
 				$acceptingType->getIterableKeyType(),

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -61,20 +61,25 @@ public function getReferencedClasses(): array
 
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
-		$arrays = TypeUtils::getArrays($type);
-		if (count($arrays) > 0) {
+		if ($type instanceof CompoundType) {
+			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+		}
+
+		if ($type instanceof ConstantArrayType) {
 			$result = TrinaryLogic::createYes();
-			foreach ($arrays as $array) {
-				$result = $result
-					->and($this->getItemType()->accepts($array->getItemType(), $strictTypes))
-					->and($this->keyType->accepts($array->keyType, $strictTypes));
+			$thisKeyType = $this->keyType;
+			$itemType = $this->getItemType();
+			foreach ($type->getKeyTypes() as $i => $keyType) {
+				$valueType = $type->getValueTypes()[$i];
+				$result = $result->and($thisKeyType->accepts($keyType, $strictTypes))->and($itemType->accepts($valueType, $strictTypes));
 			}
 
 			return $result;
 		}
 
-		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+		if ($type instanceof ArrayType) {
+			return $this->getItemType()->accepts($type->getItemType(), $strictTypes)
+				->and($this->keyType->accepts($type->keyType, $strictTypes));
 		}
 
 		return TrinaryLogic::createNo();

diff --git a/tests/PHPStan/Levels/data/acceptTypes-5.json b/tests/PHPStan/Levels/data/acceptTypes-5.json
@@ -44,16 +44,6 @@
         "line": 118,
         "ignorable": true
     },
-    {
-        "message": "Parameter #1 $i of method Levels\\AcceptTypes\\Foo::doBarArray() expects array<int>, array<int, int|null> given.",
-        "line": 119,
-        "ignorable": true
-    },
-    {
-        "message": "Parameter #1 $i of method Levels\\AcceptTypes\\Foo::doBarArray() expects array<int>, array<int, float|int> given.",
-        "line": 120,
-        "ignorable": true
-    },
     {
         "message": "Parameter #1 $callable of method Levels\\AcceptTypes\\Foo::expectCallable() expects callable(): mixed, 'nonexistentFunction' given.",
         "line": 144,

diff --git a/tests/PHPStan/Levels/data/acceptTypes-7.json b/tests/PHPStan/Levels/data/acceptTypes-7.json
@@ -19,6 +19,21 @@
         "line": 92,
         "ignorable": true
     },
+    {
+        "message": "Parameter #1 $i of method Levels\\AcceptTypes\\Foo::doBarArray() expects array<int>, array<int, int|null> given.",
+        "line": 119,
+        "ignorable": true
+    },
+    {
+        "message": "Parameter #1 $i of method Levels\\AcceptTypes\\Foo::doBarArray() expects array<int>, array<int, float|int> given.",
+        "line": 120,
+        "ignorable": true
+    },
+    {
+        "message": "Parameter #1 $i of method Levels\\AcceptTypes\\Foo::doBarArray() expects array<int>, array<int, int|null> given.",
+        "line": 131,
+        "ignorable": true
+    },
     {
         "message": "Parameter #1 $i of method Levels\\AcceptTypes\\Foo::doBarArray() expects array<int>, array<int, float|int> given.",
         "line": 132,

diff --git a/tests/PHPStan/Levels/data/acceptTypes-8.json b/tests/PHPStan/Levels/data/acceptTypes-8.json
@@ -14,11 +14,6 @@
         "line": 91,
         "ignorable": true
     },
-    {
-        "message": "Parameter #1 $i of method Levels\\AcceptTypes\\Foo::doBarArray() expects array<int>, array<int, int|null> given.",
-        "line": 131,
-        "ignorable": true
-    },
     {
         "message": "Parameter #1 $i of method Levels\\AcceptTypes\\Baz::doBar() expects int, int|null given.",
         "line": 405,

diff --git a/tests/PHPStan/Rules/Methods/data/call-methods.php b/tests/PHPStan/Rules/Methods/data/call-methods.php
@@ -1598,3 +1598,45 @@ public function doBar(array $members)
 	}
 
 }
+
+class ConstantArrayAccepts
+{
+
+	/**
+	 * @param array{
+	 *   name: string,
+	 *   color: string,
+	 *   year: int,
+	 * } $param
+	 */
+	public function doFoo(array $param): void
+	{
+		$this->doBar($param);
+	}
+
+	/**
+	 * @param array{
+	 *   name: string,
+	 *   color?: string,
+	 * } $param
+	 */
+	public function doBar(array $param): void
+	{
+
+	}
+
+}
+
+class ConstantArrayAcceptsOptionalKey
+{
+
+	/**
+	 * @param array{wrapperClass?: class-string} $params
+	 */
+	public function doFoo(array $params)
+	{
+		$this->doFoo(['wrapperClass' => \stdClass::class, 'undocumented' => 42]);
+		$this->doFoo([]);
+	}
+
+}
diff --git a/tests/PHPStan/Type/ArrayTypeTest.php b/tests/PHPStan/Type/ArrayTypeTest.php
@@ -110,6 +110,29 @@ public function dataAccepts(): array
 				]),
 				TrinaryLogic::createYes(),
 			],
+			[
+				new ArrayType(new MixedType(), new CallableType()),
+				new ConstantArrayType([
+					new ConstantIntegerType(0),
+					new ConstantIntegerType(1),
+				], [
+					new ConstantArrayType([
+						new ConstantIntegerType(0),
+						new ConstantIntegerType(1),
+					], [
+						new ThisType(self::class),
+						new ConstantStringType('dataAccepts'),
+					]),
+					new ConstantArrayType([
+						new ConstantIntegerType(0),
+						new ConstantIntegerType(1),
+					], [
+						new ThisType(self::class),
+						new ConstantStringType('dataIsSuperTypeOf'),
+					]),
+				]),
+				TrinaryLogic::createYes(),
+			],
 		];
 	}