Fix wrong and inconsistent PHP native types in atomic

See https://www.php.net/manual/en/language.types.declarations.php
vimeo · May 5, 2024 · 611e6f8 · 611e6f8
1 parent 0294324
commit 611e6f8
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 9 deletions.
diff --git a/src/Psalm/Type/Atomic/TFalse.php b/src/Psalm/Type/Atomic/TFalse.php
@@ -9,16 +9,39 @@
  */
 final class TFalse extends TBool
 {
-    /** @var false */
+    /**
+     * @readonly
+     * @var false
+     */
     public $value = false;
 
     public function getKey(bool $include_extra = true): string
     {
         return 'false';
     }
 
+    /**
+     * @param  array<lowercase-string, string> $aliased_classes
+     */
+    public function toPhpString(
+        ?string $namespace,
+        array $aliased_classes,
+        ?string $this_class,
+        int $analysis_php_version_id
+    ): ?string {
+        if ($analysis_php_version_id >= 8_02_00) {
+            return $this->getKey();
+        }
+
+        if ($analysis_php_version_id >= 7_00_00) {
+            return 'bool';
+        }
+
+        return null;
+    }
+
     public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
     {
-        return false;
+        return $analysis_php_version_id >= 7_00_00;
     }
 }
diff --git a/src/Psalm/Type/Atomic/TIterable.php b/src/Psalm/Type/Atomic/TIterable.php
@@ -101,7 +101,9 @@ public function toPhpString(
 
     public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
     {
-        return $this->type_params[0]->isMixed() && $this->type_params[1]->isMixed();
+        return $analysis_php_version_id >= 7_01_00
+            && $this->type_params[0]->isMixed()
+            && $this->type_params[1]->isMixed();
     }
 
     public function equals(Atomic $other_type, bool $ensure_source_equality): bool

diff --git a/src/Psalm/Type/Atomic/TNull.php b/src/Psalm/Type/Atomic/TNull.php
@@ -25,11 +25,11 @@ public function toPhpString(
         ?string $this_class,
         int $analysis_php_version_id
     ): ?string {
-        return null;
+        return $analysis_php_version_id >= 8_02_00 ? $this->getKey() : null;
     }
 
     public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
     {
-        return false;
+        return $analysis_php_version_id >= 8_02_00;
     }
 }
diff --git a/src/Psalm/Type/Atomic/TObject.php b/src/Psalm/Type/Atomic/TObject.php
@@ -30,6 +30,6 @@ public function toPhpString(
 
     public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
     {
-        return true;
+        return $analysis_php_version_id >= 7_02_00;
     }
 }
diff --git a/src/Psalm/Type/Atomic/TTrue.php b/src/Psalm/Type/Atomic/TTrue.php
@@ -9,16 +9,39 @@
  */
 final class TTrue extends TBool
 {
-    /** @var true */
+    /**
+     * @readonly
+     * @var true
+     */
     public $value = true;
 
     public function getKey(bool $include_extra = true): string
     {
         return 'true';
     }
 
+    /**
+     * @param  array<lowercase-string, string> $aliased_classes
+     */
+    public function toPhpString(
+        ?string $namespace,
+        array $aliased_classes,
+        ?string $this_class,
+        int $analysis_php_version_id
+    ): ?string {
+        if ($analysis_php_version_id >= 8_02_00) {
+            return $this->getKey();
+        }
+
+        if ($analysis_php_version_id >= 7_00_00) {
+            return 'bool';
+        }
+
+        return null;
+    }
+
     public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
     {
-        return false;
+        return $analysis_php_version_id >= 7_00_00;
     }
 }
diff --git a/src/Psalm/Type/Atomic/TVoid.php b/src/Psalm/Type/Atomic/TVoid.php
@@ -30,6 +30,6 @@ public function toPhpString(
 
     public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
     {
-        return true;
+        return $analysis_php_version_id >= 7_01_00;
     }
 }
diff --git a/tests/FileManipulation/MissingReturnTypeTest.php b/tests/FileManipulation/MissingReturnTypeTest.php
@@ -897,6 +897,30 @@ function a(): ?bool {
                 'issues_to_fix' => ['MissingReturnType'],
                 'safe_types' => false,
             ],
+            'returnNullAndReturnTrueNative' => [
+                'input' => '<?php
+                    function a() {
+                        if (rand(0,1)){
+                            return true;
+                        }
+
+                        return null;
+                    }',
+                'output' => '<?php
+                    /**
+                     * @return null|true
+                     */
+                    function a(): ?true {
+                        if (rand(0,1)){
+                            return true;
+                        }
+
+                        return null;
+                    }',
+                'php_version' => '8.2',
+                'issues_to_fix' => ['MissingReturnType'],
+                'safe_types' => false,
+            ],
             'staticReturn5.6' => [
                 'input' => '<?php
                     class HelloWorld