symfony · fabpot · Jul 30, 2023 · May 21, 2015 · May 21, 2015 · May 29, 2015
diff --git a/composer.json b/composer.json
@@ -44,6 +44,7 @@
         "psr/clock": "^1.0",
         "psr/container": "^1.1|^2.0",
         "psr/event-dispatcher": "^1.0",
+        "psr/http-message": "^1.0|^2.0",
         "psr/link": "^1.1|^2.0",
         "psr/log": "^1|^2|^3",
         "symfony/contracts": "^2.5|^3.0",
@@ -94,6 +95,7 @@
         "symfony/property-access": "self.version",
         "symfony/property-info": "self.version",
         "symfony/proxy-manager-bridge": "self.version",
+        "symfony/psr-http-message-bridge": "self.version",
         "symfony/rate-limiter": "self.version",
         "symfony/remote-event": "self.version",
         "symfony/routing": "self.version",
@@ -182,6 +184,7 @@
             "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
             "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
             "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
+            "Symfony\\Bridge\\PsrHttpMessage\\": "src/Symfony/Bridge/PsrHttpMessage/",
             "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
             "Symfony\\Bundle\\": "src/Symfony/Bundle/",
             "Symfony\\Component\\": "src/Symfony/Component/"

diff --git a/src/Symfony/Bridge/PsrHttpMessage/.gitattributes b/src/Symfony/Bridge/PsrHttpMessage/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Bridge/PsrHttpMessage/.gitignore b/src/Symfony/Bridge/PsrHttpMessage/.gitignore
@@ -0,0 +1,4 @@
+vendor/
+composer.lock
+phpunit.xml
+/Tests/Fixtures/App/var
diff --git a/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/PsrServerRequestResolver.php b/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/PsrServerRequestResolver.php
@@ -0,0 +1,61 @@
+<?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\ArgumentValueResolver;
+
+use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as BaseValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+
+/**
+ * Injects the RequestInterface, MessageInterface or ServerRequestInterface when requested.
+ *
+ * @author Iltar van der Berg <kjarli@gmail.com>
+ * @author Alexander M. Turek <me@derrabus.de>
+ */
+final class PsrServerRequestResolver implements ArgumentValueResolverInterface, ValueResolverInterface
+{
+    private const SUPPORTED_TYPES = [
+        ServerRequestInterface::class => true,
+        RequestInterface::class => true,
+        MessageInterface::class => true,
+    ];
+
+    private $httpMessageFactory;
+
+    public function __construct(HttpMessageFactoryInterface $httpMessageFactory)
+    {
+        $this->httpMessageFactory = $httpMessageFactory;
+    }
+
+    public function supports(Request $request, ArgumentMetadata $argument): bool
+    {
+        if ($this instanceof BaseValueResolverInterface) {
+            trigger_deprecation('symfony/psr-http-message-bridge', '2.3', 'Method "%s" is deprecated, call "resolve()" without calling "supports()" first.', __METHOD__);
+        }
+
+        return self::SUPPORTED_TYPES[$argument->getType()] ?? false;
+    }
+
+    public function resolve(Request $request, ArgumentMetadata $argument): \Traversable
+    {
+        if (!isset(self::SUPPORTED_TYPES[$argument->getType()])) {
+            return;
+        }
+
+        yield $this->httpMessageFactory->createRequest($request);
+    }
+}
diff --git a/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/ValueResolverInterface.php b/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/ValueResolverInterface.php
@@ -0,0 +1,26 @@
+<?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\ArgumentValueResolver;
+
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as BaseValueResolverInterface;
+
+if (interface_exists(BaseValueResolverInterface::class)) {
+    /** @internal */
+    interface ValueResolverInterface extends BaseValueResolverInterface
+    {
+    }
+} else {
+    /** @internal */
+    interface ValueResolverInterface
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PsrHttpMessage/CHANGELOG.md b/src/Symfony/Bridge/PsrHttpMessage/CHANGELOG.md
@@ -0,0 +1,107 @@
+CHANGELOG
+=========
+
+6.4
+---
+
+ * Import the bridge into the Symfony monorepo and synchronize releases
+
+2.3.1
+-----
+
+ * Don't rely on `Request::getPayload()` to populate the parsed body
+
+2.3.0
+-----
+
+ * Leverage `Request::getPayload()` to populate the parsed body of PSR-7 requests
+ * Implement `ValueResolverInterface` introduced with Symfony 6.2
+
+2.2.0
+-----
+
+ * Drop support for Symfony 4
+ * Bump minimum version of PHP to 7.2
+ * Support version 2 of the psr/http-message contracts
+
+2.1.3
+-----
+
+ * Ignore invalid HTTP headers when creating PSR7 objects
+ * Fix for wrong type passed to `moveTo()`
+
+2.1.2
+-----
+
+ * Allow Symfony 6
+
+2.1.0
+-----
+
+ * Added a `PsrResponseListener` to automatically convert PSR-7 responses returned by controllers
+ * Added a `PsrServerRequestResolver` that allows injecting PSR-7 request objects into controllers
+
+2.0.2
+-----
+
+ * Fix populating server params from URI in HttpFoundationFactory
+ * Create cookies as raw in HttpFoundationFactory
+ * Fix BinaryFileResponse with Content-Range PsrHttpFactory
+
+2.0.1
+-----
+
+ * Don't normalize query string in PsrHttpFactory
+ * Fix conversion for HTTPS requests
+ * Fix populating default port and headers in HttpFoundationFactory
+
+2.0.0
+-----
+
+ * Remove DiactorosFactory
+
+1.3.0
+-----
+
+ * Added support for streamed requests
+ * Added support for Symfony 5.0+
+ * Fixed bridging UploadedFile objects
+ * Bumped minimum version of Symfony to 4.4
+
+1.2.0
+-----
+
+ * Added new documentation links
+ * Bumped minimum version of PHP to 7.1
+ * Added support for streamed responses
+
+1.1.2
+-----
+
+ * Fixed createResponse
+
+1.1.1
+-----
+
+ * Deprecated DiactorosFactory, use PsrHttpFactory instead
+ * Removed triggering of deprecation
+
+1.1.0
+-----
+
+ * Added support for creating PSR-7 messages using PSR-17 factories
+
+1.0.2
+-----
+
+ * Fixed request target in PSR7 Request (mtibben)
+
+1.0.1
+-----
+
+ * Added support for Symfony 4 (dunglas)
+
+1.0.0
+-----
+
+ * Initial release
diff --git a/src/Symfony/Bridge/PsrHttpMessage/EventListener/PsrResponseListener.php b/src/Symfony/Bridge/PsrHttpMessage/EventListener/PsrResponseListener.php
@@ -0,0 +1,56 @@
+<?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\EventListener;
+
+use Psr\Http\Message\ResponseInterface;
+use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
+use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\ViewEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Converts PSR-7 Response to HttpFoundation Response using the bridge.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Alexander M. Turek <me@derrabus.de>
+ */
+final class PsrResponseListener implements EventSubscriberInterface
+{
+    private $httpFoundationFactory;
+
+    public function __construct(HttpFoundationFactoryInterface $httpFoundationFactory = null)
+    {
+        $this->httpFoundationFactory = $httpFoundationFactory ?? new HttpFoundationFactory();
+    }
+
+    /**
+     * Do the conversion if applicable and update the response of the event.
+     */
+    public function onKernelView(ViewEvent $event): void
+    {
+        $controllerResult = $event->getControllerResult();
+
+        if (!$controllerResult instanceof ResponseInterface) {
+            return;
+        }
+
+        $event->setResponse($this->httpFoundationFactory->createResponse($controllerResult));
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            KernelEvents::VIEW => 'onKernelView',
+        ];
+    }
+}