arrow functions

Author: devosc

src/Plugin/AcceptsJson.php

@@ -47,8 +47,6 @@ static function match(?string $accept) : bool
      */
     function __invoke() : \Closure
     {
-        return function() {
-            return AcceptsJson::match(AcceptsJson::header($this[Arg::HEADERS]['accept']));
-        };
+        return fn() => AcceptsJson::match(AcceptsJson::header($this[Arg::HEADERS]['accept']));
     }
 }

src/Plugin/Authenticated.php

@@ -25,8 +25,6 @@ function __construct(string $name = 'authenticated')
      */
     function __invoke() : \Closure
     {
-        return function() {
-            return $this[Arg::USER][Arg::AUTHENTICATED] ?? false;
-        };
+        return fn() => $this[Arg::USER][Arg::AUTHENTICATED] ?? false;
     }
 }

src/Plugin/Body.php

@@ -25,8 +25,6 @@ function __construct(string $name = 'body')
      */
     function __invoke() : \Closure
     {
-        return function() {
-            return new PhpInputStream;
-        };
+        return fn() => new PhpInputStream;
     }
 }

src/Plugin/ClientAddress.php

@@ -34,8 +34,6 @@ static function ipAddress(array $server) : string
      */
     function __invoke() : \Closure
     {
-        return function() {
-            return ClientAddress::ipAddress($this[Arg::SERVER]);
-        };
+        return fn() => ClientAddress::ipAddress($this[Arg::SERVER]);
     }
 }

src/Plugin/Cookies.php

@@ -28,10 +28,8 @@ function __construct(string $name = 'cookies')
      */
     function __invoke() : \Closure
     {
-        return function() {
-            return new HttpCookies(
+        return fn() => new HttpCookies(
                 isset($this[Arg::HEADERS]['cookie']) ? parseCookieHeader($this[Arg::HEADERS]['cookie']) : $_COOKIE
-            );
-        };
+        );
     }
 }

src/Plugin/Data.php

@@ -62,9 +62,7 @@ static function result($result) : array
      */
     function __invoke() : \Closure
     {
-        return function() {
-            return Data::isJson($this[Arg::HEADERS]['content-type']) ?
+        return fn() => Data::isJson($this[Arg::HEADERS]['content-type']) ?
                 Data::decode((string) $this[Arg::BODY]) : new GlobalVar('_POST');
-        };
     }
 }

src/Plugin/Headers.php

@@ -55,8 +55,6 @@ protected static function hostAndPortFromServer(array $server) : string
      */
     function __invoke() : \Closure
     {
-        return function() {
-            return Headers::headersFromServer($this[Arg::SERVER]);
-        };
+        return fn() => Headers::headersFromServer($this[Arg::SERVER]);
     }
 }

src/Plugin/Method.php

@@ -27,11 +27,8 @@ function __construct(string $name = 'method')
      */
     function __invoke() : \Closure
     {
-        return function() {
-            /** @var \Valar\ServerRequest $this */
-            return strtoupper(
+        return fn() => strtoupper(
                 $this[Arg::HEADERS]['X-HTTP-METHOD-OVERRIDE'] ?? ($this[Arg::SERVER]['REQUEST_METHOD'] ?? 'GET')
-            );
-        };
+        );
     }
 }

src/Plugin/Session.php

@@ -24,9 +24,6 @@ function __construct(string $name = 'session')
      */
     function __invoke() : \Closure
     {
-        return function() {
-            /** @var \Valar\ServerRequest $this */
-            return $this->service ? $this->service->plugin('session') : null;
-        };
+        return fn() => $this->service ? $this->service->plugin('session') : null;
     }
 }

src/Plugin/Uri.php

@@ -51,8 +51,6 @@ static function uri(array $server, Headers $headers) : HttpUri
      */
     function __invoke() : \Closure
     {
-        return function() {
-            return Uri::uri($this[Arg::SERVER], $this[Arg::HEADERS]);
-        };
+        return fn() => Uri::uri($this[Arg::SERVER], $this[Arg::HEADERS]);
     }
 }