Merge pull request #18 from SebKay/configurable

Configurable

Author: SebKay

.github/workflows/test-webpack.yml

@@ -0,0 +1,16 @@
+name: Webpack
+
+on: [pull_request]
+
+jobs:
+  test-webpack-prod-build:
+    name: Test production build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2.3.4
+
+    - name: Install Yarn dependencies
+      run: yarn install --prod --non-interactive
+
+    - name: Build for production
+      run: yarn run prod

config/controllers.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Set container controllers
+ */
+
+use App\Controllers\HomeController;
+
+return [
+    HomeController::class,
+];

config/services.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Set container services
+ */
+
+use App\Services\CSRFService;
+use App\Services\ErrorRendererHTMLService;
+use App\Services\LoggerService;
+use App\Services\ViewService;
+
+return [
+    LoggerService::class,
+    ErrorRendererHTMLService::class,
+    CSRFService::class,
+    ViewService::class
+];

src/App.php

@@ -14,11 +14,6 @@
 
 class App
 {
-    /**
-     * @var boolean
-     */
-    public $dev_mode;
-
     /**
      * @var ContainerCreator
      */
@@ -49,8 +44,6 @@ class App
      */
     public function __construct()
     {
-        $this->dev_mode = $this->isDevelopmentMode();
-
         $this->container_creator = new ContainerCreator($this);
         $this->slim              = AppFactory::create($this->container());
 

src/Config.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App;
+
+class Config
+{
+    /**
+     * @var array
+     */
+    protected $services;
+
+    /**
+     * @var array
+     */
+    protected $controllers;
+
+    public function __construct()
+    {
+        $this->services    = self::set('services');
+        $this->controllers = self::set('controllers');
+    }
+
+    public static function set(string $filename): array
+    {
+        $file = __DIR__ . "/../config/$filename.php";
+
+        if (!file_exists($file)) {
+            return [];
+        }
+
+        return include $file;
+    }
+
+    public static function getServices(): array
+    {
+        return (new self())->services;
+    }
+
+    public static function getControllers(): array
+    {
+        return (new self())->controllers;
+    }
+}

src/Container/ContainerCreator.php

@@ -3,7 +3,8 @@
 namespace App\Container;
 
 use App\App;
-use App\Controllers\HomeController;
+use App\Config;
+use App\Services\Service;
 
 class ContainerCreator
 {
@@ -23,19 +24,9 @@ public function __construct(App $app)
         $this->container = new \DI\Container();
     }
 
-    protected function services(): array
-    {
-        return [
-            LoggerService::class,
-            ErrorRendererHTMLService::class,
-            CSRFService::class,
-            ViewService::class
-        ];
-    }
-
     protected function addServices(): void
     {
-        foreach ($this->services() as $service_class) {
+        foreach (Config::getServices() as $service_class) {
             $service = new $service_class($this->container(), $this->app);
 
             if ($service instanceof Service) {
@@ -47,16 +38,9 @@ protected function addServices(): void
         }
     }
 
-    protected function controllers(): array
-    {
-        return [
-            HomeController::class
-        ];
-    }
-
     protected function addControllers(): void
     {
-        foreach ($this->controllers() as $controller) {
+        foreach (Config::getControllers() as $controller) {
             $this->container->set(
                 $controller,
                 new $controller($this->container())

src/Container/CSRFService.php src/Services/CSRFService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Container;
+namespace App\Services;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

src/Container/ErrorRendererHTMLService.php src/Services/ErrorRendererHTMLService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Container;
+namespace App\Services;
 
 use App\ErrorRendererHTML;
 

src/Container/LoggerService.php src/Services/LoggerService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Container;
+namespace App\Services;
 
 use App\Dependencies\Logger;
 

src/Container/Service.php src/Services/Service.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Container;
+namespace App\Services;
 
 use App\App;
 
@@ -25,7 +25,7 @@ public function __construct(\DI\Container $container, App $app)
     {
         $this->container = $container;
         $this->app       = $app;
-        $this->dev_mode  = $this->app->dev_mode;
+        $this->dev_mode  = $this->app->isDevelopmentMode();
     }
 
     abstract public static function name(): string;

src/Container/ViewService.php src/Services/ViewService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Container;
+namespace App\Services;
 
 use App\Dependencies\View;
 

tests/Unit/ConfigTest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Config;
+
+class ConfigTest extends UnitTest
+{
+    /**
+     * @testdox set() returns and empty array when the file doesn't exist
+     */
+    public function test_invalid_file_returns_empty_array()
+    {
+        $set = Config::set('test.php');
+
+        $this->assertIsArray($set);
+        $this->assertEmpty($set);
+    }
+}

tests/Unit/HelpersTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Helpers;
+
+class HelpersTest extends UnitTest
+{
+    public function test_it_gets_all_major_http_status_codes()
+    {
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(200));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(301));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(302));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(400));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(403));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(404));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(500));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(502));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(503));
+        $this->assertNotEmpty(Helpers::getHttpStatusMessage(504));
+    }
+}