* some stuff moved to UtilityModule(old DoctrineExpressiveModule)

* api auth in place

src/App/Handler/Api/AbstractCrudHandler.php

@@ -1,161 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Handler\Api;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\EmptyResponse;
-use Zend\Diactoros\Response\JsonResponse;
-use Zend\Json\Json;
-
-abstract class AbstractCrudHandler implements RequestHandlerInterface
-{
-    const IDENTIFIER_NAME = 'id';
-
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $requestMethod = strtoupper($request->getMethod());
-        $id = $request->getAttribute(static::IDENTIFIER_NAME);
-
-        switch ($requestMethod) {
-            case 'GET':
-                return isset($id)
-                    ? $this->get($request)
-                    : $this->getList($request);
-            case 'POST':
-                return $this->create($request);
-            case 'PUT':
-                return $this->update($request);
-            case 'DELETE':
-                return isset($id)
-                    ? $this->delete($request)
-                    : $this->deleteList($request);
-            case 'HEAD':
-                return $this->head($request);
-            case 'OPTIONS':
-                return $this->options($request);
-            case 'PATCH':
-                return $this->patch($request);
-            default:
-                return $this->createResponse(['content' => 'Method not allowed'], 405);
-        }
-    }
-
-    public function get(ServerRequestInterface $request)
-    {
-        return $this->createResponse(['content' => 'Method not allowed'], 405);
-    }
-
-    public function getList(ServerRequestInterface $request)
-    {
-        return $this->createResponse(['content' => 'Method not allowed'], 405);
-    }
-
-    public function create(ServerRequestInterface $request)
-    {
-        return $this->createResponse(['content' => 'Method not allowed'], 405);
-    }
-
-    public function update(ServerRequestInterface $request)
-    {
-        return $this->createResponse(['content' => 'Method not allowed'], 405);
-    }
-
-    public function delete(ServerRequestInterface $request)
-    {
-        return $this->createResponse(['content' => 'Method not allowed'], 405);
-    }
-
-    public function deleteList(ServerRequestInterface $request)
-    {
-        return $this->createResponse(['content' => 'Method not allowed'], 405);
-    }
-
-    public function head(ServerRequestInterface $request)
-    {
-        return $this->createResponse(['content' => 'Method not allowed'], 405);
-    }
-
-    public function options(ServerRequestInterface $request)
-    {
-        return new EmptyResponse(200);
-    }
-
-    public function patch(ServerRequestInterface $request)
-    {
-        return $this->createResponse(['content' => 'Method not allowed'], 405);
-    }
-
-    final protected function createResponse($data, $status = 200)
-    {
-        return new JsonResponse($data, $status);
-    }
-
-    /**
-     *
-     * @param ServerRequestInterface $request
-     * @return array|object
-     */
-    public function getRequestData(ServerRequestInterface $request)
-    {
-        $body = $request->getParsedBody();
-
-        if (!empty($body)) {
-            return $body;
-        }
-
-        return $this->parseRequestData(
-            $request->getBody()->getContents(),
-            $request->getHeaderLine('content-type')
-        );
-    }
-
-    /**
-     *
-     * @param string $input
-     * @param string $contentType
-     * @return mixed
-     */
-    private function parseRequestData($input, $contentType)
-    {
-        $contentTypeParts = preg_split('/\s*[;,]\s*/', $contentType);
-        $parser = $this->returnParserContentType($contentTypeParts[0]);
-
-        return $parser($input);
-    }
-
-    /**
-     *
-     * @param string $contentType
-     * @return callable
-     */
-    private function returnParserContentType(string $contentType): callable
-    {
-        if ($contentType === 'application/x-www-form-urlencoded') {
-            return function ($input) {
-                parse_str($input, $data);
-                return $data;
-            };
-        } elseif ($contentType === 'application/json') {
-            return function ($input) {
-                $jsonDecoder = new Json();
-                try {
-                    return $jsonDecoder->decode($input, Json::TYPE_ARRAY);
-                } catch (\Exception $e) {
-                    return false;
-                }
-            };
-        } elseif ($contentType === 'multipart/form-data') {
-            return function ($input) {
-                return $input;
-            };
-        }
-
-        return function ($input) {
-            return $input;
-        };
-    }
-}

src/App/Handler/Api/AwardeeHandler.php

@@ -7,6 +7,7 @@ namespace App\Handler\Api;
 use App\Service\AwardeeManager;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use UtilityModule\Handler\AbstractCrudHandler;
 use Zend\Diactoros\Response\JsonResponse;
 
 class AwardeeHandler extends AbstractCrudHandler

src/App/Handler/Api/JudgesHandler.php

@@ -7,6 +7,7 @@ namespace App\Handler\Api;
 use App\Service\JudgeManager;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use UtilityModule\Handler\AbstractCrudHandler;
 use Zend\Diactoros\Response\JsonResponse;
 
 class JudgesHandler extends AbstractCrudHandler

src/App/Handler/Api/YearsHandler.php

@@ -7,6 +7,7 @@ namespace App\Handler\Api;
 use App\Service\YearManager;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use UtilityModule\Handler\AbstractCrudHandler;
 use Zend\Diactoros\Response\JsonResponse;
 
 class YearsHandler extends AbstractCrudHandler

src/App/Service/AwardeeManager.php

@@ -6,7 +6,7 @@ namespace App\Service;
 
 use App\Entity\Awardee;
 use Doctrine\ORM\EntityManager;
-use DoctrineExpressiveModule\Hydrator\DoctrineObject;
+use UtilityModule\Hydrator\DoctrineObject;
 
 class AwardeeManager
 {

src/App/Service/AwardeeManagerFactory.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Service;
 
 use Doctrine\ORM\EntityManager;
-use DoctrineExpressiveModule\Hydrator\DoctrineObject;
+use UtilityModule\Hydrator\DoctrineObject;
 use Psr\Container\ContainerInterface;
 
 class AwardeeManagerFactory

src/App/Service/JudgeManager.php

@@ -6,7 +6,7 @@ namespace App\Service;
 
 use App\Entity\Judge;
 use Doctrine\ORM\EntityManager;
-use DoctrineExpressiveModule\Hydrator\DoctrineObject;
+use UtilityModule\Hydrator\DoctrineObject;
 
 class JudgeManager
 {

src/App/Service/JudgeManagerFactory.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Service;
 
 use Doctrine\ORM\EntityManager;
-use DoctrineExpressiveModule\Hydrator\DoctrineObject;
+use UtilityModule\Hydrator\DoctrineObject;
 use Psr\Container\ContainerInterface;
 
 class JudgeManagerFactory