Test erweitert um die Coverage zu erhöhen.

api/html/index.php

@@ -8,6 +8,7 @@ use DI\Container;
 use Slim\Factory\AppFactory;
 use Slim\Routing\RouteCollectorProxy;
 use TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursController;
+use TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursViewController;
 use TorstenHettstedt\TimekeepingApi\Middleware\ErrorHandler;
 use TorstenHettstedt\TimekeepingApi\Middleware\JsonBodyParserMiddleware;
 
@@ -22,25 +23,11 @@ AppFactory::setContainer($container);
 $app = AppFactory::create();
 $app->add(new JsonBodyParserMiddleware());
 
-$app->get(
+$app->group('/views/working-hours', function (RouteCollectorProxy $group) {
-    '/',
+    $group->get('/weekly', WorkingHoursViewController::class . ':browseWeekly');
-    'TorstenHettstedt\TimekeepingApi\Controller\HelloWorldController:read'
+    $group->get('/monthly', WorkingHoursViewController::class . ':browseMonthly');
-);
+    $group->get('/yearly', WorkingHoursViewController::class . ':browseYearly');
-
+});
-$app->get(
-    '/views/working-hours/weekly',
-    'TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursViewController:browseWeekly'
-);
-
-$app->get(
-    '/views/working-hours/monthly',
-    'TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursViewController:browseMonthly'
-);
-
-$app->get(
-    '/views/working-hours/yearly',
-    'TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursViewController:browseYearly'
-);
 
 $app->group('/working-hours', function (RouteCollectorProxy $group) {
     $group->get('', WorkingHoursController::class . ':browse');

api/src/Controller/HelloWorldController.php

@@ -1,30 +0,0 @@
-<?php /** @noinspection PhpUnused */
-
-
-namespace TorstenHettstedt\TimekeepingApi\Controller;
-
-use Slim\Psr7\Response;
-use Slim\Psr7\Request;
-
-class HelloWorldController
-{
-    /**
-     * @param Request  $request
-     * @param Response $response
-     * @param mixed[]  $args
-     *
-     * @return Response
-     *
-     * @noinspection PhpUnusedParameterInspection
-     */
-    public function read(Request $request, Response $response, array $args): Response
-    {
-        $payload = json_encode('Hallo World');
-
-        $response->getBody()->write($payload);
-
-        return $response
-            ->withHeader('Content-Type', 'application/json')
-            ->withStatus(200);
-    }
-}

api/src/Controller/HttpConflictRequestException.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpMissingFieldTypeInspection */
 
 namespace TorstenHettstedt\TimekeepingApi\Controller;
 

api/src/Middleware/ErrorHandler.php

@@ -1,9 +1,10 @@
-<?php
+<?php /** @noinspection PhpUndefinedClassInspection */
 
 
 namespace TorstenHettstedt\TimekeepingApi\Middleware;
 
 
+use JetBrains\PhpStorm\ArrayShape;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -30,7 +31,13 @@ class ErrorHandler
      *
      * @return mixed[]
      */
-    protected function buildJsonArray(Throwable $exception): array
+    #[ArrayShape([
+        'timestamp' => "false|string",
+        'status'    => "int",
+        "error"     => "string",
+        'message'   => "string",
+        'path'      => "string"
+    ])] protected function buildJsonArray(Throwable $exception): array
     {
         $payload = [
             'timestamp' => date('Y-m-d\TH:m:sP'),

api/tests/unit/Controller/WorkingHoursControllerTest.php

@@ -0,0 +1,222 @@
+<?php
+
+namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
+
+use Codeception\Test\Unit;
+use Exception;
+use PDO;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\StreamInterface;
+use Slim\Exception\HttpBadRequestException;
+use Slim\Exception\HttpInternalServerErrorException;
+use Slim\Exception\HttpNotFoundException;
+use Slim\Psr7\Request;
+use Slim\Psr7\Response;
+use TorstenHettstedt\TimekeepingApi\Controller\HttpConflictRequestException;
+use TorstenHettstedt\TimekeepingApi\Controller\NotDatabasesException;
+use TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursController;
+
+class WorkingHoursControllerTest extends Unit
+{
+
+    const EXISTING_DATE     = '2020-01-28';
+    const EXISTING_INTERVAL = '07:20:00';
+    const NEW_DATE          = '2020-04-01';
+    const NEW_INTERVAL      = '07:59:00';
+
+    protected ContainerInterface $container;
+    protected Request $request;
+    protected Response $response;
+
+    /**
+     * @throws Exception
+     */
+    protected function _before(): void
+    {
+        parent::_before();
+        /** @noinspection SpellCheckingInspection */
+        $this->container = $this->makeEmpty(ContainerInterface::class, [
+            'has' => true,
+            'get' => new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass')
+        ]);
+        $this->request = $this->makeEmpty(Request::class, [
+                'getParsedBody' => [
+                    'workingDay'  => self::EXISTING_DATE,
+                    'workingTime' => self::EXISTING_INTERVAL,
+                ]
+        ]);
+        $this->response = $this->makeEmpty(Response::class, [
+            'getBody' => $this->makeEmpty(StreamInterface::class, [
+                'write' => function (mixed $data) {
+                    $this->assertIsString($data);
+                    $this->assertJson($data);
+                },
+            ]),
+            'withHeader' => $this->makeEmpty(Response::class, [
+                'withStatus' => $this->makeEmpty(Response::class),
+            ]),
+        ]);
+    }
+
+    /**
+     * @throws NotDatabasesException
+     * @throws Exception
+     */
+    public function testConstructWithNonDatabase(): void
+    {
+        $this->container = $this->makeEmpty(ContainerInterface::class, [
+            'has' => false
+        ]);
+        $this->expectException(NotDatabasesException::class);
+        new WorkingHoursController($this->container);
+    }
+
+    /**
+     * @throws NotDatabasesException
+     * @throws Exception
+     */
+    public function testBrowse(): void
+    {
+        $controller = new WorkingHoursController($this->container);
+        $response = $controller->browse($this->request, $this->response, []);
+        $this->assertInstanceOf(Response::class, $response);
+    }
+
+    /**
+     * @throws NotDatabasesException
+     * @throws HttpBadRequestException
+     * @throws HttpNotFoundException
+     */
+    public function testUpdateExistRecord(): void
+    {
+        $controller = new WorkingHoursController($this->container);
+        $response = $controller->update($this->request, $this->response, [
+            'id' => self::EXISTING_DATE
+        ]);
+        $this->assertInstanceOf(Response::class, $response);
+    }
+
+    /**
+     * @throws NotDatabasesException
+     * @throws HttpBadRequestException
+     * @throws HttpNotFoundException
+     */
+    public function testUpdateNotExistRecord(): void
+    {
+        $controller = new WorkingHoursController($this->container);
+        $this->expectException(HttpNotFoundException::class);
+        $controller->update($this->request, $this->response, [
+            'id' => self::NEW_DATE
+        ]);
+    }
+
+    /**
+     * @return string[][]
+     */
+    public function invalidDataProvider(): array
+    {
+        return [
+            [
+                self::NEW_DATE,
+                '07:59'
+            ],
+            [
+                '2020-13-33',
+                self::NEW_INTERVAL
+            ],
+        ];
+    }
+
+    /**
+     * @param string $date
+     * @param string $time
+     *
+     * @dataProvider invalidDataProvider
+     *
+     * @throws HttpBadRequestException
+     * @throws HttpConflictRequestException
+     * @throws HttpInternalServerErrorException
+     * @throws NotDatabasesException
+     * @throws Exception
+     */
+    public function testCreatInvalidData(string $date, string $time): void
+    {
+        $this->request = $this->makeEmpty(Request::class, [
+            'getParsedBody' => [
+                'workingDay'  => $date,
+                'workingTime' => $time,
+            ]
+        ]);
+        $controller = new WorkingHoursController($this->container);
+        $this->expectException(HttpBadRequestException::class);
+        $controller->creat($this->request, $this->response, []);
+    }
+
+    /**
+     * @throws HttpBadRequestException
+     * @throws NotDatabasesException
+     * @throws HttpInternalServerErrorException
+     * @throws HttpConflictRequestException
+     * @throws Exception
+     */
+    public function testCreatNewRecord(): void
+    {
+        $this->request = $this->makeEmpty(Request::class, [
+            'getParsedBody' => [
+                'workingDay'  => self::NEW_DATE,
+                'workingTime' => self::NEW_INTERVAL,
+            ]
+        ]);
+        $controller = new WorkingHoursController($this->container);
+        $response = $controller->creat($this->request, $this->response, []);
+        $this->assertInstanceOf(Response::class, $response);
+    }
+
+    /**
+     * @throws HttpBadRequestException
+     * @throws HttpConflictRequestException
+     * @throws HttpInternalServerErrorException
+     * @throws NotDatabasesException
+     * @throws Exception
+     */
+    public function testCreatExistRecord(): void
+    {
+        $this->request = $this->makeEmpty(Request::class, [
+            'getParsedBody' => [
+                'workingDay'  => self::EXISTING_DATE,
+                'workingTime' => self::EXISTING_INTERVAL,
+            ]
+        ]);
+        $controller = new WorkingHoursController($this->container);
+        $this->expectException(HttpConflictRequestException::class);
+        $controller->creat($this->request, $this->response, []);
+    }
+
+    /**
+     * @throws HttpInternalServerErrorException
+     * @throws HttpNotFoundException
+     * @throws NotDatabasesException
+     */
+    public function testReadExistRecord(): void
+    {
+        $controller = new WorkingHoursController($this->container);
+        $response = $controller->read($this->request, $this->response, [
+            'id' => self::EXISTING_DATE
+        ]);
+        $this->assertInstanceOf(Response::class, $response);
+    }
+
+    /**
+     * @throws HttpInternalServerErrorException
+     * @throws HttpNotFoundException
+     * @throws NotDatabasesException
+     */
+    public function testReadNotExistRecord(): void
+    {
+        $controller = new WorkingHoursController($this->container);
+        $this->expectException(HttpNotFoundException::class);
+        $controller->read($this->request, $this->response, [
+            'id' => self::NEW_DATE
+        ]);
+    }
+}

api/tests/unit/Controller/WorkingHoursViewControllerTest.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
+
+use Codeception\Test\Unit;
+use Exception;
+use PDO;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\StreamInterface;
+use Slim\Psr7\Request;
+use Slim\Psr7\Response;
+use TorstenHettstedt\TimekeepingApi\Controller\NotDatabasesException;
+use TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursViewController;
+
+class WorkingHoursViewControllerTest extends Unit
+{
+    protected ContainerInterface $container;
+    protected Request $request;
+    protected Response $response;
+
+    /**
+     * @throws Exception
+     */
+    protected function _before(): void
+    {
+        parent::_before();
+        /** @noinspection SpellCheckingInspection */
+        $this->container = $this->makeEmpty(ContainerInterface::class, [
+            'has' => true,
+            'get' => new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass')
+        ]);
+        $this->request = $this->makeEmpty(Request::class, []);
+        $this->response = $this->makeEmpty(Response::class, [
+            'getBody' => $this->makeEmpty(StreamInterface::class, [
+                'write' => function (mixed $data) {
+                    $this->assertIsString($data);
+                    $this->assertJson($data);
+                },
+            ]),
+            'withHeader' => $this->makeEmpty(Response::class, [
+                'withStatus' => $this->makeEmpty(Response::class),
+            ]),
+        ]);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testBrowseMonthlyWithNonDatabase(): void
+    {
+        $this->container = $this->makeEmpty(ContainerInterface::class, [
+            'has' => false
+        ]);
+        $controller = new WorkingHoursViewController($this->container);
+        $this->expectException(NotDatabasesException::class);
+        $controller->browseMonthly($this->request, $this->response, []);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testBrowseMonthly(): void
+    {
+        $controller = new WorkingHoursViewController($this->container);
+        $response = $controller->browseMonthly($this->request, $this->response, []);
+        $this->assertInstanceOf(Response::class, $response);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testBrowseYearlyWithNonDatabase(): void
+    {
+        $this->container = $this->makeEmpty(ContainerInterface::class, [
+            'has' => false
+        ]);
+        $controller = new WorkingHoursViewController($this->container);
+        $this->expectException(NotDatabasesException::class);
+        $controller->browseYearly($this->request, $this->response, []);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testBrowseYearly(): void
+    {
+        $controller = new WorkingHoursViewController($this->container);
+        $response = $controller->browseYearly($this->request, $this->response, []);
+        $this->assertInstanceOf(Response::class, $response);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testBrowseWeeklyWithNonDatabase(): void
+    {
+        $this->container = $this->makeEmpty(ContainerInterface::class, [
+            'has' => false
+        ]);
+        $controller = new WorkingHoursViewController($this->container);
+        $this->expectException(NotDatabasesException::class);
+        $controller->browseWeekly($this->request, $this->response, []);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testBrowseWeekly(): void
+    {
+        $controller = new WorkingHoursViewController($this->container);
+        $response = $controller->browseWeekly($this->request, $this->response, []);
+        $this->assertInstanceOf(Response::class, $response);
+    }
+}

api/tests/unit/Middleware/ErrorHandlerTest.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Middleware;
+
+use Codeception\Stub\Expected;
+use Codeception\Test\Unit;
+use Exception;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamInterface;
+use Psr\Log\LoggerInterface;
+use Slim\App;
+use Slim\Exception\HttpException;
+use TorstenHettstedt\TimekeepingApi\Middleware\ErrorHandler;
+
+class ErrorHandlerTest extends Unit
+{
+
+    protected App                    $app;
+    protected ServerRequestInterface $request;
+    protected Exception              $exception;
+    protected LoggerInterface        $logger;
+
+    /**
+     * @throws Exception
+     */
+    protected function _before(): void
+    {
+        parent::_before();
+        $this->app = $this->makeEmpty(App::class, [
+            'getResponseFactory' => $this->makeEmpty(ResponseFactoryInterface::class, [
+                'createResponse' => $this->makeEmpty(ResponseInterface::class, [
+                    'getBody' => $this->makeEmpty(StreamInterface::class, [
+                        'write' => function (mixed $data) {
+                            $this->assertIsString($data);
+                            $this->assertJson($data);
+                        },
+                    ]),
+                ]),
+            ]),
+        ]);
+        $this->request = $this->makeEmpty(ServerRequestInterface::class);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testUseWithLogger(): void
+    {
+        $this->exception = $this->make(Exception::class, [
+            'message' => '',
+            'code'    => 400,
+            'file'    => '/path(to/file',
+        ]);
+        $this->logger = $this->makeEmpty(LoggerInterface::class, [
+            'error' => Expected::once(),
+        ]);
+
+        $middleWare = new ErrorHandler($this->app);
+        $middleWare($this->request, $this->exception, true, true, true, $this->logger);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testUseWithHttpException(): void
+    {
+        $this->exception = $this->make(HttpException::class, [
+            'message' => '',
+            'code'    => 400,
+            'file'    => '/path(to/file',
+            'getTitle'   => Expected::once('The Title'),
+        ]);
+        $this->logger = $this->makeEmpty(LoggerInterface::class, [
+            'error' => Expected::once(),
+        ]);
+
+        $middleWare = new ErrorHandler($this->app);
+        $middleWare($this->request, $this->exception, true, true, true, $this->logger);
+
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testUseWithGeneralException(): void
+    {
+        $this->exception = $this->make(Exception::class, [
+            'message' => '',
+            'code'    => 400,
+            'file'    => '/path(to/file',
+        ]);
+        $this->logger = $this->makeEmpty(LoggerInterface::class, [
+            'error' => Expected::once(),
+        ]);
+
+        $middleWare = new ErrorHandler($this->app);
+        $middleWare($this->request, $this->exception, true, true, true, $this->logger);
+    }
+}