namespaced constants

Author: devosc

src/About/Explore/Controller.php

@@ -5,11 +5,12 @@
 
 namespace About\Explore;
 
-use Mvc5\Arg;
 use Mvc5\Http\Request;
 use Mvc5\Http\Response;
 use Mvc5\Plugins;
 
+use const Mvc5\{ BODY, CHILD_MODEL };
+
 class Controller
 {
     /**
@@ -27,8 +28,8 @@ class Controller
      */
     function __invoke(Request $request, Response $response, callable $next) : Response
     {
-        $layout = $this->layout([Arg::CHILD_MODEL => $this->view('about/explore')]);
+        $layout = $this->layout([CHILD_MODEL => $this->view('about/explore')]);
 
-        return $next($request, $response->with(Arg::BODY, $this->render($layout)));
+        return $next($request, $response->with(BODY, $this->render($layout)));
     }
 }

src/Login/Controller.php

@@ -5,7 +5,6 @@
 
 namespace Login;
 
-use Mvc5\Arg;
 use Mvc5\Plugins;
 use Mvc5\Request\Request;
 use Mvc5\Response\HttpResponse;
@@ -14,6 +13,8 @@
 use Mvc5\User\User;
 use Mvc5\View;
 
+use const Mvc5\{ SESSION, USER };
+
 class Controller
 {
     /**
@@ -78,6 +79,6 @@ protected function login(Request $request, Session $session, User $user)
      */
     function __invoke(Request $request)
     {
-        return $this->login($request, $request[Arg::SESSION], $request[Arg::USER]);
+        return $this->login($request, $request[SESSION], $request[USER]);
     }
 }

src/Middleware/Authenticate.php

@@ -5,11 +5,12 @@
 
 namespace Middleware;
 
-use Mvc5\Arg;
 use Mvc5\Plugins;
 use Mvc5\Http\Request;
 use Psr\Http\Message\ResponseInterface as Response;
 
+use const Mvc5\USER;
+
 class Authenticate
 {
     /**
@@ -27,7 +28,7 @@ class Authenticate
      */
     function __invoke(Request $request, Response $response, callable $next) : Response
     {
-        return $request[Arg::USER]->authenticated()
+        return $request[USER]->authenticated()
             ? $next($request, $response) : $this->redirect($this->url(['app', 'controller' => 'login']));
     }
 }

src/Middleware/Authorize.php

@@ -5,11 +5,12 @@
 
 namespace Middleware;
 
-use Mvc5\Arg;
 use Mvc5\Plugins;
 use Mvc5\Http\Request;
 use Psr\Http\Message\ResponseInterface as Response;
 
+use const Mvc5\USER;
+
 class Authorize
 {
     /**
@@ -37,6 +38,6 @@ protected function error() : Response
      */
     function __invoke(Request $request, Response $response, callable $next) : Response
     {
-        return 'phpdev' === $request[Arg::USER]->username() ? $next($request, $response) : $this->error();
+        return 'phpdev' === $request[USER]->username() ? $next($request, $response) : $this->error();
     }
 }

src/Plugin/Page.php

@@ -5,12 +5,13 @@
 
 namespace Plugin;
 
-use Mvc5\Arg;
 use Mvc5\Http\Request;
 use Mvc5\Plugin\Call;
 use Mvc5\Plugin\Invoke;
 use Mvc5\Plugin\Plugin;
 
+use const Mvc5\{ REQUEST, VIEW_MODEL };
+
 class Page
     extends Call
 {
@@ -31,6 +32,6 @@ function __construct(string $template, array $vars = [])
     function __invoke(string $template, array $vars) : Invoke
     {
         return new Invoke(fn(Request $request) =>
-            new Plugin(Arg::VIEW_MODEL, [$template, $vars + [Arg::REQUEST => $request]]));
+            new Plugin(VIEW_MODEL, [$template, $vars + [REQUEST => $request]]));
     }
 }

src/Plugin/Redirect.php

@@ -5,12 +5,13 @@
 
 namespace Plugin;
 
-use Mvc5\Arg;
 use Mvc5\Http\Request;
 use Mvc5\Plugin\Call;
 use Mvc5\Plugin\Invoke;
 use Mvc5\Plugin\Plugin;
 
+use const Mvc5\RESPONSE_REDIRECT;
+
 class Redirect
     extends Call
 {
@@ -32,7 +33,6 @@ function __construct(string $url, int $status = 302, array $headers = [])
      */
     function __invoke(string $url, int $status, array $headers) : Invoke
     {
-        return new Invoke(fn(Request $request) =>
-            new Plugin(Arg::RESPONSE_REDIRECT, [$url, $status, $headers]));
+        return new Invoke(fn(Request $request) => new Plugin(RESPONSE_REDIRECT, [$url, $status, $headers]));
     }
 }