diff --git a/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php b/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php index e52f5d8..45146bb 100644 --- a/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php +++ b/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php @@ -228,7 +228,7 @@ class RestIntegrationTest extends FacetsTestBase { $base_url, '/facets-rest', '_format=json', - 'f%5B0%5D=type%3Aitem&f%5B1%5D=type%3Aarticle', + 'f%5B0%5D=type%3Aarticle&f%5B1%5D=type%3Aitem', ], 'count' => 2, ], @@ -241,7 +241,7 @@ class RestIntegrationTest extends FacetsTestBase { $base_url, '/facets-rest', '_format=json', - 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Abanana', + 'f%5B0%5D=keywords%3Abanana&f%5B1%5D=type%3Aitem', ], 'count' => 0, ], @@ -250,7 +250,7 @@ class RestIntegrationTest extends FacetsTestBase { $base_url, '/facets-rest', '_format=json', - 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Astrawberry', + 'f%5B0%5D=keywords%3Astrawberry&f%5B1%5D=type%3Aitem', ], 'count' => 0, ], @@ -259,7 +259,7 @@ class RestIntegrationTest extends FacetsTestBase { $base_url, '/facets-rest', '_format=json', - 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Aapple', + 'f%5B0%5D=keywords%3Aapple&f%5B1%5D=type%3Aitem', ], 'count' => 1, ], @@ -268,7 +268,7 @@ class RestIntegrationTest extends FacetsTestBase { $base_url, '/facets-rest', '_format=json', - 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Aorange', + 'f%5B0%5D=keywords%3Aorange&f%5B1%5D=type%3Aitem', ], 'count' => 2, ], @@ -277,7 +277,7 @@ class RestIntegrationTest extends FacetsTestBase { $base_url, '/facets-rest', '_format=json', - 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Agrape', + 'f%5B0%5D=keywords%3Agrape&f%5B1%5D=type%3Aitem', ], 'count' => 1, ], @@ -287,7 +287,7 @@ class RestIntegrationTest extends FacetsTestBase { $value = $result->values->value; $this->assertEquals($results[$value]['count'], $result->values->count); foreach ($results[$value]['url'] as $url_part) { - $this->assertNotFalse(strpos($result->url, $url_part)); + $this->assertContains($url_part, $result->url); } } @@ -295,7 +295,7 @@ class RestIntegrationTest extends FacetsTestBase { $value = $result->values->value; $this->assertEquals($results[$value]['count'], $result->values->count); foreach ($results[$value]['url'] as $url_part) { - $this->assertNotFalse(strpos($result->url, $url_part)); + $this->assertContains($url_part, $result->url); } } } diff --git a/src/Plugin/facets/url_processor/QueryString.php b/src/Plugin/facets/url_processor/QueryString.php index 623a299..3867f1e 100644 --- a/src/Plugin/facets/url_processor/QueryString.php +++ b/src/Plugin/facets/url_processor/QueryString.php @@ -149,7 +149,7 @@ class QueryString extends UrlProcessorPluginBase { } } } - + asort($filter_params, \SORT_NATURAL); $result_get_params->set($this->filterKey, array_values($filter_params)); if (!empty($routeParameters)) { $url->setRouteParameters($routeParameters);