Merge branch 'improvement/368'

Close #368
zendframework · Sep 1, 2019 · 7686720 · 7686720
2 parents ff581e3 + eee8d7e
commit 7686720
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/functions/create_uploaded_file.php b/src/functions/create_uploaded_file.php
@@ -33,7 +33,7 @@ function createUploadedFile(array $spec) : UploadedFile
         $spec['tmp_name'],
         $spec['size'],
         $spec['error'],
-        isset($spec['name']) ? $spec['name'] : null,
-        isset($spec['type']) ? $spec['type'] : null
+        $spec['name'] ?? null,
+        $spec['type'] ?? null
     );
 }
diff --git a/src/functions/marshal_method_from_sapi.php b/src/functions/marshal_method_from_sapi.php
@@ -14,5 +14,5 @@
  */
 function marshalMethodFromSapi(array $server) : string
 {
-    return isset($server['REQUEST_METHOD']) ? $server['REQUEST_METHOD'] : 'GET';
+    return $server['REQUEST_METHOD'] ?? 'GET';
 }
diff --git a/src/functions/marshal_uri_from_sapi.php b/src/functions/marshal_uri_from_sapi.php
@@ -132,19 +132,19 @@ function marshalUriFromSapi(array $server, array $headers) : Uri
     $marshalRequestPath = function (array $server) : string {
         // IIS7 with URL Rewrite: make sure we get the unencoded url
         // (double slash problem).
-        $iisUrlRewritten = array_key_exists('IIS_WasUrlRewritten', $server) ? $server['IIS_WasUrlRewritten'] : null;
-        $unencodedUrl    = array_key_exists('UNENCODED_URL', $server) ? $server['UNENCODED_URL'] : '';
+        $iisUrlRewritten = $server['IIS_WasUrlRewritten'] ?? null;
+        $unencodedUrl    = $server['UNENCODED_URL'] ?? '';
         if ('1' === $iisUrlRewritten && ! empty($unencodedUrl)) {
             return $unencodedUrl;
         }
 
-        $requestUri = array_key_exists('REQUEST_URI', $server) ? $server['REQUEST_URI'] : null;
+        $requestUri = $server['REQUEST_URI'] ?? null;
 
         if ($requestUri !== null) {
             return preg_replace('#^[^/:]+://[^/]+#', '', $requestUri);
         }
 
-        $origPathInfo = array_key_exists('ORIG_PATH_INFO', $server) ? $server['ORIG_PATH_INFO'] : null;
+        $origPathInfo = $server['ORIG_PATH_INFO'] ?? null;
         if (empty($origPathInfo)) {
             return '/';
         }

diff --git a/src/functions/normalize_uploaded_files.php b/src/functions/normalize_uploaded_files.php
@@ -49,17 +49,17 @@ function normalizeUploadedFiles(array $files) : array
                     $tmpNameTree[$key],
                     $sizeTree[$key],
                     $errorTree[$key],
-                    isset($nameTree[$key]) ? $nameTree[$key] : null,
-                    isset($typeTree[$key]) ? $typeTree[$key] : null
+                    $nameTree[$key] ?? null,
+                    $typeTree[$key] ?? null
                 );
                 continue;
             }
             $normalized[$key] = createUploadedFile([
                 'tmp_name' => $tmpNameTree[$key],
                 'size' => $sizeTree[$key],
                 'error' => $errorTree[$key],
-                'name' => isset($nameTree[$key]) ? $nameTree[$key] : null,
-                'type' => isset($typeTree[$key]) ? $typeTree[$key] : null
+                'name' => $nameTree[$key] ?? null,
+                'type' => $typeTree[$key] ?? null,
             ]);
         }
         return $normalized;
@@ -96,8 +96,8 @@ function normalizeUploadedFiles(array $files) : array
             $files['tmp_name'],
             $files['size'],
             $files['error'],
-            isset($files['name']) ? $files['name'] : null,
-            isset($files['type']) ? $files['type'] : null
+            $files['name'] ?? null,
+            $files['type'] ?? null
         );
     };