Refactor directory

Author: wilcorrea

src/Controller.php

@@ -3,6 +3,7 @@
 namespace Simples\Http;
 
 use Simples\Kernel\App;
+use Simples\Http\Kernel\App as Http;
 use Simples\Route\Match;
 
 /**
@@ -115,6 +116,9 @@ abstract protected function answer($content = null, $meta = [], $code = 200) : R
      */
     final protected function request()
     {
+        if (!$this->request) {
+            $this->request = Http::request();
+        }
         return $this->request;
     }
 
@@ -123,6 +127,9 @@ final protected function request()
      */
     final protected function response()
     {
+        if (!$this->response) {
+            $this->response = Http::response();
+        }
         return $this->response;
     }
 

src/Kernel/App.php

@@ -3,6 +3,7 @@
 namespace Simples\Http\Kernel;
 
 use ErrorException;
+use Simples\Http\Response;
 use Simples\Kernel\App as Kernel;
 use Simples\Http\Request;
 use Simples\Kernel\Container;
@@ -78,4 +79,18 @@ public static function route($uri)
     {
         return '//' . self::request()->getUrl() . '/' . ($uri{0} === '/' ? substr($uri, 1) : $uri);
     }
+
+    /**
+     * Singleton to Response to keep only one instance for each request
+     *
+     * @return Response Response object populated by server data
+     */
+    public static function response()
+    {
+        $container = Container::box();
+        if (!$container->has('response')) {
+            $container->register('response', new Response());
+        }
+        return $container->get('response');
+    }
 }

src/Kernel/Http.php

@@ -2,6 +2,7 @@
 
 namespace Simples\Http\Kernel;
 
+use Simples\Kernel\App as Kernel;
 use Simples\Http\Request;
 use Simples\Http\Response;
 use Simples\Route\Match;
@@ -38,6 +39,23 @@ public function __construct(Request $request)
         $this->request = $request;
     }
 
+    /**
+     * @return Response
+     */
+    public function handler(): Response
+    {
+        // TODO: container
+        $router = new Router(Kernel::options('labels'), Kernel::options('type'));
+
+        // TODO: make routes here
+        /** @var Match $match */
+        $this->match = static::routes($router)->match($this->request->getMethod(), $this->request->getUri());
+
+        $handler = new HttpHandler($this->request, $this->match);
+
+        return $handler->apply();
+    }
+
     /**
      * Load the routes of project
      *
@@ -47,7 +65,7 @@ public function __construct(Request $request)
      */
     public static function routes(Router $router, array $files = null)
     {
-        $files = $files ? $files : App::config('route.files');
+        $files = $files ? $files : Kernel::config('route.files');
 
         foreach ($files as $file) {
             $router->load(path(true, $file));
@@ -56,23 +74,6 @@ public static function routes(Router $router, array $files = null)
         return $router;
     }
 
-    /**
-     * @return Response
-     */
-    public function handler(): Response
-    {
-        // TODO: container
-        $router = new Router(App::options('labels'), App::options('type'));
-
-        // TODO: make routes here
-        /** @var Match $match */
-        $this->match = static::routes($router)->match($this->request->getMethod(), $this->request->getUri());
-
-        $handler = new HttpHandler($this->request, $this->match);
-
-        return $handler->apply();
-    }
-
     /**
      * @param Throwable $fail
      * @return Response

src/Kernel/HttpHandler.php

@@ -6,6 +6,7 @@
 use Simples\Http\Controller;
 use Simples\Http\Request;
 use Simples\Http\Response;
+use Simples\Kernel\Container;
 use Simples\Route\Match;
 use Simples\Kernel\Wrapper;
 use Throwable;

src/Response.php

@@ -3,7 +3,6 @@
 namespace Simples\Http;
 
 use Simples\Helper\JSON;
-use Simples\Kernel\App;
 
 /**
  * @method Response atom($data, $code = 200)
@@ -103,7 +102,6 @@ public function header($name, $value = '')
     public function __call($name, $arguments)
     {
         $this->write($this->toString(off($arguments, 0, null)));
-
         $this->header('content-type', off(self::CONTENT_TYPES, $name, self::CONTENT_TYPE_UNKNOWN));
 
         if (off($arguments, 1)) {
@@ -126,7 +124,7 @@ public function toString($data)
         if (in_array(gettype($data), $scalars)) {
             return (string)$data;
         }
-        return json_encode($data, JSON_NUMERIC_CHECK);
+        return JSON::encode($data, JSON_NUMERIC_CHECK);
     }
 
     /**