bug symfony#54 Fix symfony#51 (compatability issue with zendframework/zend-diactoros ^2.0) (uphlewis)

nicolas-grekas · nicolas-grekas · commit 50769343602e · 2019-03-11T15:20:09.000+01:00
This PR was merged into the 1.1-dev branch. Discussion ---------- Fix symfony#51 (compatability issue with zendframework/zend-diactoros ^2.0) Uses method_exists to check whether the object has the required method, and uses the new namespaced function(s) if not. Commits ------- 8ff61e5 Fix compatability issue with "zendframework/zend-diactoros": "^2.0." (symfony#51)
diff --git a/Factory/DiactorosFactory.php b/Factory/DiactorosFactory.php
@@ -43,7 +43,9 @@ public function __construct()
      */
     public function createRequest(Request $symfonyRequest)
     {
-        $server = DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all());
+        $server = method_exists('Zend\Diactoros\ServerRequestFactory', 'normalizeServer')
+            ? DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all())
+            : \Zend\Diactoros\normalizeServer($symfonyRequest->server->all());
         $headers = $symfonyRequest->headers->all();
 
         if (PHP_VERSION_ID < 50600) {
@@ -53,9 +55,13 @@ public function createRequest(Request $symfonyRequest)
             $body = new DiactorosStream($symfonyRequest->getContent(true));
         }
 
+        $files = method_exists('Zend\Diactoros\ServerRequestFactory', 'normalizeFiles')
+            ? DiactorosRequestFactory::normalizeFiles($this->getFiles($symfonyRequest->files->all()))
+            : \Zend\Diactoros\normalizeUploadedFiles($this->getFiles($symfonyRequest->files->all()));
+
         $request = new ServerRequest(
             $server,
-            DiactorosRequestFactory::normalizeFiles($this->getFiles($symfonyRequest->files->all())),
+            $files,
             $symfonyRequest->getSchemeAndHttpHost().$symfonyRequest->getRequestUri(),
             $symfonyRequest->getMethod(),
             $body,
