From 7da4643a39e8bf1da80ea2653d0ecba10a71bc9c Mon Sep 17 00:00:00 2001
From: mad-develop <40065929+mad-develop@users.noreply.github.com>
Date: Wed, 30 Jan 2019 11:35:05 +0100
Subject: [PATCH 1/6] Update CoolUri.php

Fix warning for rawurlencode if array is given...
---
 Classes/Integration/CoolUri.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Classes/Integration/CoolUri.php b/Classes/Integration/CoolUri.php
index 02347f6..913d3e0 100644
--- a/Classes/Integration/CoolUri.php
+++ b/Classes/Integration/CoolUri.php
@@ -610,7 +610,13 @@ private static function extractArraysFromParams($params)
         if (empty($params)) {
             return Array();
         }
-        foreach ($params as $k => $v) $params[$k] = $k . '=' . rawurlencode($v);
+        if (!is_array($value)) {
+            $params[$param] = $param . '=' . rawurlencode($value);
+        } else {
+            foreach ($value as $subParam => $subValue) {
+                $params[$param] = $param . '[' . $subParam . ']=' . rawurlencode($subValue);
+            }
+	    }
         $qs = implode('&', $params);
         parse_str($qs, $output);
         return $output;

From e3e789a89a08f0d80426f86008b90bbf85dbbcaf Mon Sep 17 00:00:00 2001
From: mad-develop <40065929+mad-develop@users.noreply.github.com>
Date: Wed, 30 Jan 2019 11:37:15 +0100
Subject: [PATCH 2/6] Update CoolUri.php

Fixed indentation...
---
 Classes/Integration/CoolUri.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Integration/CoolUri.php b/Classes/Integration/CoolUri.php
index 913d3e0..44acf89 100644
--- a/Classes/Integration/CoolUri.php
+++ b/Classes/Integration/CoolUri.php
@@ -616,7 +616,7 @@ private static function extractArraysFromParams($params)
             foreach ($value as $subParam => $subValue) {
                 $params[$param] = $param . '[' . $subParam . ']=' . rawurlencode($subValue);
             }
-	    }
+        }
         $qs = implode('&', $params);
         parse_str($qs, $output);
         return $output;

From 710355d505480d88e7ef10eeb222ca45574e2de4 Mon Sep 17 00:00:00 2001
From: mad-develop <40065929+mad-develop@users.noreply.github.com>
Date: Wed, 30 Jan 2019 13:54:37 +0100
Subject: [PATCH 3/6] Merge remote-tracking branch 'upstream/master'

Revert
---
 Classes/Integration/CoolUri.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Classes/Integration/CoolUri.php b/Classes/Integration/CoolUri.php
index 44acf89..0fd0fba 100644
--- a/Classes/Integration/CoolUri.php
+++ b/Classes/Integration/CoolUri.php
@@ -610,6 +610,7 @@ private static function extractArraysFromParams($params)
         if (empty($params)) {
             return Array();
         }
+<<<<<<< HEAD
         if (!is_array($value)) {
             $params[$param] = $param . '=' . rawurlencode($value);
         } else {
@@ -617,6 +618,9 @@ private static function extractArraysFromParams($params)
                 $params[$param] = $param . '[' . $subParam . ']=' . rawurlencode($subValue);
             }
         }
+=======
+        foreach ($params as $k => $v) $params[$k] = $k . '=' . rawurlencode($v);
+>>>>>>> parent of 7da4643... Update CoolUri.php
         $qs = implode('&', $params);
         parse_str($qs, $output);
         return $output;

From 6355369c97eef346a45b626588deca7a643d2239 Mon Sep 17 00:00:00 2001
From: mad-develop <40065929+mad-develop@users.noreply.github.com>
Date: Wed, 30 Jan 2019 13:58:17 +0100
Subject: [PATCH 4/6] Update CoolUri.php

---
 Classes/Integration/CoolUri.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Classes/Integration/CoolUri.php b/Classes/Integration/CoolUri.php
index 0fd0fba..afc90b6 100644
--- a/Classes/Integration/CoolUri.php
+++ b/Classes/Integration/CoolUri.php
@@ -610,6 +610,7 @@ private static function extractArraysFromParams($params)
         if (empty($params)) {
             return Array();
         }
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (!is_array($value)) {
             $params[$param] = $param . '=' . rawurlencode($value);
@@ -618,6 +619,9 @@ private static function extractArraysFromParams($params)
                 $params[$param] = $param . '[' . $subParam . ']=' . rawurlencode($subValue);
             }
         }
+=======
+        foreach ($params as $k => $v) $params[$k] = $k . '=' . rawurlencode($v);
+>>>>>>> parent of 7da4643... Update CoolUri.php
 =======
         foreach ($params as $k => $v) $params[$k] = $k . '=' . rawurlencode($v);
 >>>>>>> parent of 7da4643... Update CoolUri.php

From d8a8f82e3b66558499773b71ffca3fe6e0bd931e Mon Sep 17 00:00:00 2001
From: mad-develop <40065929+mad-develop@users.noreply.github.com>
Date: Wed, 30 Jan 2019 14:10:09 +0100
Subject: [PATCH 5/6] Update CoolUri.php

Github Desktop killed my php file...
Fixes Array warning.
---
 Classes/Integration/CoolUri.php | 36 ++++++++++-----------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/Classes/Integration/CoolUri.php b/Classes/Integration/CoolUri.php
index afc90b6..d3f9d21 100644
--- a/Classes/Integration/CoolUri.php
+++ b/Classes/Integration/CoolUri.php
@@ -604,31 +604,17 @@ public static function getPageTitle($conf, $value)
     }
 
     private static function extractArraysFromParams($params)
-    {
-        // turn array back into query string
-        // so it can be used with parse_str
-        if (empty($params)) {
-            return Array();
-        }
-<<<<<<< HEAD
-<<<<<<< HEAD
-        if (!is_array($value)) {
-            $params[$param] = $param . '=' . rawurlencode($value);
-        } else {
-            foreach ($value as $subParam => $subValue) {
-                $params[$param] = $param . '[' . $subParam . ']=' . rawurlencode($subValue);
-            }
-        }
-=======
-        foreach ($params as $k => $v) $params[$k] = $k . '=' . rawurlencode($v);
->>>>>>> parent of 7da4643... Update CoolUri.php
-=======
-        foreach ($params as $k => $v) $params[$k] = $k . '=' . rawurlencode($v);
->>>>>>> parent of 7da4643... Update CoolUri.php
-        $qs = implode('&', $params);
-        parse_str($qs, $output);
-        return $output;
-    }
+	{
+		// turn array back into query string
+		// so it can be used with parse_str
+		if (empty($params)) {
+			return [];
+		}
+
+		$qs = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $params);
+		parse_str($qs, $output);
+		return $output;
+	}
 
     private static function isBEUserLoggedIn()
     {

From 2682cbb213ef9947a500b0d5c913349534ceadfc Mon Sep 17 00:00:00 2001
From: mad-develop <40065929+mad-develop@users.noreply.github.com>
Date: Wed, 30 Jan 2019 14:12:29 +0100
Subject: [PATCH 6/6] Update CoolUri.php

Fixed indentation
---
 Classes/Integration/CoolUri.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Classes/Integration/CoolUri.php b/Classes/Integration/CoolUri.php
index d3f9d21..d3d7f1b 100644
--- a/Classes/Integration/CoolUri.php
+++ b/Classes/Integration/CoolUri.php
@@ -604,17 +604,17 @@ public static function getPageTitle($conf, $value)
     }
 
     private static function extractArraysFromParams($params)
-	{
-		// turn array back into query string
-		// so it can be used with parse_str
-		if (empty($params)) {
-			return [];
-		}
-
-		$qs = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $params);
-		parse_str($qs, $output);
-		return $output;
-	}
+    {
+        // turn array back into query string
+        // so it can be used with parse_str
+        if (empty($params)) {
+            return [];
+        }
+
+        $qs = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $params);
+        parse_str($qs, $output);
+        return $output;
+    }
 
     private static function isBEUserLoggedIn()
     {