From 2ef9367081875d1496b0de14e58ebca220c76b41 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Sat, 4 Jan 2020 15:10:52 +0000
Subject: [PATCH] Removed legacy HTTP PSR code

---
 composer.json                                   |  2 +-
 .../Routing/RoutingServiceProvider.php          | 17 +++--------------
 src/Illuminate/Routing/composer.json            |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index 6978f65b9051..6c666dd24c01 100644
--- a/composer.json
+++ b/composer.json
@@ -134,7 +134,7 @@
         "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
         "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
         "symfony/cache": "Required to PSR-6 cache bridge (^5.0).",
-        "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).",
+        "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
         "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
     },
     "config": {
diff --git a/src/Illuminate/Routing/RoutingServiceProvider.php b/src/Illuminate/Routing/RoutingServiceProvider.php
index 2979e9d9f5e9..99e93026dd68 100755
--- a/src/Illuminate/Routing/RoutingServiceProvider.php
+++ b/src/Illuminate/Routing/RoutingServiceProvider.php
@@ -9,13 +9,10 @@
 use Illuminate\Routing\Contracts\ControllerDispatcher as ControllerDispatcherContract;
 use Illuminate\Support\ServiceProvider;
 use Nyholm\Psr7\Factory\Psr17Factory;
-use Nyholm\Psr7\Response as NyholmPsrResponse;
+use Nyholm\Psr7\Response as PsrResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
-use Zend\Diactoros\Response as ZendPsrResponse;
-use Zend\Diactoros\ServerRequestFactory;
 
 class RoutingServiceProvider extends ServiceProvider
 {
@@ -140,10 +137,6 @@ protected function registerPsrRequest()
                     ->createRequest($app->make('request'));
             }
 
-            if (class_exists(ServerRequestFactory::class) && class_exists(DiactorosFactory::class)) {
-                return (new DiactorosFactory)->createRequest($app->make('request'));
-            }
-
             throw new Exception('Unable to resolve PSR request. Please install symfony/psr-http-message-bridge and nyholm/psr7.');
         });
     }
@@ -156,12 +149,8 @@ protected function registerPsrRequest()
     protected function registerPsrResponse()
     {
         $this->app->bind(ResponseInterface::class, function () {
-            if (class_exists(NyholmPsrResponse::class)) {
-                return new NyholmPsrResponse;
-            }
-
-            if (class_exists(ZendPsrResponse::class)) {
-                return new ZendPsrResponse;
+            if (class_exists(PsrResponse::class)) {
+                return new PsrResponse;
             }
 
             throw new Exception('Unable to resolve PSR response. Please install nyholm/psr7.');
diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json
index 426962d37f04..7c1c2b0a14e5 100644
--- a/src/Illuminate/Routing/composer.json
+++ b/src/Illuminate/Routing/composer.json
@@ -39,7 +39,7 @@
     "suggest": {
         "illuminate/console": "Required to use the make commands (^7.0).",
         "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
-        "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2)."
+        "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
     },
     "config": {
         "sort-packages": true