Try to improve traverseSimultaneously

Author: VincentLanglet

src/Type/IntersectionType.php

@@ -1260,13 +1260,17 @@ public function traverse(callable $cb): Type
 
 	public function traverseSimultaneously(Type $right, callable $cb): Type
 	{
-		if ($this->isArray()->yes() && $right->isArray()->yes()) {
+		if ($this->isArray()->yes() && !$right->isArray()->no()) {
+			$rightArray = $right->isArray()->maybe()
+				? TypeCombinator::intersect($right, new ArrayType(new MixedType(), new MixedType()))
+				: $right;
+
 			$changed = false;
 			$newTypes = [];
 
 			foreach ($this->types as $innerType) {
-				$newKeyType = $cb($innerType->getIterableKeyType(), $right->getIterableKeyType());
-				$newValueType = $cb($innerType->getIterableValueType(), $right->getIterableValueType());
+				$newKeyType = $cb($innerType->getIterableKeyType(), $rightArray->getIterableKeyType());
+				$newValueType = $cb($innerType->getIterableValueType(), $rightArray->getIterableValueType());
 				if ($newKeyType === $innerType->getIterableKeyType() && $newValueType === $innerType->getIterableValueType()) {
 					$newTypes[] = $innerType;
 					continue;

src/Type/ObjectType.php

@@ -1690,11 +1690,21 @@ public function traverse(callable $cb): Type
 
 	public function traverseSimultaneously(Type $right, callable $cb): Type
 	{
-		if ($this->subtractedType === null) {
+		if (!$right instanceof SubtractableType) {
+			return $this;
+		}
+
+		$rightSubtractable = $right->getSubtractedType();
+		if ($this->subtractedType === null || $rightSubtractable === null) {
 			return $this;
 		}
 
-		return new self($this->className);
+		$newSubtractedType = $cb($this->subtractedType, $rightSubtractable);
+		if ($newSubtractedType !== $this->subtractedType) {
+			return new self($this->className, $newSubtractedType);
+		}
+
+		return $this;
 	}
 
 	public function getNakedClassReflection(): ?ClassReflection

src/Type/ObjectWithoutClassType.php

@@ -170,11 +170,21 @@ public function traverse(callable $cb): Type
 
 	public function traverseSimultaneously(Type $right, callable $cb): Type
 	{
-		if ($this->subtractedType === null) {
+		if (!$right instanceof SubtractableType) {
 			return $this;
 		}
 
-		return new self();
+		$rightSubtractable = $right->getSubtractedType();
+		if ($this->subtractedType === null || $rightSubtractable === null) {
+			return $this;
+		}
+
+		$newSubtractedType = $cb($this->subtractedType, $rightSubtractable);
+		if ($newSubtractedType !== $this->subtractedType) {
+			return new self($newSubtractedType);
+		}
+
+		return $this;
 	}
 
 	public function tryRemove(Type $typeToRemove): ?Type

src/Type/StaticType.php

@@ -745,11 +745,21 @@ public function traverse(callable $cb): Type
 
 	public function traverseSimultaneously(Type $right, callable $cb): Type
 	{
-		if ($this->subtractedType === null) {
+		if (!$right instanceof SubtractableType) {
 			return $this;
 		}
 
-		return new self($this->classReflection);
+		$rightSubtractable = $right->getSubtractedType();
+		if ($this->subtractedType === null || $rightSubtractable === null) {
+			return $this;
+		}
+
+		$newSubtractedType = $cb($this->subtractedType, $rightSubtractable);
+		if ($newSubtractedType !== $this->subtractedType) {
+			return new self($this->classReflection, $newSubtractedType);
+		}
+
+		return $this;
 	}
 
 	public function subtract(Type $type): Type