Issue #1: Remove PSALM errors.

loophp · Jan 22, 2020 · 1abd2e1 · 1abd2e1
1 parent 49c04b3
commit 1abd2e1
Show file tree

Hide file tree

Showing 24 changed files with 83 additions and 42 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -12,44 +12,4 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
-
-    <issueHandlers>
-        <LessSpecificReturnType errorLevel="info" />
-
-        <!-- level 3 issues - slightly lazy code writing, but provably low false-negatives -->
-
-        <DeprecatedMethod errorLevel="info" />
-        <DeprecatedProperty errorLevel="info" />
-        <DeprecatedClass errorLevel="info" />
-        <DeprecatedConstant errorLevel="info" />
-        <DeprecatedFunction errorLevel="info" />
-        <DeprecatedInterface errorLevel="info" />
-        <DeprecatedTrait errorLevel="info" />
-
-        <InternalMethod errorLevel="info" />
-        <InternalProperty errorLevel="info" />
-        <InternalClass errorLevel="info" />
-
-        <MissingClosureReturnType errorLevel="info" />
-        <MissingReturnType errorLevel="info" />
-        <MissingPropertyType errorLevel="info" />
-        <InvalidDocblock errorLevel="info" />
-        <MisplacedRequiredParam errorLevel="info" />
-
-        <PropertyNotSetInConstructor errorLevel="info" />
-        <MissingConstructor errorLevel="info" />
-        <MissingClosureParamType errorLevel="info" />
-        <MissingParamType errorLevel="info" />
-
-        <RedundantCondition errorLevel="info" />
-
-        <DocblockTypeContradiction errorLevel="info" />
-        <RedundantConditionGivenDocblockType errorLevel="info" />
-
-        <UnresolvableInclude errorLevel="info" />
-
-        <RawObjectIteration errorLevel="info" />
-
-        <InvalidStringClass errorLevel="info" />
-    </issueHandlers>
 </psalm>
diff --git a/src/Combinator/A.php b/src/Combinator/A.php
@@ -57,6 +57,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, $x): Closure {
             return Closure::fromCallable([(new self($f, $x)), '__invoke']);
         };

diff --git a/src/Combinator/B.php b/src/Combinator/B.php
@@ -64,6 +64,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, callable $g, $x): Closure {
             return Closure::fromCallable([(new self($f, $g, $x)), '__invoke']);
         };

diff --git a/src/Combinator/C.php b/src/Combinator/C.php
@@ -63,6 +63,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, $x, $y): Closure {
             return Closure::fromCallable([(new self($f, $x, $y)), '__invoke']);
         };

diff --git a/src/Combinator/D.php b/src/Combinator/D.php
@@ -71,6 +71,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, $x, callable $g, $y): Closure {
             return Closure::fromCallable([(new self($f, $x, $g, $y)), '__invoke']);
         };

diff --git a/src/Combinator/E.php b/src/Combinator/E.php
@@ -79,6 +79,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, $x, callable $g, $y, $z): Closure {
             return Closure::fromCallable([(new self($f, $x, $g, $y, $z)), '__invoke']);
         };

diff --git a/src/Combinator/F.php b/src/Combinator/F.php
@@ -63,6 +63,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function ($x, $y, callable $f): Closure {
             return Closure::fromCallable([(new self($x, $y, $f)), '__invoke']);
         };

diff --git a/src/Combinator/G.php b/src/Combinator/G.php
@@ -71,6 +71,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, callable $g, $x, $y): Closure {
             return Closure::fromCallable([(new self($f, $g, $x, $y)), '__invoke']);
         };

diff --git a/src/Combinator/H.php b/src/Combinator/H.php
@@ -53,7 +53,7 @@ public function __construct(callable $f, $x, $y)
      */
     public function __invoke()
     {
-        return ( (($this->f)($this->x)) ($this->y) )($this->x);
+        return ((($this->f)($this->x))($this->y))($this->x);
     }
 
     /**
@@ -63,6 +63,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, $x, $y): Closure {
             return Closure::fromCallable([(new self($f, $x, $y)), '__invoke']);
         };

diff --git a/src/Combinator/I.php b/src/Combinator/I.php
@@ -47,6 +47,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function ($x): Closure {
             return Closure::fromCallable([(new self($x)), '__invoke']);
         };

diff --git a/src/Combinator/J.php b/src/Combinator/J.php
@@ -71,6 +71,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, $x, $y, $z): Closure {
             return Closure::fromCallable([(new self($f, $x, $y, $z)), '__invoke']);
         };

diff --git a/src/Combinator/K.php b/src/Combinator/K.php
@@ -55,6 +55,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function ($x, $y): Closure {
             return Closure::fromCallable([(new self($x, $y)), '__invoke']);
         };

diff --git a/src/Combinator/L.php b/src/Combinator/L.php
@@ -53,6 +53,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, callable $g): Closure {
             return Closure::fromCallable([(new self($f, $g)), '__invoke']);
         };

diff --git a/src/Combinator/M.php b/src/Combinator/M.php
@@ -46,6 +46,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f): Closure {
             return Closure::fromCallable([(new self($f)), '__invoke']);
         };

diff --git a/src/Combinator/O.php b/src/Combinator/O.php
@@ -51,6 +51,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, callable $g): Closure {
             return Closure::fromCallable([(new self($f, $g)), '__invoke']);
         };

diff --git a/src/Combinator/Psi.php b/src/Combinator/Psi.php
@@ -71,6 +71,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, callable $g, $x, $y): Closure {
             return Closure::fromCallable([(new self($f, $g, $x, $y)), '__invoke']);
         };

diff --git a/src/Combinator/Q.php b/src/Combinator/Q.php
@@ -63,6 +63,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, callable $g, $x): Closure {
             return Closure::fromCallable([(new self($f, $g, $x)), '__invoke']);
         };

diff --git a/src/Combinator/R.php b/src/Combinator/R.php
@@ -63,6 +63,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function ($x, callable $f, $y): Closure {
             return Closure::fromCallable([(new self($x, $f, $y)), '__invoke']);
         };

diff --git a/src/Combinator/S.php b/src/Combinator/S.php
@@ -63,6 +63,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, callable $g, $x): Closure {
             return Closure::fromCallable([(new self($f, $g, $x)), '__invoke']);
         };

diff --git a/src/Combinator/T.php b/src/Combinator/T.php
@@ -55,6 +55,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function ($x, callable $f): Closure {
             return Closure::fromCallable([(new self($x, $f)), '__invoke']);
         };

diff --git a/src/Combinator/U.php b/src/Combinator/U.php
@@ -57,6 +57,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, callable $g): Closure {
             return Closure::fromCallable([(new self($f, $g)), '__invoke']);
         };

diff --git a/src/Combinator/V.php b/src/Combinator/V.php
@@ -63,6 +63,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function ($x, $y, callable $f): Closure {
             return Closure::fromCallable([(new self($x, $y, $f)), '__invoke']);
         };

diff --git a/src/Combinator/W.php b/src/Combinator/W.php
@@ -55,6 +55,9 @@ public function __invoke()
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f, $x): Closure {
             return Closure::fromCallable([(new self($f, $x)), '__invoke']);
         };

diff --git a/src/Combinator/Y.php b/src/Combinator/Y.php
@@ -38,8 +38,20 @@ public function __invoke()
     {
         $callable = $this->f;
 
-        $f = static function (callable $f) use ($callable): Closure {
+        /**
+         * @psalm-suppress MissingClosureReturnType
+         *
+         * @param callable $f
+         *
+         * @return mixed
+         */
+        $f = static function (callable $f) use ($callable) {
             return $callable(
+                /**
+                 * @psalm-suppress MissingClosureParamType
+                 *
+                 * @param array $arguments
+                 */
                 static function (...$arguments) use ($f) {
                     return $f($f)(...$arguments);
                 }
@@ -56,6 +68,9 @@ static function (...$arguments) use ($f) {
      */
     public static function closure(): Closure
     {
+        /**
+         * @psalm-suppress MissingClosureParamType
+         */
         return static function (callable $f): callable {
             return Closure::fromCallable([(new self($f)), '__invoke']);
         };