Add params required for 7.1

src/Psalm/Type/Atomic.php

@@ -259,7 +259,7 @@ abstract class Atomic
     /**
      * @return string
      */
-    abstract public function getKey();
+    abstract public function getKey(bool $include_extra = true);
 
     /**
      * @return bool

src/Psalm/Type/Atomic/ObjectLike.php

@@ -296,7 +296,7 @@ class ObjectLike extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         /** @var string */
         return static::KEY;

src/Psalm/Type/Atomic/TArray.php

@@ -32,7 +32,7 @@ class TArray extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'array';
     }

src/Psalm/Type/Atomic/TArrayKey.php

@@ -11,7 +11,7 @@ class TArrayKey extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'array-key';
     }

src/Psalm/Type/Atomic/TAssertionFalsy.php

@@ -11,7 +11,7 @@ class TAssertionFalsy extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'falsy';
     }

src/Psalm/Type/Atomic/TBool.php

@@ -11,7 +11,7 @@ class TBool extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'bool';
     }

src/Psalm/Type/Atomic/TCallableObject.php

@@ -11,7 +11,7 @@ class TCallableObject extends TObject
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'callable-object';
     }

src/Psalm/Type/Atomic/TCallableString.php

@@ -6,7 +6,7 @@ class TCallableString extends TString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'callable-string';
     }

src/Psalm/Type/Atomic/TClassString.php

@@ -29,7 +29,7 @@ class TClassString extends TString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'class-string' . ($this->as === 'object' ? '' : '<' . $this->as_type . '>');
     }

src/Psalm/Type/Atomic/TClassStringMap.php

@@ -133,7 +133,7 @@ class TClassStringMap extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'array';
     }

src/Psalm/Type/Atomic/TClosedResource.php

@@ -14,7 +14,7 @@ class TClosedResource extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'closed-resource';
     }

src/Psalm/Type/Atomic/TEmpty.php

@@ -11,7 +11,7 @@ class TEmpty extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'empty';
     }

src/Psalm/Type/Atomic/TFalse.php

@@ -11,7 +11,7 @@ class TFalse extends TBool
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'false';
     }

src/Psalm/Type/Atomic/TFloat.php

@@ -11,7 +11,7 @@ class TFloat extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'float';
     }

src/Psalm/Type/Atomic/THtmlEscapedString.php

@@ -6,7 +6,7 @@ class THtmlEscapedString extends TString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'html-escaped-string';
     }

src/Psalm/Type/Atomic/TInt.php

@@ -11,7 +11,7 @@ class TInt extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'int';
     }

src/Psalm/Type/Atomic/TKeyOfClassConstant.php

@@ -27,7 +27,7 @@ class TKeyOfClassConstant extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'key-of<' . $this->fq_classlike_name . '::' . $this->const_name . '>';
     }

src/Psalm/Type/Atomic/TList.php

@@ -103,7 +103,7 @@ class TList extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'array';
     }

src/Psalm/Type/Atomic/TLiteralClassString.php

@@ -26,7 +26,7 @@ class TLiteralClassString extends TLiteralString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'class-string(' . $this->value . ')';
     }

src/Psalm/Type/Atomic/TLiteralFloat.php

@@ -17,7 +17,7 @@ class TLiteralFloat extends TFloat
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'float(' . $this->value . ')';
     }

src/Psalm/Type/Atomic/TLiteralInt.php

@@ -17,7 +17,7 @@ class TLiteralInt extends TInt
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'int(' . $this->value . ')';
     }

src/Psalm/Type/Atomic/TLiteralString.php

@@ -21,7 +21,7 @@ class TLiteralString extends TString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return $this->getId();
     }

src/Psalm/Type/Atomic/TLowercaseString.php

@@ -6,7 +6,7 @@ class TLowercaseString extends TString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'string';
     }

src/Psalm/Type/Atomic/TMixed.php

@@ -22,7 +22,7 @@ class TMixed extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'mixed';
     }

src/Psalm/Type/Atomic/TNever.php

@@ -11,7 +11,7 @@ class TNever extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'never-return';
     }

src/Psalm/Type/Atomic/TNull.php

@@ -11,7 +11,7 @@ class TNull extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'null';
     }

src/Psalm/Type/Atomic/TNumeric.php

@@ -11,7 +11,7 @@ class TNumeric extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'numeric';
     }

src/Psalm/Type/Atomic/TNumericString.php

@@ -6,7 +6,7 @@ class TNumericString extends TString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'numeric-string';
     }

src/Psalm/Type/Atomic/TObject.php

@@ -11,7 +11,7 @@ class TObject extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'object';
     }

src/Psalm/Type/Atomic/TResource.php

@@ -14,7 +14,7 @@ class TResource extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'resource';
     }

src/Psalm/Type/Atomic/TScalar.php

@@ -11,7 +11,7 @@ class TScalar extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'scalar';
     }

src/Psalm/Type/Atomic/TScalarClassConstant.php

@@ -25,7 +25,7 @@ class TScalarClassConstant extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'scalar-class-constant(' . $this->fq_classlike_name . '::' . $this->const_name . ')';
     }

src/Psalm/Type/Atomic/TString.php

@@ -11,7 +11,7 @@ class TString extends Scalar
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'string';
     }

src/Psalm/Type/Atomic/TTemplateIndexedAccess.php

@@ -31,7 +31,7 @@ class TTemplateIndexedAccess extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return $this->array_param_name . '[' . $this->offset_param_name . ']';
     }

src/Psalm/Type/Atomic/TTemplateKeyOf.php

@@ -33,7 +33,7 @@ class TTemplateKeyOf extends TArrayKey
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'key-of<' . $this->param_name . '>';
     }

src/Psalm/Type/Atomic/TTemplateParamClass.php

@@ -38,7 +38,7 @@ class TTemplateParamClass extends TClassString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'class-string<' . $this->param_name . '>';
     }

src/Psalm/Type/Atomic/TTraitString.php

@@ -6,7 +6,7 @@ class TTraitString extends TString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'trait-string';
     }

src/Psalm/Type/Atomic/TTrue.php

@@ -11,7 +11,7 @@ class TTrue extends TBool
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'true';
     }

src/Psalm/Type/Atomic/TValueOfClassConstant.php

@@ -22,7 +22,7 @@ class TValueOfClassConstant extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'value-of<' . $this->fq_classlike_name . '::' . $this->const_name . '>';
     }

src/Psalm/Type/Atomic/TVoid.php

@@ -11,7 +11,7 @@ class TVoid extends \Psalm\Type\Atomic
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'void';
     }

tests/Config/Plugin/Hook/StringProvider/TSqlSelectString.php

@@ -6,7 +6,7 @@ class TSqlSelectString extends \Psalm\Type\Atomic\TLiteralString
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(bool $include_extra = true)
     {
         return 'sql-select-string';
     }