add container factories

Dominik Zogg · Dominik Zogg · commit d13504ea05c1 · 2020-08-22T19:34:09.000+02:00
diff --git a/README.md b/README.md
@@ -14,9 +14,9 @@ A simple http handler implementation for API.
 ## Requirements
 
  * php: ^7.2
- * chubbyphp/chubbyphp-deserialization: ^2.17.1
- * chubbyphp/chubbyphp-negotiation: ^1.5.3
- * chubbyphp/chubbyphp-serialization: ^2.13.2
+ * chubbyphp/chubbyphp-deserialization: ^2.18
+ * chubbyphp/chubbyphp-negotiation: ^1.6
+ * chubbyphp/chubbyphp-serialization: ^2.14
  * psr/http-factory: ^1.0.1
  * psr/http-message: ^1.0.1
  * psr/http-server-middleware: ^1.0.1
@@ -27,30 +27,38 @@ A simple http handler implementation for API.
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-api-http][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-api-http "^3.4"
+composer require chubbyphp/chubbyphp-api-http "^3.5"
 ```
 
 ## Usage
 
  * [ApiProblem (example)][2]
- * [RequestManager][3]
- * [ResponseManager][4]
- * [AcceptAndContentTypeMiddleware][5]
- * [ApiExceptionMiddleware][6]
- * [ApiHttpServiceFactory][7]
- * [ApiHttpServiceProvider][8]
- * [ApiProblemMapping (example)][9]
+ * [AcceptAndContentTypeMiddlewareFactory][3]
+ * [ApiExceptionMiddlewareFactory][4]
+ * [RequestManagerFactory][5]
+ * [ResponseManagerFactory][6]
+ * [RequestManager][7]
+ * [ResponseManager][8]
+ * [AcceptAndContentTypeMiddleware][9]
+ * [ApiExceptionMiddleware][10]
+ * [ApiHttpServiceFactory][11]
+ * [ApiHttpServiceProvider][12]
+ * [ApiProblemMapping (example)][13]
 
 ## Copyright
 
 Dominik Zogg 2020
 
 [1]: https://packagist.org/packages/chubbyphp/chubbyphp-api-http
 [2]: doc/ApiProblem/ApiProblem.md
-[3]: doc/Manager/RequestManager.md
-[4]: doc/Manager/ResponseManager.md
-[5]: doc/Middleware/AcceptAndContentTypeMiddleware.md
-[6]: doc/ServiceFactory/ApiExceptionMiddleware.md
-[7]: doc/ServiceFactory/ApiHttpServiceFactory.md
-[8]: doc/ServiceProvider/ApiHttpServiceProvider.md
-[9]: doc/Serialization/ApiProblemMapping.md
+[3]: doc/Container/AcceptAndContentTypeMiddlewareFactory.md
+[4]: doc/Container/ApiExceptionMiddlewareFactory.md
+[5]: doc/Container/RequestManagerFactory.md
+[6]: doc/Container/ResponseManagerFactory.md
+[7]: doc/Manager/RequestManager.md
+[8]: doc/Manager/ResponseManager.md
+[9]: doc/Middleware/AcceptAndContentTypeMiddleware.md
+[10]: doc/Middleware/ApiExceptionMiddleware.md
+[11]: doc/ServiceFactory/ApiHttpServiceFactory.md
+[12]: doc/ServiceProvider/ApiHttpServiceProvider.md
+[13]: doc/Serialization/ApiProblemMapping.md
diff --git a/composer.json b/composer.json
@@ -11,9 +11,9 @@
     ],
     "require": {
         "php": "^7.2",
-        "chubbyphp/chubbyphp-deserialization": "^2.17.1",
-        "chubbyphp/chubbyphp-negotiation": "^1.5.3",
-        "chubbyphp/chubbyphp-serialization": "^2.13.2",
+        "chubbyphp/chubbyphp-deserialization": "^2.18",
+        "chubbyphp/chubbyphp-negotiation": "^1.6",
+        "chubbyphp/chubbyphp-serialization": "^2.14",
         "psr/http-factory": "^1.0.1",
         "psr/http-message": "^1.0.1",
         "psr/http-server-middleware": "^1.0.1",
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "3.5-dev"
         }
     },
     "scripts": {
diff --git a/doc/Container/AcceptAndContentTypeMiddlewareFactory.md b/doc/Container/AcceptAndContentTypeMiddlewareFactory.md
@@ -0,0 +1,12 @@
+# AcceptAndContentTypeMiddlewareFactory
+
+```php
+<?php
+
+use Chubbyphp\ApiHttp\Container\AcceptAndContentTypeMiddlewareFactory;
+use Psr\Container\ContainerInterface;
+
+$factory = new AcceptAndContentTypeMiddlewareFactory();
+
+$acceptAndContentTypeMiddleware = $factory($container);
+```
diff --git a/doc/Container/ApiExceptionMiddlewareFactory.md b/doc/Container/ApiExceptionMiddlewareFactory.md
@@ -0,0 +1,12 @@
+# ApiExceptionMiddlewareFactory
+
+```php
+<?php
+
+use Chubbyphp\ApiHttp\Container\ApiExceptionMiddlewareFactory;
+use Psr\Container\ContainerInterface;
+
+$factory = new ApiExceptionMiddlewareFactory();
+
+$apiExceptionMiddleware = $factory($container);
+```
diff --git a/doc/Container/RequestManagerFactory.md b/doc/Container/RequestManagerFactory.md
@@ -0,0 +1,12 @@
+# RequestManagerFactory
+
+```php
+<?php
+
+use Chubbyphp\ApiHttp\Container\RequestManagerFactory;
+use Psr\Container\ContainerInterface;
+
+$factory = new RequestManagerFactory();
+
+$requestManager = $factory($container);
+```
diff --git a/doc/Container/ResponseManagerFactory.md b/doc/Container/ResponseManagerFactory.md
@@ -0,0 +1,12 @@
+# ResponseManagerFactory
+
+```php
+<?php
+
+use Chubbyphp\ApiHttp\Container\ResponseManagerFactory;
+use Psr\Container\ContainerInterface;
+
+$factory = new ResponseManagerFactory();
+
+$requestManager = $factory($container);
+```
diff --git a/src/Container/AcceptAndContentTypeMiddlewareFactory.php b/src/Container/AcceptAndContentTypeMiddlewareFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chubbyphp\ApiHttp\Container;
+
+use Chubbyphp\ApiHttp\Manager\ResponseManagerInterface;
+use Chubbyphp\ApiHttp\Middleware\AcceptAndContentTypeMiddleware;
+use Chubbyphp\Negotiation\AcceptNegotiatorInterface;
+use Chubbyphp\Negotiation\ContentTypeNegotiatorInterface;
+use Psr\Container\ContainerInterface;
+
+final class AcceptAndContentTypeMiddlewareFactory
+{
+    public function __invoke(ContainerInterface $container): AcceptAndContentTypeMiddleware
+    {
+        return new AcceptAndContentTypeMiddleware(
+            $container->get(AcceptNegotiatorInterface::class),
+            $container->get(ContentTypeNegotiatorInterface::class),
+            $container->get(ResponseManagerInterface::class)
+        );
+    }
+}
diff --git a/src/Container/ApiExceptionMiddlewareFactory.php b/src/Container/ApiExceptionMiddlewareFactory.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chubbyphp\ApiHttp\Container;
+
+use Chubbyphp\ApiHttp\Manager\ResponseManagerInterface;
+use Chubbyphp\ApiHttp\Middleware\ApiExceptionMiddleware;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+
+final class ApiExceptionMiddlewareFactory
+{
+    public function __invoke(ContainerInterface $container): ApiExceptionMiddleware
+    {
+        return new ApiExceptionMiddleware(
+            $container->get(ResponseManagerInterface::class),
+            $container->get('config')['debug'],
+            $container->get(LoggerInterface::class)
+        );
+    }
+}
diff --git a/src/Container/RequestManagerFactory.php b/src/Container/RequestManagerFactory.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chubbyphp\ApiHttp\Container;
+
+use Chubbyphp\ApiHttp\Manager\RequestManager;
+use Chubbyphp\ApiHttp\Manager\RequestManagerInterface;
+use Chubbyphp\Deserialization\DeserializerInterface;
+use Psr\Container\ContainerInterface;
+
+final class RequestManagerFactory
+{
+    public function __invoke(ContainerInterface $container): RequestManagerInterface
+    {
+        return new RequestManager(
+            $container->get(DeserializerInterface::class)
+        );
+    }
+}
diff --git a/src/Container/ResponseManagerFactory.php b/src/Container/ResponseManagerFactory.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chubbyphp\ApiHttp\Container;
+
+use Chubbyphp\ApiHttp\Manager\ResponseManager;
+use Chubbyphp\ApiHttp\Manager\ResponseManagerInterface;
+use Chubbyphp\Serialization\SerializerInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+
+final class ResponseManagerFactory
+{
+    public function __invoke(ContainerInterface $container): ResponseManagerInterface
+    {
+        return new ResponseManager(
+            $container->get(ResponseFactoryInterface::class),
+            $container->get(SerializerInterface::class)
+        );
+    }
+}
diff --git a/tests/Unit/Container/AcceptAndContentTypeMiddlewareFactoryTest.php b/tests/Unit/Container/AcceptAndContentTypeMiddlewareFactoryTest.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chubbyphp\Tests\ApiHttp\Unit\Container;
+
+use Chubbyphp\ApiHttp\Container\AcceptAndContentTypeMiddlewareFactory;
+use Chubbyphp\ApiHttp\Manager\ResponseManagerInterface;
+use Chubbyphp\ApiHttp\Middleware\AcceptAndContentTypeMiddleware;
+use Chubbyphp\Mock\Call;
+use Chubbyphp\Mock\MockByCallsTrait;
+use Chubbyphp\Negotiation\AcceptNegotiatorInterface;
+use Chubbyphp\Negotiation\ContentTypeNegotiatorInterface;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+
+/**
+ * @covers \Chubbyphp\ApiHttp\Container\AcceptAndContentTypeMiddlewareFactory
+ *
+ * @internal
+ */
+final class AcceptAndContentTypeMiddlewareFactoryTest extends TestCase
+{
+    use MockByCallsTrait;
+
+    public function testInvoke(): void
+    {
+        /** @var AcceptNegotiatorInterface $acceptNegotiator */
+        $acceptNegotiator = $this->getMockByCalls(AcceptNegotiatorInterface::class);
+
+        /** @var ContentTypeNegotiatorInterface $contentTypeNegotiator */
+        $contentTypeNegotiator = $this->getMockByCalls(ContentTypeNegotiatorInterface::class);
+
+        /** @var ResponseManagerInterface $responseManager */
+        $responseManager = $this->getMockByCalls(ResponseManagerInterface::class);
+
+        /** @var ContainerInterface $container */
+        $container = $this->getMockByCalls(ContainerInterface::class, [
+            Call::create('get')->with(AcceptNegotiatorInterface::class)->willReturn($acceptNegotiator),
+            Call::create('get')->with(ContentTypeNegotiatorInterface::class)->willReturn($contentTypeNegotiator),
+            Call::create('get')->with(ResponseManagerInterface::class)->willReturn($responseManager),
+        ]);
+
+        $factory = new AcceptAndContentTypeMiddlewareFactory();
+
+        $acceptAndContentTypeMiddleware = $factory($container);
+
+        self::assertInstanceOf(AcceptAndContentTypeMiddleware::class, $acceptAndContentTypeMiddleware);
+    }
+}
diff --git a/tests/Unit/Container/ApiExceptionMiddlewareFactoryTest.php b/tests/Unit/Container/ApiExceptionMiddlewareFactoryTest.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chubbyphp\Tests\ApiHttp\Unit\Container;
+
+use Chubbyphp\ApiHttp\Container\ApiExceptionMiddlewareFactory;
+use Chubbyphp\ApiHttp\Manager\ResponseManagerInterface;
+use Chubbyphp\ApiHttp\Middleware\ApiExceptionMiddleware;
+use Chubbyphp\Mock\Call;
+use Chubbyphp\Mock\MockByCallsTrait;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @covers \Chubbyphp\ApiHttp\Container\ApiExceptionMiddlewareFactory
+ *
+ * @internal
+ */
+final class ApiExceptionMiddlewareFactoryTest extends TestCase
+{
+    use MockByCallsTrait;
+
+    public function testInvoke(): void
+    {
+        /** @var ResponseManagerInterface $responseManager */
+        $responseManager = $this->getMockByCalls(ResponseManagerInterface::class);
+
+        /** @var LoggerInterface $logger */
+        $logger = $this->getMockByCalls(LoggerInterface::class);
+
+        /** @var ContainerInterface $container */
+        $container = $this->getMockByCalls(ContainerInterface::class, [
+            Call::create('get')->with(ResponseManagerInterface::class)->willReturn($responseManager),
+            Call::create('get')->with('config')->willReturn(['debug' => true]),
+            Call::create('get')->with(LoggerInterface::class)->willReturn($logger),
+        ]);
+
+        $factory = new ApiExceptionMiddlewareFactory();
+
+        $apiExceptionMiddleware = $factory($container);
+
+        self::assertInstanceOf(ApiExceptionMiddleware::class, $apiExceptionMiddleware);
+    }
+}
diff --git a/tests/Unit/Container/RequestManagerFactoryTest.php b/tests/Unit/Container/RequestManagerFactoryTest.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chubbyphp\Tests\ApiHttp\Unit\Container;
+
+use Chubbyphp\ApiHttp\Container\RequestManagerFactory;
+use Chubbyphp\ApiHttp\Manager\RequestManagerInterface;
+use Chubbyphp\Deserialization\DeserializerInterface;
+use Chubbyphp\Mock\Call;
+use Chubbyphp\Mock\MockByCallsTrait;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+
+/**
+ * @covers \Chubbyphp\ApiHttp\Container\RequestManagerFactory
+ *
+ * @internal
+ */
+final class RequestManagerFactoryTest extends TestCase
+{
+    use MockByCallsTrait;
+
+    public function testInvoke(): void
+    {
+        /** @var DeserializerInterface $deserializer */
+        $deserializer = $this->getMockByCalls(DeserializerInterface::class);
+
+        /** @var ContainerInterface $container */
+        $container = $this->getMockByCalls(ContainerInterface::class, [
+            Call::create('get')->with(DeserializerInterface::class)->willReturn($deserializer),
+        ]);
+
+        $factory = new RequestManagerFactory();
+
+        $requestManager = $factory($container);
+
+        self::assertInstanceOf(RequestManagerInterface::class, $requestManager);
+    }
+}
diff --git a/tests/Unit/Container/ResponseManagerFactoryTest.php b/tests/Unit/Container/ResponseManagerFactoryTest.php
