Refactor Classes

api/src/Middleware/ErrorHandler.php

@@ -1,10 +1,12 @@
-<?php /** @noinspection PhpUndefinedClassInspection */
+<?php
+/** @noinspection PhpUndefinedClassInspection */
 
 
 namespace TorstenHettstedt\TimekeepingApi\Middleware;
 
 
 use JetBrains\PhpStorm\ArrayShape;
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -14,12 +16,15 @@ use Throwable;
 
 class ErrorHandler
 {
+    /**
+     * @var App<ContainerInterface>
+     */
     protected App $app;
 
     /**
      * ErrorHandler constructor.
      *
-     * @param App $app
+     * @param App<ContainerInterface> $app
      */
     public function __construct(App $app)
     {
@@ -29,7 +34,7 @@ class ErrorHandler
     /**
      * @param Throwable $exception
      *
-     * @return mixed[]
+     * @return array<string, mixed>
      */
     #[ArrayShape([
         'timestamp' => "false|string",
@@ -71,8 +76,7 @@ class ErrorHandler
         bool $logErrors,
         bool $logErrorDetails,
         ?LoggerInterface $logger = null
-    ): ResponseInterface
-    {
+    ): ResponseInterface {
         if ($logger !== null && $logErrors === true) {
             $logger->error($exception->getMessage());
         }

api/src/Middleware/JsonBodyParserMiddleware.php

@@ -13,7 +13,7 @@ class JsonBodyParserMiddleware implements MiddlewareInterface
     {
         $contentType = $request->getHeaderLine('Content-Type');
 
-        if (strstr($contentType, 'application/json')) {
+        if (str_contains($contentType, 'application/json')) {
             $contents = json_decode(file_get_contents('php://input'), true);
             if (json_last_error() === JSON_ERROR_NONE) {
                 $request = $request->withParsedBody($contents);

api/src/Middleware/OriginAccessControlHandler.php

@@ -28,15 +28,14 @@ class OriginAccessControlHandler implements MiddlewareInterface
 
     public function originAccessControl(Request $request, Response $response): Response
     {
-
         $routeContext = RouteContext::fromRequest($request);
         $routingResults = $routeContext->getRoutingResults();
         $methods = $routingResults->getAllowedMethods();
         $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers');
 
         if ($this->testRoute($request)) {
-            //                     Stunden   Minuten   Sekunden
-            $accessControlMaxAge = 24      * 60      * 60;
+            //                     Stunden Minuten Sekunden
+            $accessControlMaxAge = 24    * 60    * 60;
             $response = $response->withHeader('Access-Control-Allow-Origin', $this->buildOrigin($request));
             $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods));
             $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders);
@@ -53,6 +52,6 @@ class OriginAccessControlHandler implements MiddlewareInterface
 
     protected function buildOrigin(Request $request): string
     {
-        return $request->getHeaderLine('Origin') ?? '';
+        return $request->getHeaderLine('Origin');
     }
 }