Code cleanup + Directories Reorganization

Author: pH-7

.travis.yml

@@ -4,22 +4,22 @@ dist: trusty
 
 matrix:
   include:
-  - php: 7.2
-  - php: 7.3
-  - php: 7.4
-    env: ANALYSIS='true'
-  - php: nightly
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+      env: ANALYSIS='true'
+    - php: nightly
 
   allow_failures:
-  - php: nightly
+    - php: nightly
 
 before_script:
-- composer require php-coveralls/php-coveralls:^2.2.0
-- composer install -n
+  - composer require php-coveralls/php-coveralls:^2.2.0
+  - composer install -n
 
 script:
-- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
-- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpstan analyse src ; fi
+  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
+  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpstan analyse src ; fi
 
 after_success:
-- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --coverage_clover=clover.xml -v ; fi
+  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --coverage_clover=clover.xml -v ; fi

app/routes.php

@@ -2,13 +2,8 @@
 
 declare(strict_types=1);
 
-use App\Application\Action\User\ListUsersAction;
-use App\Application\Action\User\ViewUserAction;
-use App\Application\Action\User\UserCreateAction;
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
+use App\Action\User\UserCreateAction;
 use Slim\App;
-use Slim\Interfaces\RouteCollectorProxyInterface as Group;
 
 return function (App $app) {
     $app->get('/', \App\Action\HomeAction::class)->setName('home');

docker-compose.yml

@@ -1,18 +1,18 @@
 version: '3.7'
 
 volumes:
-    logs:
-        driver: local
+  logs:
+    driver: local
 
 services:
-    slim:
-        image: php:7-alpine
-        working_dir: /var/www
-        command: php -S 0.0.0.0:8080 -t public
-        environment:
-            docker: "true"
-        ports:
-            - 8080:8080
-        volumes:
-            - .:/var/www
-            - logs:/var/www/logs
+  slim:
+    image: php:7-alpine
+    working_dir: /var/www
+    command: php -S 0.0.0.0:8080 -t public
+    environment:
+      docker: "true"
+    ports:
+      - 8080:8080
+    volumes:
+      - .:/var/www
+      - logs:/var/www/logs

phpunit.xml.dist

@@ -1,18 +1,18 @@
 <phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.1/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    beStrictAboutTestsThatDoNotTestAnything="true"
-    beStrictAboutChangesToGlobalState="true"
-    beStrictAboutOutputDuringTests="true"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    bootstrap="tests/bootstrap.php"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.1/phpunit.xsd"
+        backupGlobals="false"
+        backupStaticAttributes="false"
+        beStrictAboutTestsThatDoNotTestAnything="true"
+        beStrictAboutChangesToGlobalState="true"
+        beStrictAboutOutputDuringTests="true"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+        bootstrap="tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="Test Suite">

public/index.php

@@ -5,9 +5,6 @@
 use App\Application\Handler\ShutdownHandler;
 use App\Application\ResponseEmitter\ResponseEmitter;
 use App\Application\Setting\SettingsInterface;
-use DI\ContainerBuilder;
-use Slim\Factory\AppFactory;
-use Slim\Factory\ServerRequestCreatorFactory;
 
 require __DIR__ . '/../vendor/autoload.php';
 

src/Action/Action.php

@@ -84,7 +84,7 @@ protected function getFormData()
     }
 
     /**
-     * @param  string $name
+     * @param string $name
      * @return mixed
      * @throws HttpBadRequestException
      */
@@ -119,7 +119,7 @@ protected function respond(ActionPayload $payload): Response
         $this->response->getBody()->write($json);
 
         return $this->response
-                    ->withHeader('Content-Type', 'application/json')
-                    ->withStatus($payload->getStatusCode());
+            ->withHeader('Content-Type', 'application/json')
+            ->withStatus($payload->getStatusCode());
     }
 }

src/Action/ActionError.php

@@ -28,8 +28,8 @@ class ActionError implements JsonSerializable
     private $description;
 
     /**
-     * @param string        $type
-     * @param string|null   $description
+     * @param string $type
+     * @param string|null $description
      */
     public function __construct(string $type, ?string $description)
     {

src/Action/ActionPayload.php

@@ -23,15 +23,16 @@ class ActionPayload implements JsonSerializable
     private $error;
 
     /**
-     * @param int                   $statusCode
-     * @param array|object|null     $data
-     * @param ActionError|null      $error
+     * @param int $statusCode
+     * @param array|object|null $data
+     * @param ActionError|null $error
      */
     public function __construct(
         int $statusCode = 200,
         $data = null,
         ?ActionError $error = null
-    ) {
+    )
+    {
         $this->statusCode = $statusCode;
         $this->data = $data;
         $this->error = $error;

src/Action/HomeAction.php

@@ -4,6 +4,7 @@
 
 namespace App\Action;
 
+use PH7\JustHttp\StatusCode;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -12,11 +13,12 @@ final class HomeAction
     public function __invoke(
         ServerRequestInterface $request,
         ResponseInterface $response
-    ): ResponseInterface {
+    ): ResponseInterface
+    {
         $response->getBody()->write(json_encode(['success' => true]));
 
         return $response
             ->withHeader('Content-Type', 'application/json')
-            ->withStatus(422);
+            ->withStatus(StatusCode::CREATED);
     }
 }

src/Action/User/UserAction.php

@@ -20,7 +20,8 @@ abstract class UserAction extends Action
      */
     public function __construct(LoggerInterface $logger,
                                 UserRepository $userRepository
-    ) {
+    )
+    {
         parent::__construct($logger);
         $this->userRepository = $userRepository;
     }