From d586eb9d7e1764ba84262df1cba17442d3795932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Thu, 21 Apr 2022 18:05:34 +0200
Subject: [PATCH] extractExtensionFromUrl refactoring

---
 src/Support/helpers.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index e80dea7f..1a1dc13e 100644
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -1166,12 +1166,15 @@ if (! function_exists('replace_occurrence')) {
          */
         function extractExtensionFromUrl($url, $response): string|null
         {
-            $string = str_replace(['&'], '?', pathinfo($url)['extension']);
+            $extension = null;
 
-            // Get extension from url path
-            $extension = array_key_exists('extension', pathinfo($url))
-                ? explode('?', $string)[0]
-                : null;
+            if (array_key_exists('extension', pathinfo($url))) {
+                // Break attributes
+                $string = str_replace(['&'], '?', pathinfo($url)['extension']);
+
+                // Get extension from url path
+                $extension = explode('?', $string)[0];
+            }
 
             // Return pure extension
             if ($extension) {
@@ -1183,7 +1186,7 @@ if (! function_exists('replace_occurrence')) {
 
             // Get extension
             if (array_key_exists('content-type', $header)) {
-                return '.' . explode('/', $header['content-type'][0])[1];
+                return explode('/', $header['content-type'][0])[1];
             }
 
             return null;