Real fix

vimeo · Dec 25, 2022 · a8ef02d · a8ef02d
1 parent ebd5727
commit a8ef02d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Psalm/Type/Atomic.php b/src/Psalm/Type/Atomic.php
@@ -162,7 +162,7 @@ public static function create(
         ?string $text = null,
         bool    $from_docblock = false
     ): Atomic {
-        $result = self::createInner($value, $analysis_php_version_id, $template_type_map, $type_aliases);
+        $result = self::createInner($value, $analysis_php_version_id, $template_type_map, $type_aliases, $from_docblock);
         $result->offset_start = $offset_start;
         $result->offset_end = $offset_end;
         $result->text = $text;

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 = $this->from_docblock;
+        $from_docblock = false;
         $keyed_types = [];
 
         foreach ($types as $type) {

diff --git a/tests/TypeReconciliation/RedundantConditionTest.php b/tests/TypeReconciliation/RedundantConditionTest.php
@@ -1085,7 +1085,7 @@ function takesA(A $a): void {}
                     /** @psalm-suppress PossiblyNullArgument */
                     takesA($a);
                     if ($a instanceof A) {}',
-                'error_message' => 'RedundantConditionGivenDocblockType - src' . DIRECTORY_SEPARATOR . 'somefile.php:15',
+                'error_message' => 'RedundantCondition - src' . DIRECTORY_SEPARATOR . 'somefile.php:15',
             ],
             'replaceFalseType' => [
                 'code' => '<?php