Merge pull request #19 from lcobucci/psr-http-factories

Use PSR-17 factories
lcobucci · Jun 23, 2019 · cb13da8 · cb13da8
2 parents 63bea7f + d5a4045
commit cb13da8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 80 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,4 +53,4 @@ jobs:
         - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
         - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for mutation tests"; exit 1; fi
       script:
-        - ./vendor/bin/infection --threads=$(nproc) --min-msi=97 --min-covered-msi=97
+        - ./vendor/bin/infection --threads=$(nproc) --min-msi=100 --min-covered-msi=100
diff --git a/composer.json b/composer.json
@@ -22,6 +22,7 @@
         "php": "^7.3",
         "ext-json": "^1.7",
         "fig/http-message-util": "^1.1",
+        "psr/http-factory": "^1.0",
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {

diff --git a/src/ContentTypeMiddleware.php b/src/ContentTypeMiddleware.php
@@ -7,11 +7,9 @@
 use Middlewares\ContentType;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Stream;
-use function assert;
 use function strpos;
 use function substr;
 
@@ -23,7 +21,7 @@ final class ContentTypeMiddleware implements MiddlewareInterface
     private $negotiator;
 
     /**
-     * @var callable
+     * @var StreamFactoryInterface
      */
     private $streamFactory;
 
@@ -38,7 +36,7 @@ final class ContentTypeMiddleware implements MiddlewareInterface
     public function __construct(
         MiddlewareInterface $negotiator,
         array $formatters,
-        callable $streamFactory
+        StreamFactoryInterface $streamFactory
     ) {
         $this->negotiator    = $negotiator;
         $this->formatters    = $formatters;
@@ -52,14 +50,12 @@ public function __construct(
     public static function fromRecommendedSettings(
         array $formats,
         array $formatters,
-        ?callable $streamFactory = null
+        StreamFactoryInterface $streamFactory
     ): self {
         return new self(
             new ContentType($formats),
             $formatters,
-            $streamFactory ?? static function (): StreamInterface {
-                return new Stream('php://temp', 'wb+');
-            }
+            $streamFactory
         );
     }
 
@@ -98,18 +94,15 @@ private function extractContentType(string $contentType): string
      */
     private function formatResponse(UnformattedResponse $response, ?Formatter $formatter): ResponseInterface
     {
-        $body = ($this->streamFactory)();
-        assert($body instanceof StreamInterface);
-
-        $response = $response->withBody($body);
-
         if ($formatter === null) {
-            return $response->withStatus(StatusCodeInterface::STATUS_NOT_ACCEPTABLE);
+            return $response->withBody($this->streamFactory->createStream())
+                            ->withStatus(StatusCodeInterface::STATUS_NOT_ACCEPTABLE);
         }
 
-        $body->write($formatter->format($response->getUnformattedContent(), $response->getAttributes()));
-        $body->rewind();
-
-        return $response;
+        return $response->withBody(
+            $this->streamFactory->createStream(
+                $formatter->format($response->getUnformattedContent(), $response->getAttributes())
+            )
+        );
     }
 }
diff --git a/tests/ContentTypeMiddlewareTest.php b/tests/ContentTypeMiddlewareTest.php
@@ -3,22 +3,20 @@
 
 namespace Lcobucci\ContentNegotiation\Tests;
 
-use AssertionError;
 use Fig\Http\Message\StatusCodeInterface;
 use Lcobucci\ContentNegotiation\ContentTypeMiddleware;
 use Lcobucci\ContentNegotiation\Formatter;
 use Lcobucci\ContentNegotiation\Tests\Formatter\NaiveTemplateEngine;
 use Lcobucci\ContentNegotiation\UnformattedResponse;
-use PHPUnit\Framework\Error\Warning;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\EmptyResponse;
 use Zend\Diactoros\ServerRequest;
+use Zend\Diactoros\StreamFactory;
 use function array_map;
-use function ini_set;
 
 /**
  * @coversDefaultClass \Lcobucci\ContentNegotiation\ContentTypeMiddleware
@@ -170,61 +168,6 @@ public function processShouldReturnAResponseWithFormattedContentEvenWithoutForci
         self::assertJsonStringEqualsJsonString('{"id":1,"name":"Testing"}', (string) $response->getBody());
     }
 
-    /**
-     * @test
-     *
-     * @covers ::__construct()
-     * @covers ::fromRecommendedSettings()
-     * @covers ::process()
-     * @covers ::extractContentType()
-     * @covers ::formatResponse()
-     *
-     * @uses \Lcobucci\ContentNegotiation\UnformattedResponse
-     * @uses \Lcobucci\ContentNegotiation\Formatter\Json
-     */
-    public function processShouldRaiseExceptionWhenInvalidStreamWasCreatedInDevelopmentMode(): void
-    {
-        ini_set('assert.exception', '1');
-
-        $this->expectException(AssertionError::class);
-        $this->processWithInvalidStreamFactory();
-    }
-
-    /**
-     * @test
-     *
-     * @covers ::__construct()
-     * @covers ::fromRecommendedSettings()
-     * @covers ::process()
-     * @covers ::extractContentType()
-     * @covers ::formatResponse()
-     *
-     * @uses \Lcobucci\ContentNegotiation\UnformattedResponse
-     * @uses \Lcobucci\ContentNegotiation\Formatter\Json
-     */
-    public function processShouldRaiseAWarningWhenInvalidStreamWasCreatedInDevelopmentMode(): void
-    {
-        ini_set('assert.exception', '0');
-
-        $this->expectException(Warning::class);
-        $this->processWithInvalidStreamFactory();
-    }
-
-    private function processWithInvalidStreamFactory(): void
-    {
-        $middleware = $this->createMiddleware(
-            true,
-            static function () {
-                return false;
-            }
-        );
-
-        $middleware->process(
-            new ServerRequest(),
-            $this->createRequestHandler($this->createResponse())
-        );
-    }
-
     /**
      * @param mixed[] $attributes
      */
@@ -261,15 +204,15 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         };
     }
 
-    private function createMiddleware(bool $forceCharset = true, ?callable $streamFactory = null): ContentTypeMiddleware
+    private function createMiddleware(bool $forceCharset = true): ContentTypeMiddleware
     {
         return ContentTypeMiddleware::fromRecommendedSettings(
             $this->configureCharset($forceCharset),
             [
                 'application/json' => new Formatter\Json(),
                 'text/html'        => new NaiveTemplateEngine(),
             ],
-            $streamFactory
+            new StreamFactory()
         );
     }