Fix crash about ObjectShapeType property with numeric name

Author: ondrejmirtes

phpstan-baseline.neon

@@ -33,7 +33,7 @@ parameters:
 		-
 			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantStringType is error-prone and deprecated. Use Type::getConstantStrings() instead.'
 			identifier: phpstanApi.instanceofType
-			count: 3
+			count: 2
 			path: src/Analyser/MutatingScope.php
 
 		-

src/Analyser/MutatingScope.php

@@ -1722,10 +1722,6 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 						$properties = [];
 						$optionalProperties = [];
 						foreach ($constantArray->getKeyTypes() as $i => $keyType) {
-							if (!$keyType instanceof ConstantStringType) {
-								// an object with integer properties is >weird<
-								continue;
-							}
 							$valueType = $constantArray->getValueTypes()[$i];
 							$optional = $constantArray->isOptionalKey($i);
 							if ($optional) {

src/Type/ObjectShapeType.php

@@ -44,23 +44,23 @@ class ObjectShapeType implements Type
 
 	/**
 	 * @api
-	 * @param array<string, Type> $properties
-	 * @param list<string> $optionalProperties
+	 * @param array<int|string, Type> $properties
+	 * @param list<int|string> $optionalProperties
 	 */
 	public function __construct(private array $properties, private array $optionalProperties)
 	{
 	}
 
 	/**
-	 * @return array<string, Type>
+	 * @return array<int|string, Type>
 	 */
 	public function getProperties(): array
 	{
 		return $this->properties;
 	}
 
 	/**
-	 * @return list<string>
+	 * @return list<int|string>
 	 */
 	public function getOptionalProperties(): array
 	{
@@ -143,7 +143,7 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
 		$result = AcceptsResult::createYes();
 		$scope = new OutOfClassScope();
 		foreach ($this->properties as $propertyName => $propertyType) {
-			$typeHasProperty = $type->hasProperty($propertyName);
+			$typeHasProperty = $type->hasProperty((string) $propertyName);
 			$hasProperty = new AcceptsResult(
 				$typeHasProperty,
 				$typeHasProperty->yes() ? [] : [
@@ -174,7 +174,7 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
 
 			$result = $result->and($hasProperty);
 			try {
-				$otherProperty = $type->getProperty($propertyName, $scope);
+				$otherProperty = $type->getProperty((string) $propertyName, $scope);
 			} catch (MissingPropertyFromReflectionException) {
 				return AcceptsResult::createNo(
 					[
@@ -260,7 +260,7 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 		$result = IsSuperTypeOfResult::createYes();
 		$scope = new OutOfClassScope();
 		foreach ($this->properties as $propertyName => $propertyType) {
-			$hasProperty = new IsSuperTypeOfResult($type->hasProperty($propertyName), []);
+			$hasProperty = new IsSuperTypeOfResult($type->hasProperty((string) $propertyName), []);
 			if ($hasProperty->no()) {
 				if (in_array($propertyName, $this->optionalProperties, true)) {
 					continue;
@@ -279,7 +279,7 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 
 			$result = $result->and($hasProperty);
 			try {
-				$otherProperty = $type->getProperty($propertyName, $scope);
+				$otherProperty = $type->getProperty((string) $propertyName, $scope);
 			} catch (MissingPropertyFromReflectionException) {
 				return IsSuperTypeOfResult::createNo(
 					[
@@ -354,7 +354,7 @@ public function tryRemove(Type $typeToRemove): ?Type
 		if ($typeToRemove instanceof HasPropertyType) {
 			$properties = $this->properties;
 			unset($properties[$typeToRemove->getPropertyName()]);
-			$optionalProperties = array_values(array_filter($this->optionalProperties, static fn (string $propertyName) => $propertyName !== $typeToRemove->getPropertyName()));
+			$optionalProperties = array_values(array_filter($this->optionalProperties, static fn (int|string $propertyName) => $propertyName !== $typeToRemove->getPropertyName()));
 
 			return new self($properties, $optionalProperties);
 		}
@@ -365,7 +365,7 @@ public function tryRemove(Type $typeToRemove): ?Type
 	public function makePropertyRequired(string $propertyName): self
 	{
 		if (array_key_exists($propertyName, $this->properties)) {
-			$optionalProperties = array_values(array_filter($this->optionalProperties, static fn (string $currentPropertyName) => $currentPropertyName !== $propertyName));
+			$optionalProperties = array_values(array_filter($this->optionalProperties, static fn (int|string $currentPropertyName) => $currentPropertyName !== $propertyName));
 
 			return new self($this->properties, $optionalProperties);
 		}
@@ -383,12 +383,12 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 			$typeMap = TemplateTypeMap::createEmpty();
 			$scope = new OutOfClassScope();
 			foreach ($this->properties as $name => $propertyType) {
-				if ($receivedType->hasProperty($name)->no()) {
+				if ($receivedType->hasProperty((string) $name)->no()) {
 					continue;
 				}
 
 				try {
-					$receivedProperty = $receivedType->getProperty($name, $scope);
+					$receivedProperty = $receivedType->getProperty((string) $name, $scope);
 				} catch (MissingPropertyFromReflectionException) {
 					continue;
 				}
@@ -474,10 +474,10 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 
 		$scope = new OutOfClassScope();
 		foreach ($this->properties as $name => $propertyType) {
-			if (!$right->hasProperty($name)->yes()) {
+			if (!$right->hasProperty((string) $name)->yes()) {
 				return $this;
 			}
-			$transformed = $cb($propertyType, $right->getProperty($name, $scope)->getReadableType());
+			$transformed = $cb($propertyType, $right->getProperty((string) $name, $scope)->getReadableType());
 			if ($transformed !== $propertyType) {
 				$stillOriginal = false;
 			}
@@ -513,10 +513,10 @@ public function toPhpDocNode(): TypeNode
 	{
 		$items = [];
 		foreach ($this->properties as $name => $type) {
-			if (ConstantArrayType::isValidIdentifier($name)) {
-				$keyNode = new IdentifierTypeNode($name);
+			if (ConstantArrayType::isValidIdentifier((string) $name)) {
+				$keyNode = new IdentifierTypeNode((string) $name);
 			} else {
-				$keyPhpDocNode = (new ConstantStringType($name))->toPhpDocNode();
+				$keyPhpDocNode = (new ConstantStringType((string) $name))->toPhpDocNode();
 				if (!$keyPhpDocNode instanceof ConstTypeNode) {
 					continue;
 				}

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1225,6 +1225,12 @@ public function testBug5091(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug13507(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-13507.php');
+		$this->assertNoErrors($errors);
+	}
+
 	public function testBug9459(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-9459.php');

tests/PHPStan/Analyser/data/bug-13507.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Bug13507;
+
+/**
+ * @return object{
+ *  '-1': bool,
+ * }
+ */
+function test(bool $value): object
+{
+	return (object)[
+		'-1' => $value,
+	];
+}