Merge branch 'master' into v4

Dominik Zogg · Dominik Zogg · commit 079d37627fed · 2020-08-22T19:43:40.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,31 @@
+dist: bionic
+
 language: php
 
 matrix:
   include:
     - php: 7.2
-      env: dependencies=lowest
+      env: composerargs="--prefer-lowest"
     - php: 7.2
     - php: 7.3
-      env: dependencies=lowest
+      env: composerargs="--prefer-lowest"
     - php: 7.3
     - php: 7.4
-      env: dependencies=lowest
+      env: composerargs="--prefer-lowest"
     - php: 7.4
+    - php: nightly
+      env: composerargs="--ignore-platform-reqs"
+  allow_failures:
+    - php: nightly
 
 before_script:
-  - echo 'extension=apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/apcu.ini
+  - (phpenv config-rm xdebug.ini || exit 0)
+  - pecl install pcov
   - echo 'Europe/Zurich' | sudo tee /etc/timezone
   - echo 'date.timezone = "Europe/Zurich"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer self-update -q
   - composer global require hirak/prestissimo
-  - if [ -z "$dependencies" ]; then composer update -n; fi;
-  - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest -n; fi;
+  - composer update $composerargs -n
 
 script:
   - composer test
diff --git a/README.md b/README.md
@@ -2,10 +2,10 @@
 
 [![Build Status](https://api.travis-ci.org/chubbyphp/chubbyphp-api-http.png?branch=master)](https://travis-ci.org/chubbyphp/chubbyphp-api-http)
 [![Coverage Status](https://coveralls.io/repos/github/chubbyphp/chubbyphp-api-http/badge.svg?branch=master)](https://coveralls.io/github/chubbyphp/chubbyphp-api-http?branch=master)
+[![Latest Stable Version](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/v/stable.png)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
 [![Total Downloads](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/downloads.png)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
 [![Monthly Downloads](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/d/monthly)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
-[![Latest Stable Version](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/v/stable.png)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
-[![Latest Unstable Version](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/v/unstable)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
+[![Daily Downloads](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/d/daily)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
 
 ## Description
 
@@ -15,7 +15,7 @@ A simple http handler implementation for API.
 
  * php: ^7.2
  * chubbyphp/chubbyphp-deserialization: ^3.0
- * chubbyphp/chubbyphp-negotiation: ^1.5.3
+ * chubbyphp/chubbyphp-negotiation: ^1.6
  * chubbyphp/chubbyphp-serialization: ^3.0
  * psr/http-factory: ^1.0.1
  * psr/http-message: ^1.0.1
@@ -33,24 +33,32 @@ composer require chubbyphp/chubbyphp-api-http "^4.0"
 ## 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
@@ -12,7 +12,7 @@
     "require": {
         "php": "^7.2",
         "chubbyphp/chubbyphp-deserialization": "^3.0@dev",
-        "chubbyphp/chubbyphp-negotiation": "^1.5.3",
+        "chubbyphp/chubbyphp-negotiation": "^1.6",
         "chubbyphp/chubbyphp-serialization": "^3.0@dev",
         "psr/http-factory": "^1.0.1",
         "psr/http-message": "^1.0.1",
@@ -65,6 +65,6 @@
         "test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",
         "test:loc": "mkdir -p build && vendor/bin/phploc src --verbose | tee build/phploc.log",
         "test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=7 --error-format=junit | tee build/phpstan.junit.xml; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
-        "test:unit": "phpdbg -qrr vendor/bin/phpunit --testsuite=Unit --coverage-text --coverage-clover=build/phpunit/clover.xml --coverage-html=build/phpunit/coverage-html --coverage-xml=build/phpunit/coverage-xml --log-junit=build/phpunit/junit.xml --cache-result-file=build/phpunit/result.cache"
+        "test:unit": "vendor/bin/phpunit --testsuite=Unit --coverage-text --coverage-clover=build/phpunit/clover.xml --coverage-html=build/phpunit/coverage-html --coverage-xml=build/phpunit/coverage-xml --log-junit=build/phpunit/junit.xml --cache-result-file=build/phpunit/result.cache"
     }
 }
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
diff --git a/tests/Unit/Container/ResponseManagerFactoryTest.php b/tests/Unit/Container/ResponseManagerFactoryTest.php
