Use objects, not strings, for assertions

src/Psalm/Storage/Assertion/IsIdentical.php

@@ -22,7 +22,7 @@ public function getNegation(): Assertion
 
     public function __toString(): string
     {
-        return '=' . $this->type->getAssertionString(true);
+        return '=' . $this->type->getAssertionString();
     }
 
     /** @psalm-mutation-free */

src/Psalm/Storage/Assertion/IsLooselyEqual.php

@@ -22,7 +22,7 @@ public function getNegation(): Assertion
 
     public function __toString(): string
     {
-        return '~' . $this->type->getAssertionString(true);
+        return '~' . $this->type->getAssertionString();
     }
 
     /** @psalm-mutation-free */

src/Psalm/Storage/Assertion/IsNotIdentical.php

@@ -33,7 +33,7 @@ public function hasEquality(): bool
 
     public function __toString(): string
     {
-        return '!=' . $this->type->getAssertionString(true);
+        return '!=' . $this->type->getAssertionString();
     }
 
     /** @psalm-mutation-free */

src/Psalm/Storage/Assertion/IsNotLooselyEqual.php

@@ -33,7 +33,7 @@ public function hasEquality(): bool
 
     public function __toString(): string
     {
-        return '!~' . $this->type->getAssertionString(true);
+        return '!~' . $this->type->getAssertionString();
     }
 
     /** @psalm-mutation-free */

src/Psalm/Type/Atomic.php

@@ -568,7 +568,7 @@ public function getId(bool $nested = false): string
         return $this->__toString();
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return $this->getId();
     }

src/Psalm/Type/Atomic/TArray.php

@@ -83,13 +83,13 @@ public function equals(Atomic $other_type, bool $ensure_source_equality): bool
         return true;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
-        if (!$exact || $this->type_params[1]->isMixed()) {
+        if ($this->type_params[0]->isMixed() && $this->type_params[1]->isMixed()) {
             return 'array';
         }
 
-        return $this->toNamespacedString(null, [], null, false);
+        return $this->getId();
     }
 
     public function isEmptyArray(): bool

src/Psalm/Type/Atomic/TCallableObject.php

@@ -34,7 +34,9 @@ public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
         return false;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return 'object';
     }

src/Psalm/Type/Atomic/TCallableString.php

@@ -23,7 +23,9 @@ public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
         return false;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return 'string';
     }

src/Psalm/Type/Atomic/TClassConstant.php

@@ -37,7 +37,9 @@ public function getId(bool $nested = false): string
         return $this->fq_classlike_name . '::' . $this->const_name;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return 'class-constant(' . $this->fq_classlike_name . '::' . $this->const_name . ')';
     }

src/Psalm/Type/Atomic/TClassString.php

@@ -63,7 +63,9 @@ public function getId(bool $nested = false): string
             . '-string' . ($this->as === 'object' ? '' : '<' . $this->as_type . '>');
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return 'class-string';
     }

src/Psalm/Type/Atomic/TClassStringMap.php

@@ -231,7 +231,9 @@ public function equals(Atomic $other_type, bool $ensure_source_equality): bool
         return true;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return $this->getKey();
     }

src/Psalm/Type/Atomic/TConditional.php

@@ -82,7 +82,9 @@ public function getKey(bool $include_extra = true): string
         return $this->__toString();
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return '';
     }

src/Psalm/Type/Atomic/TDependentListKey.php

@@ -34,7 +34,9 @@ public function getVarId(): string
         return $this->var_id;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return 'int';
     }

src/Psalm/Type/Atomic/TGenericObject.php

@@ -98,7 +98,9 @@ public function equals(Atomic $other_type, bool $ensure_source_equality): bool
         return true;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return $this->value;
     }

src/Psalm/Type/Atomic/TIterable.php

@@ -56,7 +56,9 @@ public function getKey(bool $include_extra = true): string
         return 'iterable';
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return 'iterable';
     }

src/Psalm/Type/Atomic/TKeyOfClassConstant.php

@@ -97,7 +97,9 @@ public function toNamespacedString(
         return 'key-of<\\' . $this->fq_classlike_name . '::' . $this->const_name . '>';
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return 'mixed';
     }

src/Psalm/Type/Atomic/TKeyedArray.php

@@ -409,7 +409,9 @@ public function equals(Atomic $other_type, bool $ensure_source_equality): bool
         return true;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return $this->getKey();
     }

src/Psalm/Type/Atomic/TList.php

@@ -197,13 +197,13 @@ public function equals(Atomic $other_type, bool $ensure_source_equality): bool
         return true;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
-        if (!$exact || $this->type_param->isMixed()) {
+        if ($this->type_param->isMixed()) {
             return 'list';
         }
 
-        return $this->toNamespacedString(null, [], null, false);
+        return $this->getId();
     }
 
     public function getChildNodes(): array

src/Psalm/Type/Atomic/TLiteralClassString.php

@@ -57,7 +57,9 @@ public function getId(bool $nested = false): string
         return $this->value . '::class';
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString()
+
+    /** @psalm-mutation-free */: string
     {
         return $this->getKey();
     }

src/Psalm/Type/Atomic/TLiteralInt.php

@@ -25,7 +25,7 @@ public function getId(bool $nested = false): string
         return (string) $this->value;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'int(' . $this->value . ')';
     }

src/Psalm/Type/Atomic/TLiteralString.php

@@ -35,7 +35,7 @@ public function getId(bool $nested = false): string
         return '"' . $no_newline_value . '"';
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'string(' . $this->value . ')';
     }

src/Psalm/Type/Atomic/TMixed.php

@@ -44,7 +44,7 @@ public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
         return $analysis_php_version_id >= 8_00_00;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'mixed';
     }

src/Psalm/Type/Atomic/TNonEmptyList.php

@@ -19,7 +19,7 @@ class TNonEmptyList extends TList
 
     public const KEY = 'non-empty-list';
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'non-empty-list';
     }

src/Psalm/Type/Atomic/TNonspecificLiteralInt.php

@@ -18,7 +18,7 @@ public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
         return false;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'int';
     }

src/Psalm/Type/Atomic/TNonspecificLiteralString.php

@@ -18,7 +18,7 @@ public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
         return false;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'string';
     }

src/Psalm/Type/Atomic/TNumericString.php

@@ -27,7 +27,7 @@ public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
         return false;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'string';
     }

src/Psalm/Type/Atomic/TObjectWithProperties.php

@@ -265,7 +265,7 @@ public function getChildNodes(): array
         return array_merge($this->properties, $this->extra_types !== null ? array_values($this->extra_types) : []);
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return $this->getKey();
     }

src/Psalm/Type/Atomic/TScalar.php

@@ -35,7 +35,7 @@ public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
         return false;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'scalar';
     }

src/Psalm/Type/Atomic/TTemplateParam.php

@@ -53,7 +53,7 @@ public function getKey(bool $include_extra = true): string
         return $this->param_name . ':' . $this->defining_class;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return $this->as->getId();
     }

src/Psalm/Type/Atomic/TTemplateParamClass.php

@@ -45,7 +45,7 @@ public function getId(bool $nested = false): string
             . ' as ' . ($this->as_type ? $this->as_type->getId() : $this->as) . '>';
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'class-string<' . $this->param_name . '>';
     }

src/Psalm/Type/Atomic/TTypeAlias.php

@@ -78,7 +78,7 @@ public function canBeFullyExpressedInPhp(int $analysis_php_version_id): bool
         return false;
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'mixed';
     }

src/Psalm/Type/Atomic/TValueOfClassConstant.php

@@ -72,7 +72,7 @@ public function toNamespacedString(
             . '>::' . $this->const_name . '>';
     }
 
-    public function getAssertionString(bool $exact = false): string
+    public function getAssertionString(): string
     {
         return 'mixed';
     }