Add a bundle

.travis.yml

@@ -26,6 +26,8 @@ matrix:
         - php: 7.4
           env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text" XDEBUG_MODE=coverage
         - php: 8.0
+        - php: 8.0
+          env: VENDORS=minimal
 
           # Latest commit to master
         - php: 7.4
@@ -38,7 +40,7 @@ matrix:
 before_install:
     - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
     - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
-    - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
+    - if ! [ $DEPENDENCIES == "minimal" ]; then composer remove --dev --no-update nyholm/psr7 laminas/laminas-diactoros; fi;
 
 install:
     # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355

Bundle/DependencyInjection/Configuration.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Bundle\DependencyInjection;
+
+use Laminas\Diactoros\RequestFactory;
+use Laminas\Diactoros\ServerRequestFactory;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+/**
+ * @author Alexander M. Turek <me@derrabus.de>
+ */
+final class Configuration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder(): TreeBuilder
+    {
+        $treeBuilder = new TreeBuilder('psr_http_message');
+        $rootNode = $treeBuilder->getRootNode();
+
+        $rootNode->children()
+            ->arrayNode('message_factories')
+                ->{class_exists(Psr17Factory::class) || class_exists(ServerRequestFactory::class) ? 'canBeDisabled' : 'canBeEnabled'}()
+                ->children()
+                    ->enumNode('implementation')
+                        ->info('The PSR-7 implementation to use. By default, the bundle will configure the Nyholm implementation if it\'s available.')
+                        ->values(['nyholm', 'diactoros'])
+                        ->defaultValue(class_exists(Psr17Factory::class) || !class_exists(ServerRequestFactory::class) ? 'nyholm' : 'diactoros')
+                        ->validate()
+                            ->ifTrue(function ($value) {
+                                return 'nyholm' === $value && !class_exists(Psr17Factory::class);
+                            })->thenInvalid('Cannot configure Nyholm\'s PSR-7 implementation. Try running "composer require nyholm/psr7".')
+                        ->end()
+                        ->validate()
+                            ->ifTrue(function ($value) {
+                                return 'diactoros' === $value && !class_exists(RequestFactory::class);
+                            })->thenInvalid('Cannot configure Diactoros. Try running "composer require laminas/laminas-diactoros".')
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->arrayNode('message_converters')
+                ->info('Converters that enable controllers to operate on PSR-7 messages')
+                ->canBeEnabled()
+            ->end()
+            ->integerNode('response_buffer')
+                ->info('The maximum output buffering size for each iteration when sending the response')
+                ->min(1)
+                ->defaultValue(16372)
+            ->end()
+        ;
+
+        return $treeBuilder;
+    }
+}

Bundle/DependencyInjection/PsrHttpMessageExtension.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Bundle\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+/**
+ * @author Alexander M. Turek <me@derrabus.de>
+ */
+final class PsrHttpMessageExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container): void
+    {
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
+        $loader->load('http_foundation.php');
+
+        $configuration = $this->getConfiguration($configs, $container);
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $container->setParameter('psr_http_message.response_buffer', $config['response_buffer']);
+
+        if ($config['message_converters']['enabled']) {
+            $loader->load('message_converters.php');
+        }
+
+        switch ($config['message_factories']['enabled'] ? $config['message_factories']['implementation'] : 'disabled') {
+            case 'nyholm':
+                $loader->load('nyholm.php');
+                $loader->load('psr_factories.php');
+                break;
+            case 'diactoros':
+                $loader->load('diactoros.php');
+                $loader->load('psr_factories.php');
+                break;
+            default:
+                $container->removeDefinition('psr_http_message.server_request_resolver');
+                break;
+        }
+    }
+}

Bundle/PsrHttpMessageBundle.php

@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Bundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * @author Alexander M. Turek <me@derrabus.de>
+ */
+final class PsrHttpMessageBundle extends Bundle
+{
+}

Bundle/Resources/config/diactoros.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Laminas\Diactoros\RequestFactory;
+use Laminas\Diactoros\ResponseFactory;
+use Laminas\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\StreamFactory;
+use Laminas\Diactoros\UploadedFileFactory;
+use Laminas\Diactoros\UriFactory;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('psr_http_message.diactoros.request_factory', RequestFactory::class)
+        ->set('psr_http_message.diactoros.response_factory', ResponseFactory::class)
+        ->set('psr_http_message.diactoros.server_request_factory', ServerRequestFactory::class)
+        ->set('psr_http_message.diactoros.stream_factory', StreamFactory::class)
+        ->set('psr_http_message.diactoros.uploaded_file_factory', UploadedFileFactory::class)
+        ->set('psr_http_message.diactoros.uri_factory', UriFactory::class)
+
+        ->alias('psr_http_message.psr.request_factory', 'psr_http_message.diactoros.request_factory')
+        ->alias('psr_http_message.psr.response_factory', 'psr_http_message.diactoros.response_factory')
+        ->alias('psr_http_message.psr.server_request_factory', 'psr_http_message.diactoros.server_request_factory')
+        ->alias('psr_http_message.psr.stream_factory', 'psr_http_message.diactoros.stream_factory')
+        ->alias('psr_http_message.psr.uploaded_file_factory', 'psr_http_message.diactoros.uploaded_file_factory')
+        ->alias('psr_http_message.psr.uri_factory', 'psr_http_message.diactoros.uri_factory')
+    ;
+};

Bundle/Resources/config/http_foundation.php

@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
+use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('psr_http_message.http_foundation_factory', HttpFoundationFactory::class)
+            ->args(['%psr_http_message.response_buffer%'])
+
+        ->alias(HttpFoundationFactoryInterface::class, 'psr_http_message.http_foundation_factory')
+    ;
+};

Bundle/Resources/config/message_converters.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Bridge\PsrHttpMessage\ArgumentValueResolver\PsrServerRequestResolver;
+use Symfony\Bridge\PsrHttpMessage\EventListener\PsrResponseListener;
+use Symfony\Component\DependencyInjection\Reference;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('psr_http_message.response_listener', PsrResponseListener::class)
+            ->args([new Reference('psr_http_message.http_foundation_factory')])
+            ->tag('kernel.event_subscriber')
+
+        ->set('psr_http_message.server_request_resolver', PsrServerRequestResolver::class)
+            ->args([new Reference('psr_http_message.psr_http_factory')])
+            ->tag('controller.argument_value_resolver')
+    ;
+};

Bundle/Resources/config/nyholm.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Nyholm\Psr7\Factory\Psr17Factory;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('psr_http_message.nyholm.factory', Psr17Factory::class)
+
+        ->alias('psr_http_message.psr.request_factory', 'psr_http_message.nyholm.factory')
+        ->alias('psr_http_message.psr.response_factory', 'psr_http_message.nyholm.factory')
+        ->alias('psr_http_message.psr.server_request_factory', 'psr_http_message.nyholm.factory')
+        ->alias('psr_http_message.psr.stream_factory', 'psr_http_message.nyholm.factory')
+        ->alias('psr_http_message.psr.uploaded_file_factory', 'psr_http_message.nyholm.factory')
+        ->alias('psr_http_message.psr.uri_factory', 'psr_http_message.nyholm.factory')
+    ;
+};

Bundle/Resources/config/psr_factories.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ServerRequestFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\UploadedFileFactoryInterface;
+use Psr\Http\Message\UriFactoryInterface;
+use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
+use Symfony\Component\DependencyInjection\Reference;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('psr_http_message.psr_http_factory', PsrHttpFactory::class)
+        ->args([
+            new Reference('psr_http_message.psr.server_request_factory'),
+            new Reference('psr_http_message.psr.stream_factory'),
+            new Reference('psr_http_message.psr.uploaded_file_factory'),
+            new Reference('psr_http_message.psr.response_factory'),
+        ])
+
+        ->alias(HttpMessageFactoryInterface::class, 'psr_http_message.psr_http_factory')
+
+        ->alias(RequestFactoryInterface::class, 'psr_http_message.psr.request_factory')
+        ->alias(ResponseFactoryInterface::class, 'psr_http_message.psr.response_factory')
+        ->alias(ServerRequestFactoryInterface::class, 'psr_http_message.psr.server_request_factory')
+        ->alias(StreamFactoryInterface::class, 'psr_http_message.psr.stream_factory')
+        ->alias(UploadedFileFactoryInterface::class, 'psr_http_message.psr.uploaded_file_factory')
+        ->alias(UriFactoryInterface::class, 'psr_http_message.psr.uri_factory')
+    ;
+};

CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+# 2.2.0 (TBA)
+
+  * Added a bundle that integrates the bridge into Symfony applications
+
 # 2.1.0 (2021-02-17)
 
   * Added a `PsrResponseListener` to automatically convert PSR-7 responses returned by controllers

Tests/Factory/PsrHttpFactoryTest.php

@@ -23,6 +23,10 @@ class PsrHttpFactoryTest extends AbstractHttpMessageFactoryTest
 {
     protected function buildHttpMessageFactory(): HttpMessageFactoryInterface
     {
+        if (!class_exists(Psr17Factory::class)) {
+            self::markTestSkipped('This test requires nyholm/psr7.');
+        }
+
         $factory = new Psr17Factory();
 
         return new PsrHttpFactory($factory, $factory, $factory, $factory);