Fix #55, improve tests

Author: Kyslik

src/ColumnSortable/SortableLink.php

@@ -34,11 +34,7 @@ public static function render(array $parameters)
 
         $anchorClass = self::getAnchorClass();
 
-        $queryString = http_build_query(array_merge($queryParameters,
-            array_filter(Request::except('sort', 'order', 'page'), 'strlen'), [
-                'sort'  => $sortParameter,
-                'order' => $direction,
-            ]));
+        $queryString = self::buildQueryString($queryParameters, $sortParameter, $direction);
 
         return '<a'.$anchorClass.' href="'.url(Request::path().'?'.$queryString).'"'.'>'.htmlentities($title).$trailingTag;
     }
@@ -183,4 +179,27 @@ private static function getAnchorClass()
 
         return '';
     }
+
+
+    /**
+     * @param $queryParameters
+     * @param $sortParameter
+     * @param $direction
+     *
+     * @return string
+     */
+    private static function buildQueryString($queryParameters, $sortParameter, $direction)
+    {
+        $checkStrlenOrArray = function ($element) {
+            return is_array($element) ? $element : strlen($element);
+        };
+
+        $persistParameters = array_filter(Request::except('sort', 'order', 'page'), $checkStrlenOrArray);
+        $queryString = http_build_query(array_merge($queryParameters, $persistParameters, [
+            'sort'  => $sortParameter,
+            'order' => $direction,
+        ]));
+
+        return $queryString;
+    }
 }

tests/SortableLinkTest.php

@@ -12,12 +12,24 @@ class SortableLinkTest extends \Orchestra\Testbench\TestCase
 
     public function testQueryStringParameterWithBooleanStaysInLink()
     {
-        Request::replace(['key' => 0, 'another-key' => null, 'another-one' => 1]);
+        $parameters = ['key' => 0, 'another-key' => null, 'another-one' => 1];
+        Request::replace($parameters);
+
+        $link = SortableLink::render(['column']);
+        $expected = http_build_query($parameters);
+
+        $this->assertContains($expected, $link);
+    }
+
+    public function testQueryStringCanHoldArray()
+    {
+        $parameters = ['key' => ['part1', 'part2'], 'another-one' => 1];
+        Request::replace($parameters);
+
         $link = SortableLink::render(['column']);
+        $expected = http_build_query($parameters);
 
-        $this->assertTrue(str_contains($link, ['key=0']));
-        $this->assertTrue(str_contains($link, ['another-one=1']));
-        $this->assertFalse(str_contains($link, ['another-key=null']));
+        $this->assertContains($expected, $link);
     }