Better StaticType::traverse()

ondrejmirtes · ondrejmirtes · commit 0e257067ff92 · 2022-07-12T10:53:51.000+02:00
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -399,6 +399,15 @@ public function toBoolean(): BooleanType
 
 	public function traverse(callable $cb): Type
 	{
+		$subtractedType = $this->subtractedType !== null ? $cb($this->subtractedType) : null;
+
+		if ($subtractedType !== $this->subtractedType) {
+			return new self(
+				$this->classReflection,
+				$subtractedType,
+			);
+		}
+
 		return $this;
 	}
 
diff --git a/src/Type/ThisType.php b/src/Type/ThisType.php
@@ -57,6 +57,20 @@ public function changeSubtractedType(?Type $subtractedType): Type
 		return $type;
 	}
 
+	public function traverse(callable $cb): Type
+	{
+		$subtractedType = $this->getSubtractedType() !== null ? $cb($this->getSubtractedType()) : null;
+
+		if ($subtractedType !== $this->getSubtractedType()) {
+			return new self(
+				$this->getClassReflection(),
+				$subtractedType,
+			);
+		}
+
+		return $this;
+	}
+
 	/**
 	 * @param mixed[] $properties
 	 */

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,15 @@ public function toBoolean(): BooleanType`
`399`	`399`
`400`	`400`	`public function traverse(callable $cb): Type`
`401`	`401`	`{`
	`402`	`+ $subtractedType = $this->subtractedType !== null ? $cb($this->subtractedType) : null;`
	`403`	`+`
	`404`	`+ if ($subtractedType !== $this->subtractedType) {`
	`405`	`+ return new self(`
	`406`	`+ $this->classReflection,`
	`407`	`+ $subtractedType,`
	`408`	`+ );`
	`409`	`+ }`
	`410`	`+`
`402`	`411`	`return $this;`
`403`	`412`	`}`
`404`	`413`