Support intersecting ObjectShapeType with HasPropertyType

When intersecting an object shape with HasPropertyType, if the property
doesn't exist in the shape, add it as mixed. If it exists, make it
required. This is handled before isSuperTypeOf checks, similar to the
ObjectShapeType-ObjectShapeType intersection.

Also fix the NeverType check for overlapping properties with incompatible
types: only skip if the property is optional in both shapes (not just one).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: phpstan-bot

src/Type/TypeCombinator.php

@@ -1309,7 +1309,10 @@ public static function intersect(Type ...$types): Type
 						if (array_key_exists($propertyName, $mergedProperties)) {
 							$intersectedPropertyType = self::intersect($mergedProperties[$propertyName], $propertyType);
 							if ($intersectedPropertyType instanceof NeverType) {
-								if (in_array($propertyName, $types[$j]->getOptionalProperties(), true)) {
+								if (
+									in_array($propertyName, $mergedOptionalProperties, true)
+									&& in_array($propertyName, $types[$j]->getOptionalProperties(), true)
+								) {
 									continue;
 								}
 
@@ -1339,6 +1342,36 @@ public static function intersect(Type ...$types): Type
 					continue;
 				}
 
+				if ($types[$i] instanceof ObjectShapeType && $types[$j] instanceof HasPropertyType) {
+					$propertyName = $types[$j]->getPropertyName();
+					if (!array_key_exists($propertyName, $types[$i]->getProperties())) {
+						$properties = $types[$i]->getProperties();
+						$properties[$propertyName] = new MixedType();
+						ksort($properties);
+						$types[$i] = new ObjectShapeType($properties, $types[$i]->getOptionalProperties());
+					} else {
+						$types[$i] = $types[$i]->makePropertyRequired($propertyName);
+					}
+					array_splice($types, $j--, 1);
+					$typesCount--;
+					continue;
+				}
+
+				if ($types[$j] instanceof ObjectShapeType && $types[$i] instanceof HasPropertyType) {
+					$propertyName = $types[$i]->getPropertyName();
+					if (!array_key_exists($propertyName, $types[$j]->getProperties())) {
+						$properties = $types[$j]->getProperties();
+						$properties[$propertyName] = new MixedType();
+						ksort($properties);
+						$types[$j] = new ObjectShapeType($properties, $types[$j]->getOptionalProperties());
+					} else {
+						$types[$j] = $types[$j]->makePropertyRequired($propertyName);
+					}
+					array_splice($types, $i--, 1);
+					$typesCount--;
+					continue 2;
+				}
+
 				if ($types[$j] instanceof IterableType) {
 					$isSuperTypeA = $types[$j]->isSuperTypeOfMixed($types[$i]);
 				} else {
@@ -1449,20 +1482,6 @@ public static function intersect(Type ...$types): Type
 						continue 2;
 					}
 
-					if ($types[$i] instanceof ObjectShapeType && $types[$j] instanceof HasPropertyType) {
-						$types[$i] = $types[$i]->makePropertyRequired($types[$j]->getPropertyName());
-						array_splice($types, $j--, 1);
-						$typesCount--;
-						continue;
-					}
-
-					if ($types[$j] instanceof ObjectShapeType && $types[$i] instanceof HasPropertyType) {
-						$types[$j] = $types[$j]->makePropertyRequired($types[$i]->getPropertyName());
-						array_splice($types, $i--, 1);
-						$typesCount--;
-						continue 2;
-					}
-
 					if ($types[$i] instanceof ConstantArrayType && ($types[$j] instanceof ArrayType || $types[$j] instanceof ConstantArrayType)) {
 						$newArray = ConstantArrayTypeBuilder::createEmpty();
 						$valueTypes = $types[$i]->getValueTypes();

tests/PHPStan/Type/TypeCombinatorTest.php

@@ -4632,8 +4632,8 @@ public static function dataIntersect(): iterable
 				new ObjectShapeType(['foo' => new IntegerType()], []),
 				new HasPropertyType('bar'),
 			],
-			NeverType::class,
-			'*NEVER*=implicit',
+			ObjectShapeType::class,
+			'object{bar: mixed, foo: int}',
 		];
 		yield [
 			[
@@ -4705,7 +4705,7 @@ public static function dataIntersect(): iterable
 				new ObjectShapeType(['foo' => new StringType()], ['foo']),
 			],
 			NeverType::class,
-			'object{foo: int}',
+			'*NEVER*=implicit',
 		];
 		yield [
 			[