Strict checks during intersection replacement

klimick · Oct 28, 2023 · b28a53b · b28a53b
1 parent 0d398a5
commit b28a53b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Psalm/Type/Atomic/TClosure.php b/src/Psalm/Type/Atomic/TClosure.php
@@ -67,7 +67,7 @@ public function replaceTemplateTypesWithArgTypes(
     ): self {
         $replaced = $this->replaceCallableTemplateTypesWithArgTypes($template_result, $codebase);
         $intersection = $this->replaceIntersectionTemplateTypesWithArgTypes($template_result, $codebase);
-        if (!$replaced && !$intersection) {
+        if ($replaced === null && $intersection === null) {
             return $this;
         }
         return new static(

diff --git a/src/Psalm/Type/Atomic/TGenericObject.php b/src/Psalm/Type/Atomic/TGenericObject.php
@@ -194,7 +194,7 @@ public function replaceTemplateTypesWithArgTypes(TemplateResult $template_result
             $template_result,
             $codebase,
         );
-        if (!$type_params && !$intersection) {
+        if ($type_params === null && $intersection === null) {
             return $this;
         }
         return new static(

diff --git a/src/Psalm/Type/Atomic/TNamedObject.php b/src/Psalm/Type/Atomic/TNamedObject.php
@@ -209,7 +209,7 @@ public function replaceTemplateTypesWithArgTypes(
         ?Codebase $codebase
     ): self {
         $intersection = $this->replaceIntersectionTemplateTypesWithArgTypes($template_result, $codebase);
-        if (!$intersection) {
+        if ($intersection === null) {
             return $this;
         }
         $cloned = clone $this;

diff --git a/src/Psalm/Type/Atomic/TObjectWithProperties.php b/src/Psalm/Type/Atomic/TObjectWithProperties.php
@@ -294,7 +294,7 @@ public function replaceTemplateTypesWithArgTypes(
             $template_result,
             $codebase,
         );
-        if ($properties === $this->properties && !$intersection) {
+        if ($properties === $this->properties && $intersection === null) {
             return $this;
         }
         return new static(

diff --git a/src/Psalm/Type/Atomic/TTemplateParam.php b/src/Psalm/Type/Atomic/TTemplateParam.php
@@ -154,7 +154,7 @@ public function replaceTemplateTypesWithArgTypes(
         ?Codebase $codebase
     ): self {
         $intersection = $this->replaceIntersectionTemplateTypesWithArgTypes($template_result, $codebase);
-        if (!$intersection) {
+        if ($intersection === null) {
             return $this;
         }
         $cloned = clone $this;