Merged logic and reduced overall complexity of function

Note: if() constructions that return boolean values based on conditions, can be simplified to return the condition instead.
magento · Feb 15, 2019 · dac6687 · dac6687
1 parent 7058adb
commit dac6687
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -27,31 +27,18 @@ class Http extends File
      *
      * @param string $path
      * @return bool
-     * @throws FileSystemException
      */
     public function isExists($path)
     {
         $headers = array_change_key_case(get_headers($this->getScheme() . $path, 1), CASE_LOWER);
-
         $status = $headers[0];
 
-        /* Handling 302 redirection */
-        if (strpos($status, '302 Found') !== false && isset($headers[1])) {
-            $status = $headers[1];
-        }
-
-        /* Handling 301 redirection */
-        if (strpos($status, '301 Moved Permanently') !== false && isset($headers[1])) {
+        /* Handling 301 or 302 redirection */
+        if (isset($headers[1]) && preg_match('/^30[12]/', $status)) {
             $status = $headers[1];
         }
 
-        if (strpos($status, '200 OK') === false) {
-            $result = false;
-        } else {
-            $result = true;
-        }
-
-        return $result;
+        return !(strpos($status, '200 OK') === false);
     }
 
     /**