Merge pull request #464 from AntonShevchuk/develop

Changed Grid Filter delimeter from `-` to `_`

Author: Anton

src/Grid/Grid.php

@@ -330,19 +330,19 @@ public function processRequest(): void
             $filter = Request::getParam($this->prefix . 'filter-' . $alias);
 
             if (null !== $filter) {
-                $filter = trim($filter, ' -');
+                $filter = trim($filter, ' _-');
                 if (strpos($filter, '-')) {
                     /**
                      * Example of filters
                      * - http://domain.com/users/grid/users-filter-roleId/gt-2      - roleId greater than 2
-                     * - http://domain.com/users/grid/users-filter-roleId/gt-1-lt-4 - 1 < roleId < 4
+                     * - http://domain.com/users/grid/users-filter-roleId/gt-1_lt-4 - 1 < roleId < 4
                      * - http://domain.com/users/grid/users-filter-login/eq-admin   - login == admin
                      * - http://domain.com/users/grid/users-filter-login/like-adm   - login LIKE `adm`
                      * - http://domain.com/users/grid/users-filter-login/like-od-   - login LIKE `od-`
                      */
-                    while ($filter) {
-                        // @todo rewrite with regexp like (filter|filter)-(value)
-                        [$filterName, $filterValue, $filter] = array_pad(explode('-', $filter, 3), 3, null);
+                    $filters = explode('_', $filter);
+                    foreach ($filters as $rawFilter) {
+                        [$filterName, $filterValue] = explode('-', $rawFilter, 2);
                         $this->addFilter($column, $filterName, $filterValue);
                     }
                 } else {
@@ -455,7 +455,7 @@ public function getParams(array $rewrite = []): array
             foreach ($columnFilters as $filterName => $filterValue) {
                 $columnFilter[] = $filterName . '-' . $filterValue;
             }
-            $params[$this->prefix . 'filter-' . $column] = implode('-', $columnFilter);
+            $params[$this->prefix . 'filter-' . $column] = implode('_', $columnFilter);
         }
         return $params;
     }

tests/src/Fixtures/Grid/ArrayGrid.php

@@ -30,6 +30,7 @@ class ArrayGrid extends Grid
      * Init ArraySource
      *
      * @return void
+     * @throws \Bluz\Grid\GridException
      */
     public function init(): void
     {

tests/src/Fixtures/Grid/SelectGrid.php

@@ -31,6 +31,7 @@ class SelectGrid extends Grid
      * Init SelectSource
      *
      * @return void
+     * @throws \Bluz\Grid\GridException
      */
     public function init(): void
     {

tests/src/Fixtures/Grid/SqlGrid.php

@@ -30,6 +30,7 @@ class SqlGrid extends Grid
      * Init SqlSource
      *
      * @return void
+     * @throws \Bluz\Grid\GridException
      */
     public function init(): void
     {

tests/unit/Grid/Source/ArraySourceTest.php

@@ -71,7 +71,7 @@ public function testFilters()
         self::assertEquals(8, $grid->total());
         self::assertEquals(2, $grid->pages());
 
-        self::assertEquals('/index/index/arr-filter-index/gt-1-ge-2-lt-10-le-9', $grid->first());
+        self::assertEquals('/index/index/arr-filter-index/gt-1_ge-2_lt-10_le-9', $grid->first());
     }
 
     /**