master - extracted application construction in static method, done some refactoring

Author: alxmrz

example/index.php

@@ -1,46 +1,18 @@
 <?php
 
-/**
- * Use this template for index.php to start project.
- * Application expects you to register handlers for web path via $app->get or $app->post
- * Alternatively you can create controller with action to work with
- * For example web path GET /order/create can be defined as (Slim way):
- * $app->get('/order/create', function(RequestInterface $request, ResponseInterface $response) {
- *     $response->setBody("Hello from order create request");
- *     }
- *  );
- * or as a controller (Yii2 way):
- *   ./src/controller/OrderController::createAction(RequestInterface $request, ResponseInterface $response)
- */
-
 use FF\Application;
-use FF\container\PHPDIContainer;
 use FF\http\Request;
 use FF\http\Response;
-use FF\logger\MonologLogger;
-use FF\view\TemplateEngine;
-use FF\view\View;
-use Monolog\Logger;
 
 include_once '../../vendor/autoload.php';
 
-$definitions = [
-    MonologLogger::class => function () {
-        return new MonologLogger(new Logger('app_name_index'));
-    },
-    View::class => function () {
-        return new View(new TemplateEngine(__DIR__ . '/../view'));
-    }
-];
-
-$container = new PHPDIContainer($definitions);
+$app = Application::construct(['appName' => 'ff-demo-app']);
 
-$app = (new Application($container, ['controllerNamespace' => 'app\controller\\']));
 $app->get('/', function (Request $request, Response $response) {
     $response->setBody("Hello from main route");
 });
-$app->get('/order', function($request, Response $response) {
-    $response->setBody("Hello from order request");
+$app->post('/order', function(Request $request, Response $response) {
+    $response->setBody("Hello from order post request");
 });
 
 $app->run();

src/FF/Application.php

@@ -4,13 +4,17 @@
 
 use Closure;
 use Exception;
+use FF\container\PHPDIContainer;
 use FF\exceptions\MethodAlreadyRegistered;
 use FF\exceptions\UnavailableRequestException;
 use FF\http\Request;
 use FF\http\Response;
 use FF\logger\MonologLogger;
 use FF\router\Router;
 use FF\router\RouterInterface;
+use FF\view\TemplateEngine;
+use FF\view\View;
+use Monolog\Logger;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -22,23 +26,65 @@ class Application extends BaseApplication
     public RouterInterface $router;
     public LoggerInterface $logger;
 
-    private Request $request;
+    /** @var bool is application running correctly */
     private bool $status = true;
 
     /**
      * @param ContainerInterface $container
+     * @param RouterInterface $router
+     * @param LoggerInterface $logger
      * @param array $config
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
      */
-    public function __construct(ContainerInterface $container, array $config = [])
+    public function __construct(
+        ContainerInterface $container,
+        RouterInterface    $router,
+        LoggerInterface    $logger,
+        array              $config = []
+    )
     {
         parent::__construct($container, $config);
 
-        $this->router = $this->container->get(Router::class);
+        $this->logger = $logger;
+
+        $this->router = $router;
         $this->router->setConfig($config);
-        $this->request = $this->container->get(Request::class);
-        $this->logger = $this->container->get(MonologLogger::class);
+    }
+
+    /**
+     * Hide construction from client code
+     *
+     * @param array $config
+     * @return static
+     * @throws Exception
+     */
+    public static function construct(array $config): static
+    {
+        $definitions = [
+            LoggerInterface::class => function () use ($config) {
+                return new MonologLogger(new Logger($config['appName'] ?? 'ff-core-app'));
+            },
+            RouterInterface::class => function () {
+                return new Router();
+            },
+        ];
+
+        if (isset($config['viewPath'])) {
+            $definitions[View::class] = function () use ($config) {
+                return new View(new TemplateEngine($config['viewPath']));
+            };
+        }
+
+        if (isset($config['definitions']) && is_array($config['definitions'])) {
+            $definitions = array_merge($definitions, $config['definitions']);
+        }
+
+        $container = new PHPDIContainer($definitions);
+        return new static(
+            $container,
+            $container->get(RouterInterface::class),
+            $container->get(LoggerInterface::class),
+            $config
+        );
     }
 
     /**
@@ -48,55 +94,43 @@ public function __construct(ContainerInterface $container, array $config = [])
      */
     public function run(): int
     {
-        try {
-            $response = new Response();
+        $request = $this->createRequest();
+        $response = $this->createResponse();
 
-            [$controllerName, $action, $handler] = $this->router->parseRequest($this->request);
+        try {
+            [$controllerName, $action, $handler] = $this->router->parseRequest($request);
 
             try {
                 if ($handler !== null) {
-                    $handler($this->request, $response);
+                    $handler($request, $response);
                 } elseif ($controllerName !== null && $action !== null) {
                     $controller = $this->container->get($controllerName);
                     $controller->setRouter($this->router);
 
-                    $controller->$action($this->request, $response);
+                    $controller->$action($request, $response);
                 } else {
                     throw new Exception("No handlers for request found");
                 }
             } catch (Throwable $e) {
-                $this->logger->error($e->getMessage(), $this->getContext());
+                $this->logger->error($e->getMessage(), $request->context());
                 $response->setBody($e->getMessage());
                 $this->status = false;
             }
 
-            try {
-                // TODO: add response headers and code
-                echo $response;
-            } catch (\Throwable $e) {
-                $this->status = false;
-                $this->logger->error($e->getMessage(), $this->getContext());
-            }
+            $response->send();
 
             return $this->status ? ExitCode::SUCCESS : ExitCode::ERROR;
         } catch (UnavailableRequestException $e) {
-            $this->logger->error('Not available request', $this->getContext());
+            $this->logger->error('Not available request', $request->context());
             $this->showErrorPage($e, '404 Page not found');
         } catch (Exception $e) {
-            $this->logger->error($e->getMessage(), $this->getContext());
+            $this->logger->error($e->getMessage(), $request->context());
             $this->showErrorPage($e);
         }
 
         return ExitCode::ERROR;
     }
 
-    private function getContext(): array
-    {
-        return [
-            'request' => $this->request->server('REQUEST_URI'),
-            'ip' => $this->request->server('REMOTE_ADDR')
-        ];
-    }
 
     /**
      * @param Exception $e
@@ -130,4 +164,20 @@ public function post(string $path, Closure $handler): void
     {
         $this->router->post($path, $handler);
     }
+
+    /**
+     * @return Request
+     */
+    private function createRequest(): Request
+    {
+        return new Request();
+    }
+
+    /**
+     * @return Response
+     */
+    private function createResponse(): Response
+    {
+        return new Response;
+    }
 }

src/FF/http/Request.php

@@ -45,4 +45,12 @@ public function server(string $param = null): array|string
 
         return $this->server;
     }
+
+    public function context(): array
+    {
+        return [
+            'request' => $this->server('REQUEST_URI'),
+            'ip' => $this->server('REMOTE_ADDR')
+        ];
+    }
 }

src/FF/http/Response.php

@@ -5,16 +5,16 @@ class Response
 {
     private string $body;
 
-    public function __toString(): string
-    {
-        return $this->body;
-    }
-
     /**
      * @param string $body
      */
     public function setBody(string $body): void
     {
         $this->body = $body;
     }
+
+    public function send(): void
+    {
+        echo $this->body;
+    }
 }