Better type annotations

leocavalcante · leocavalcante · commit 714904fe675a · 2020-01-03T01:52:09.000-03:00
diff --git a/src/Functional/Functional.php b/src/Functional/Functional.php
@@ -15,7 +15,7 @@
  * Identity function.
  *
  * @template T
- * @return Closure(mixed): mixed
+ * @return Closure(T): T
  */
 function identity(): Closure
 {
@@ -34,7 +34,7 @@ static function ($value) {
  *
  * @template T
  * @param T $value
- * @return Closure(): mixed
+ * @return Closure(): T
  */
 function always($value): Closure
 {
@@ -107,14 +107,14 @@ static function ($left) use ($right) {
  *
  * @param callable(mixed): bool $cond
  *
- * @return Closure(callable): Closure(callable): Closure(mixed): mixed
+ * @return Closure(callable(mixed):mixed):Closure(callable(mixed):mixed):Closure(mixed):mixed
  */
 function if_else(callable $cond): Closure
 {
     return
         /**
          * @param callable(mixed): mixed $then
-         * @return Closure(callable): Closure(mixed): mixed
+         * @return Closure(callable(mixed):mixed):Closure(mixed):mixed
          */
         static function (callable $then) use ($cond): Closure {
             return
@@ -156,7 +156,7 @@ static function ($value) use ($matches) {
                 return null;
             }
 
-            /** @var array<callable> $match */
+            /** @var array<callable(mixed):bool> $match */
             $match = $matches[0];
             $if_else = if_else($match[0])($match[1])(match(array_slice($matches, 1)));
 
diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -23,7 +23,8 @@
  */
 function raw(string $input = 'php://input'): string
 {
-    return (string)file_get_contents($input);
+    $contents = file_get_contents($input);
+    return $contents === false ? '' : $contents;
 }
 
 /**
@@ -359,8 +360,12 @@ function authorization_header($request = null): ?string
     if (Container\has(SWOOLE_HTTP_REQUEST)) {
         /** @var Request $request */
         $request = Container\get(SWOOLE_HTTP_REQUEST);
-        /** @var string|null */
-        return $request->header['authorization'] ?? null;
+        /**
+         * @psalm-suppress MissingPropertyType
+         * @var array<string, string> $request_header
+         */
+        $request_header = $request->header;
+        return $request_header['authorization'] ?? null;
     }
 
     if ($request instanceof ServerRequestInterface) {
diff --git a/src/Siler.php b/src/Siler.php
@@ -10,6 +10,7 @@
 /**
  * Get a value from an array checking if the key exists and returning a default value if not.
  *
+ * @psalm-suppress LessSpecificReturnType
  * @template T
  * @param array<string, T>|null $array
  * @param string|null $key The key to be searched
@@ -42,7 +43,7 @@ function array_get(?array $array, ?string $key = null, $default = null, bool $ca
  *
  * @return Closure
  *
- * @return Closure(array=):(false|mixed|null)
+ * @return Closure(string[]):(false|mixed|null)
  */
 function require_fn(string $filename): Closure
 {
diff --git a/src/Stratigility/RequestHandlerDecorator.php b/src/Stratigility/RequestHandlerDecorator.php
@@ -20,7 +20,7 @@ class RequestHandlerDecorator implements RequestHandlerInterface
     private $pathParams;
 
     /**
-     * @param callable $handler
+     * @param callable(ServerRequestInterface, array): ResponseInterface $handler
      * @param array $pathParams
      */
     public function __construct(callable $handler, array $pathParams = [])
diff --git a/src/Stratigility/Stratigility.php b/src/Stratigility/Stratigility.php
@@ -32,11 +32,16 @@ function process(ServerRequestInterface $request, string $name = DEFAULT_STRATIG
         throw new UnexpectedValueException("MiddlewarePipe with name $name not found");
     }
 
-    return function (callable $handler) use ($pipeline, $request) {
-        return function (array $pathParams) use ($pipeline, $request, $handler) {
-            return $pipeline->process($request, new RequestHandlerDecorator($handler, $pathParams));
+    return
+        /**
+         * @param callable(ServerRequestInterface, array): ResponseInterface $handler
+         * @return Closure
+         */
+        static function (callable $handler) use ($pipeline, $request) {
+            return static function (array $pathParams) use ($pipeline, $request, $handler) {
+                return $pipeline->process($request, new RequestHandlerDecorator($handler, $pathParams));
+            };
         };
-    };
 }
 
 /**
diff --git a/src/Swoole/Swoole.php b/src/Swoole/Swoole.php
@@ -432,7 +432,7 @@ function bearer(): ?string
  * Creates a HTTP server from a server port.
  *
  * @param Server $server
- * @param callable $handler
+ * @param callable(Request, Response):mixed $handler
  * @param int $port
  * @param string $host
  *

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* Identity function.`
`16`	`16`	`*`
`17`	`17`	`* @template T`
`18`		`- * @return Closure(mixed): mixed`
	`18`	`+ * @return Closure(T): T`
`19`	`19`	`*/`
`20`	`20`	`function identity(): Closure`
`21`	`21`	`{`
`@@ -34,7 +34,7 @@ static function ($value) {`
`34`	`34`	`*`
`35`	`35`	`* @template T`
`36`	`36`	`* @param T $value`
`37`		`- * @return Closure(): mixed`
	`37`	`+ * @return Closure(): T`
`38`	`38`	`*/`
`39`	`39`	`function always($value): Closure`
`40`	`40`	`{`
`@@ -107,14 +107,14 @@ static function ($left) use ($right) {`
`107`	`107`	`*`
`108`	`108`	`* @param callable(mixed): bool $cond`
`109`	`109`	`*`
`110`		`- * @return Closure(callable): Closure(callable): Closure(mixed): mixed`
	`110`	`+ * @return Closure(callable(mixed):mixed):Closure(callable(mixed):mixed):Closure(mixed):mixed`
`111`	`111`	`*/`
`112`	`112`	`function if_else(callable $cond): Closure`
`113`	`113`	`{`
`114`	`114`	`return`
`115`	`115`	`/**`
`116`	`116`	`* @param callable(mixed): mixed $then`
`117`		`- * @return Closure(callable): Closure(mixed): mixed`
	`117`	`+ * @return Closure(callable(mixed):mixed):Closure(mixed):mixed`
`118`	`118`	`*/`
`119`	`119`	`static function (callable $then) use ($cond): Closure {`
`120`	`120`	`return`
`@@ -156,7 +156,7 @@ static function ($value) use ($matches) {`
`156`	`156`	`return null;`
`157`	`157`	`}`
`158`	`158`
`159`		`- /** @var array<callable> $match */`
	`159`	`+ /** @var array<callable(mixed):bool> $match */`
`160`	`160`	`$match = $matches[0];`
`161`	`161`	`$if_else = if_else($match[0])($match[1])(match(array_slice($matches, 1)));`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`/**`
`11`	`11`	`* Get a value from an array checking if the key exists and returning a default value if not.`
`12`	`12`	`*`
	`13`	`+ * @psalm-suppress LessSpecificReturnType`
`13`	`14`	`* @template T`
`14`	`15`	`* @param array<string, T>\|null $array`
`15`	`16`	`* @param string\|null $key The key to be searched`
`@@ -42,7 +43,7 @@ function array_get(?array $array, ?string $key = null, $default = null, bool $ca`
`42`	`43`	`*`
`43`	`44`	`* @return Closure`
`44`	`45`	`*`
`45`		`- * @return Closure(array=):(false\|mixed\|null)`
	`46`	`+ * @return Closure(string[]):(false\|mixed\|null)`
`46`	`47`	`*/`
`47`	`48`	`function require_fn(string $filename): Closure`
`48`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ function bearer(): ?string`
`432`	`432`	`* Creates a HTTP server from a server port.`
`433`	`433`	`*`
`434`	`434`	`* @param Server $server`
`435`		`- * @param callable $handler`
	`435`	`+ * @param callable(Request, Response):mixed $handler`
`436`	`436`	`* @param int $port`
`437`	`437`	`* @param string $host`
`438`	`438`	`*`