ambiguous php version checks (#4331)

vimeo · Oct 15, 2020 · 849d253 · 849d253
1 parent 6324ffd
commit 849d253
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/Psalm/Type/Atomic/TAnonymousClassInstance.php b/src/Psalm/Type/Atomic/TAnonymousClassInstance.php
@@ -10,7 +10,9 @@ public function toPhpString(
         int $php_major_version,
         int $php_minor_version
     ): ?string {
-        return $php_major_version >= 7 && $php_minor_version >= 2 ? 'object' : null;
+        return $php_major_version > 7
+            || ($php_major_version === 7 && $php_minor_version >= 2)
+            ? 'object' : null;
     }
 
     /**

diff --git a/src/Psalm/Type/Atomic/TCallableObject.php b/src/Psalm/Type/Atomic/TCallableObject.php
@@ -23,7 +23,9 @@ public function toPhpString(
         int $php_major_version,
         int $php_minor_version
     ): ?string {
-        return $php_major_version >= 7 && $php_minor_version >= 2 ? 'object' : null;
+        return $php_major_version > 7
+            || ($php_major_version === 7 && $php_minor_version >= 2)
+            ? 'object' : null;
     }
 
     public function canBeFullyExpressedInPhp(): bool

diff --git a/src/Psalm/Type/Atomic/TVoid.php b/src/Psalm/Type/Atomic/TVoid.php
@@ -23,7 +23,9 @@ public function toPhpString(
         int $php_major_version,
         int $php_minor_version
     ): ?string {
-        return $php_major_version >= 7 && $php_minor_version >= 1 ? $this->getKey() : null;
+        return $php_major_version > 7
+            || ($php_major_version === 7 && $php_minor_version >= 1)
+            ? $this->getKey() : null;
     }
 
     public function canBeFullyExpressedInPhp(): bool

diff --git a/src/Psalm/Type/Union.php b/src/Psalm/Type/Union.php
@@ -452,7 +452,7 @@ public function toPhpString(
 
         if (!$this->isSingleAndMaybeNullable()
             || $php_major_version < 7
-            || (isset($this->types['null']) && $php_minor_version < 1)
+            || (isset($this->types['null']) && $php_major_version === 7 && $php_minor_version < 1)
         ) {
             return null;
         }