Update to the new base library

Author: byjg

composer.json

@@ -9,16 +9,16 @@
     "ext-json": "*",
     "ext-openssl": "*",
     "ext-curl": "*",
-    "byjg/config": "^4.9.x-dev",
-    "byjg/anydataset-db": "^4.9.x-dev",
-    "byjg/micro-orm": "^4.9.x-dev",
-    "byjg/authuser": "^4.9.x-dev",
+    "byjg/config": "^4.9",
+    "byjg/anydataset-db": "^4.9",
+    "byjg/micro-orm": "^4.9",
+    "byjg/authuser": "^4.9",
     "byjg/mailwrapper": "^4.9",
-    "byjg/restserver": "^4.9.x-dev",
+    "byjg/restserver": "^4.9",
     "zircote/swagger-php": "^4.6.1",
-    "byjg/swagger-test": "^4.9.x-dev",
-    "byjg/migration": "^4.9.x-dev",
-    "byjg/php-daemonize": "^4.9.x-dev",
+    "byjg/swagger-test": "^4.9",
+    "byjg/migration": "^4.9",
+    "byjg/php-daemonize": "^4.9",
     "byjg/shortid": "^4.9",
     "byjg/jinja-php": "^4.9"
   },

config/config-dev.php

@@ -24,6 +24,8 @@
 use ByJG\RestServer\Route\OpenApiRouteList;
 use ByJG\Util\JwtKeySecret;
 use ByJG\Util\JwtWrapper;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use RestReferenceArchitecture\Model\User;
 use RestReferenceArchitecture\Psr11;
 use RestReferenceArchitecture\Repository\DummyHexRepository;
@@ -132,9 +134,16 @@
         // ->withMethodCall("withAcceptCorsHeaders", [[/* list of headers */]])     // Optional. Default all headers
         ->toSingleton(),
 
+    LoggerInterface::class => DI::bind(NullLogger::class)
+        ->toSingleton(),
+
     HttpRequestHandler::class => DI::bind(HttpRequestHandler::class)
-        ->withMethodCall('withMiddleware', [Param::get(JwtMiddleware::class)])
+        ->withConstructorArgs([
+            Param::get(LoggerInterface::class)
+        ])
+        ->withMethodCall("withMiddleware", [Param::get(JwtMiddleware::class)])
         ->withMethodCall("withMiddleware", [Param::get(CorsMiddleware::class)])
+//        ->withMethodCall("withDetailedErrorHandler", [])
         ->toSingleton(),
 
     // ----------------------------------------------------------------------------

docker-compose-dev.yml

@@ -12,6 +12,8 @@ services:
       - .:/srv/
     environment:
       - APP_ENV=dev
+      - PHP_FPM_SERVER=0.0.0.0:9000
+      - VERBOSE=true
     networks:
       - net
 

src/Psr11.php

@@ -34,9 +34,8 @@ public static function container($env = null): ?Container
     }
 
     /**
-     * @return Definition
+     * @return Definition|null
      * @throws ConfigException
-     * @throws InvalidDateException
      */
     public static function environment(): ?Definition
     {

src/Repository/BaseRepository.php

@@ -3,6 +3,11 @@
 namespace RestReferenceArchitecture\Repository;
 
 use ByJG\AnyDataset\Db\DbDriverInterface;
+use ByJG\Config\Exception\ConfigException;
+use ByJG\Config\Exception\ConfigNotFoundException;
+use ByJG\Config\Exception\DependencyInjectionException;
+use ByJG\Config\Exception\InvalidDateException;
+use ByJG\Config\Exception\KeyNotFoundException;
 use ByJG\MicroOrm\Exception\OrmBeforeInvalidException;
 use ByJG\MicroOrm\Exception\OrmInvalidFieldsException;
 use ByJG\MicroOrm\FieldMapping;
@@ -12,6 +17,7 @@
 use ByJG\MicroOrm\Repository;
 use ByJG\MicroOrm\UpdateConstraint;
 use ByJG\Serializer\Exception\InvalidArgumentException;
+use ReflectionException;
 use RestReferenceArchitecture\Psr11;
 use RestReferenceArchitecture\Util\HexUuidLiteral;
 
@@ -148,13 +154,23 @@ public static function getClosureNewUUID(): \Closure
         };
     }
 
+    /**
+     * @return mixed
+     * @throws ConfigException
+     * @throws ConfigNotFoundException
+     * @throws DependencyInjectionException
+     * @throws InvalidDateException
+     * @throws KeyNotFoundException
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws ReflectionException
+     */
     public static function getUuid()
     {
         return Psr11::container()->get(DbDriverInterface::class)->getScalar("SELECT insert(insert(insert(insert(hex(uuid_to_bin(uuid())),9,0,'-'),14,0,'-'),19,0,'-'),24,0,'-')");
     }
 
     /**
-     * @param Mapper $mapper
+     * @param Mapper|null $mapper
      * @param string $binPropertyName
      * @param string $uuidStrPropertyName
      * @return FieldMapping

src/Util/FakeApiRequester.php

@@ -9,16 +9,15 @@
 use ByJG\Config\Exception\DependencyInjectionException;
 use ByJG\Config\Exception\InvalidDateException;
 use ByJG\Config\Exception\KeyNotFoundException;
-use ByJG\RestServer\Middleware\CorsMiddleware;
 use ByJG\RestServer\Middleware\JwtMiddleware;
 use ByJG\RestServer\MockRequestHandler;
 use ByJG\RestServer\Route\OpenApiRouteList;
 use ByJG\Util\Exception\MessageException;
 use ByJG\Util\MockClient;
 use ByJG\Util\Psr7\Response;
-use KingPandaApi\Middleware\BlockMultiRequestsMiddleware;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\InvalidArgumentException;
 use ReflectionException;
 use RestReferenceArchitecture\Psr11;
@@ -43,12 +42,10 @@ class FakeApiRequester extends AbstractRequester
      */
     protected function handleRequest(RequestInterface $request)
     {
-
-        $mock = new MockRequestHandler($request);
+        $mock = new MockRequestHandler(Psr11::container()->get(LoggerInterface::class));
         $mock->withMiddleware(Psr11::container()->get(JwtMiddleware::class));
-        $mock->withMiddleware(Psr11::container()->get(CorsMiddleware::class));
         $mock->withRequestObject($request);
-        $mock->handle(Psr11::container()->get(OpenApiRouteList::class));
+        $mock->handle(Psr11::container()->get(OpenApiRouteList::class), false, false);
 
         $httpClient = new MockClient($mock->getPsr7Response());
         return $httpClient->sendRequest($request);