Preserve from_docblock

vimeo · Dec 24, 2022 · cb9d1ed · cb9d1ed
1 parent 57d1bd4
commit cb9d1ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Psalm/Type/MutableUnion.php b/src/Psalm/Type/MutableUnion.php
@@ -234,7 +234,7 @@ public function setTypes(array $types): self
         $this->typed_class_strings = [];
         $this->checked = false;
 
-        $from_docblock = false;
+        $from_docblock = $this->from_docblock;
         $keyed_types = [];
 
         foreach ($types as $type) {

diff --git a/tests/TypeReconciliation/RedundantConditionTest.php b/tests/TypeReconciliation/RedundantConditionTest.php
@@ -1550,8 +1550,10 @@ function f(array $p) : void {
                 'code' => '<?php
                     /**
                      * @param array|null $value
+ *                   *
+ *                   * @return null
                      */
-                    function reverseTransform($value): null
+                    function reverseTransform($value)
                     {
                         if (null === $value) {
                             return null;