VSA + SRP Architecture refactoring

Author: samuelgfeller

config/container.php

@@ -5,7 +5,8 @@
  * Documentation: https://samuel-gfeller.ch/docs/Dependency-Injection.
  */
 
-use App\Infrastructure\Utility\Settings;
+use App\Core\Application\Middleware\PhpViewMiddleware;
+use App\Core\Infrastructure\Utility\Settings;
 use Cake\Database\Connection;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\RotatingFileHandler;

config/middleware.php

@@ -1,7 +1,7 @@
 <?php
 
-use App\Application\Middleware\PhpViewMiddleware;
-use App\Application\Middleware\ValidationExceptionMiddleware;
+use App\Core\Application\Middleware\PhpViewMiddleware;
+use App\Core\Application\Middleware\ValidationExceptionMiddleware;
 use Selective\BasePath\BasePathMiddleware;
 use Slim\App;
 use SlimErrorRenderer\Middleware\ExceptionHandlingMiddleware;

config/routes.php

@@ -6,41 +6,41 @@
 
 return function (App $app) {
     // Home page
-    $app->get('/', \App\Application\Action\Home\HomePageAction::class)->setName('home-page');
-    $app->get('/home', \App\Application\Action\Home\RedirectToHomePageAction::class);
+    $app->get('/', \App\Module\Home\HomePageAction::class)->setName('home-page');
+    $app->get('/home', \App\Module\Home\RedirectToHomePageAction::class);
 
     // User action routes
     $app->group('/users', function (RouteCollectorProxy $group) {
         // User list page
-        $group->get('/list', \App\Application\Action\User\Page\UserListPageAction::class)
+        $group->get('/list', \App\Module\User\List\Action\UserListPageAction::class)
             ->setName('user-list-page');
         // Fetch user list for Ajax call
-        $group->get('', \App\Application\Action\User\Ajax\UserFetchListAction::class)
+        $group->get('', \App\Module\User\List\Action\UserFetchListAction::class)
             ->setName('user-list');
         // Submit user creation form
-        $group->post('', \App\Application\Action\User\Ajax\UserCreateAction::class)
+        $group->post('', \App\Module\User\Create\Action\UserCreateAction::class)
             ->setName('user-create-submit');
         // User read page
-        $group->get('/{user_id:[0-9]+}', \App\Application\Action\User\Page\UserReadPageAction::class)
+        $group->get('/{user_id:[0-9]+}', \App\Module\User\Read\Action\UserReadPageAction::class)
             ->setName('user-read-page');
         // Submit user update form
-        $group->put('/{user_id:[0-9]+}', \App\Application\Action\User\Ajax\UserUpdateAction::class)
+        $group->put('/{user_id:[0-9]+}', \App\Module\User\Update\Action\UserUpdateAction::class)
             ->setName('user-update-submit');
         // Submit delete user
-        $group->delete('/{user_id:[0-9]+}', \App\Application\Action\User\Ajax\UserDeleteAction::class)
+        $group->delete('/{user_id:[0-9]+}', \App\Module\User\Delete\Action\UserDeleteAction::class)
             ->setName('user-delete-submit');
     });
 
     // API routes
     $app->group('/api', function (RouteCollectorProxy $group) {
-        $group->get('/users', \App\Application\Action\User\Api\ApiUserFetchListAction::class)->setName(
+        $group->get('/users', \App\Module\User\List\Action\ApiUserFetchListAction::class)->setName(
             'api-fetch-users-list'
         );
     })// Cross-Origin Resource Sharing (CORS) middleware. Allow another domain to access '/api' routes.
     // If an error occurs, the CORS middleware will not be executed and the exception caught and a response
     // sent without the appropriate access control header. I don't know how to execute a certain middleware
     // added to a route group only before the error middleware which is added last in the middleware.php file.
-    ->add(\App\Application\Middleware\CorsMiddleware::class);
+    ->add(\App\Core\Application\Middleware\CorsMiddleware::class);
 
     /**
      * Catch-all route to serve a 404 Not Found page if none of the routes match

phpunit.xml

@@ -4,11 +4,8 @@
          backupStaticProperties="false">
     <coverage/>
     <testsuites>
-        <testsuite name="Integration">
-            <directory suffix="Test.php">tests/Integration</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">tests/Unit</directory>
+        <testsuite name="Tests">
+            <directory suffix="Test.php">tests/TestCase</directory>
         </testsuite>
     </testsuites>
     <php>

public/index.php

@@ -1,10 +1,9 @@
 <?php
 /**
- * Bootstrap the application
+ * Bootstrap the application.
  *
  * Documentation: https://samuel-gfeller.ch/docs/Web-Server-config-and-Slim-Bootstrapping#slim-bootstrapping
  */
-
 $app = require __DIR__ . '/../config/bootstrap.php';
 
 $app->run();

…pplication/Middleware/CorsMiddleware.php …pplication/Middleware/CorsMiddleware.phpsrc/Application/Middleware/CorsMiddleware.php renamed to src/Core/Application/Middleware/CorsMiddleware.php src/Application/Middleware/CorsMiddleware.php renamed to src/Core/Application/Middleware/CorsMiddleware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Application\Middleware;
+namespace App\Core\Application\Middleware;
 
-use App\Infrastructure\Utility\Settings;
+use App\Core\Infrastructure\Utility\Settings;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

…ication/Middleware/PhpViewMiddleware.php …ication/Middleware/PhpViewMiddleware.phpsrc/Application/Middleware/PhpViewMiddleware.php renamed to src/Core/Application/Middleware/PhpViewMiddleware.php src/Application/Middleware/PhpViewMiddleware.php renamed to src/Core/Application/Middleware/PhpViewMiddleware.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Application\Middleware;
+namespace App\Core\Application\Middleware;
 
-use App\Infrastructure\Utility\JsImportCacheBuster;
-use App\Infrastructure\Utility\Settings;
+use App\Core\Infrastructure\Utility\JsImportCacheBuster;
+use App\Core\Infrastructure\Utility\Settings;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;

…leware/ValidationExceptionMiddleware.php …leware/ValidationExceptionMiddleware.phpsrc/Application/Middleware/ValidationExceptionMiddleware.php renamed to src/Core/Application/Middleware/ValidationExceptionMiddleware.php src/Application/Middleware/ValidationExceptionMiddleware.php renamed to src/Core/Application/Middleware/ValidationExceptionMiddleware.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Application\Middleware;
+namespace App\Core\Application\Middleware;
 
-use App\Application\Responder\JsonResponder;
-use App\Domain\Exception\ValidationException;
+use App\Core\Application\Responder\JsonResponder;
+use App\Core\Domain\Exception\ValidationException;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

…/Application/Responder/JsonResponder.php …/Application/Responder/JsonResponder.phpsrc/Application/Responder/JsonResponder.php renamed to src/Core/Application/Responder/JsonResponder.php src/Application/Responder/JsonResponder.php renamed to src/Core/Application/Responder/JsonResponder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Application\Responder;
+namespace App\Core\Application\Responder;
 
 use Psr\Http\Message\ResponseInterface;
 

…pplication/Responder/RedirectHandler.php …pplication/Responder/RedirectHandler.phpsrc/Application/Responder/RedirectHandler.php renamed to src/Core/Application/Responder/RedirectHandler.php src/Application/Responder/RedirectHandler.php renamed to src/Core/Application/Responder/RedirectHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Application\Responder;
+namespace App\Core\Application\Responder;
 
 use Psr\Http\Message\ResponseInterface;
 use Slim\Interfaces\RouteParserInterface;