README.md

@@ -18,8 +18,8 @@ search interfaces.
 
 ## REQUIREMENTS
 
-No other modules required; we're supporting Drupal Core's search as a source for
-creating facets.
+No other modules are required; we're supporting Drupal Core's search as a
+source for creating facets.
 
 
 ## RECOMMENDED MODULES
@@ -30,7 +30,8 @@ creating facets.
 ## INSTALLATION
 
  * Install as you would normally install a contributed Drupal module. Visit:
-   https://www.drupal.org/docs/extending-drupal/installing-modules for further information.
+   https://www.drupal.org/docs/extending-drupal/installing-modules
+   for further information.
 
 
 ## CONFIGURATION
@@ -45,8 +46,8 @@ After adding one of those, you can add a facet on the facets configuration page:
 admin/config/search/facets/add-facet. Use that page to add the facet by
 selecting the correct facet source and field from that source.
 
-If you're using Search API views, make sure to disable views cache when using
-facets for that view.
+If you're using Search API views, make sure to disable the views cache when
+using facets for that view.
 
 
 ## KNOWN ISSUES
@@ -56,7 +57,7 @@ the limitation is done internally after sorting on the number of results ("num")
 first and then sorting by the raw value of the facet (e.g. entity-id) in the
 second dimension. This can lead to edge cases when there is an equal amount of
 results on facets that are exactly on the threshold of the hard limit. In this
-case the raw facet value with the lower value is preferred:
+case, the raw facet value with the lower value is preferred:
 
 | num | value | label |
 |-----|-------|-------|
@@ -73,10 +74,9 @@ further details see: https://www.drupal.org/node/2834730
 
 If you are the developer of a search API backend implementation and want
 to support facets with your service class, too, you'll have to support the
-"search_api_facets" feature. In short, you'll just have to return facet terms
-and counts according to the query's "search_api_facets" option, when executing
-a query.
-For the module to be able to tell that your server supports facets,
+"search_api_facets" feature. In short, when executing a query, you'll have to
+return facet terms and counts according to the query's "search_api_facets"
+option. For the module to be able to tell that your server supports facets,
 you will also have to change your service's supportsFeature() method to
 something like the following:
 
@@ -99,7 +99,7 @@ $query->setOption('search_api_facets', [
     'limit' => (int),
     // The facet operator: "and" or "or".
     'operator' => (string),
-    // The minimum count a filter/value must have to be returned.
+    // The minimum count a filter/value must have been returned.
     'min_count' => (int),
     // Whether to retrieve a facet for "missing" values.
     'missing' => (bool),
@@ -149,7 +149,7 @@ A filter is a string with one of the following forms:
 - https://www.drupal.org/project/facets_range_input
   Provides an input range form (min and max) as a processor and widget.
 - https://www.drupal.org/project/facets_range_dropdowns
-  Provides an dropdown widget that works with the range processor.
+  Provides a dropdown widget that works with the range processor.
 
 ## FAQ
 
@@ -167,7 +167,7 @@ See https://www.drupal.org/node/2853121 for more information.
 Q: Why are facets results links from another language showing in the facet
 results?
 A: Facets use the same limitations as the query object passed, so when using
-views, add a filter to the view to limit to one language.
+views, add a filter to the view to limit it to one language.
 Otherwise, this is solved by adding a `hook_search_api_query_alter()` that
 limits the results to the current language.
 

src/Controller/FacetBlockAjaxController.php

@@ -117,7 +117,7 @@ class FacetBlockAjaxController extends ControllerBase {
 
     // Rebuild the request and the current path, needed for facets.
     $path = $request->request->get('facet_link');
-    $facets_blocks = $request->request->get('facets_blocks');
+    $facets_blocks = $request->request->all()['facets_blocks'] ?? [];
 
     if (empty($path) || empty($facets_blocks)) {
       throw new NotFoundHttpException('No facet link or facet blocks found.');

tests/src/Functional/BreadcrumbIntegrationTest.php

@@ -23,11 +23,6 @@ class BreadcrumbIntegrationTest extends FacetsTestBase {
     'facets_search_api_dependency',
   ];
 
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'classy';
-
   /**
    * {@inheritdoc}
    */
@@ -100,7 +95,7 @@ class BreadcrumbIntegrationTest extends FacetsTestBase {
     $this->drupalGet('search-api-test-fulltext', ['query' => $initial_query]);
 
     $this->clickLink('item');
-    $breadcrumb = $this->getSession()->getPage()->find('css', '.breadcrumb');
+    $breadcrumb = $this->getSession()->getPage()->find('css', 'nav[aria-labelledby="system-breadcrumb"]');
     $this->assertFalse(strpos($breadcrumb->getText(), 'Type'));
     $breadcrumb->findLink('item');
 
@@ -109,7 +104,7 @@ class BreadcrumbIntegrationTest extends FacetsTestBase {
     $initial_query = ['search_api_fulltext' => 'foo'];
     $this->drupalGet('search-api-test-fulltext', ['query' => $initial_query]);
     $this->clickLink('item');
-    $breadcrumb = $this->getSession()->getPage()->find('css', '.breadcrumb');
+    $breadcrumb = $this->getSession()->getPage()->find('css', 'nav[aria-labelledby="system-breadcrumb"]');
     $this->assertNotFalse(strpos($breadcrumb->getText(), 'Type'));
   }
 

tests/src/Kernel/FacetManager/DefaultFacetManagerTest.php

@@ -179,8 +179,8 @@ class DefaultFacetManagerTest extends EntityKernelTestBase {
     // Make sure that query cachebillity will include facets cache tags e.g.
     // view results will depends on the facet configuration.
     $this->facetManager->alterQuery($query, $facet_source);
-    $this->assertCacheabillityArrays($expected_contexts, $query->getCacheContexts());
-    $this->assertCacheabillityArrays($expected_tags, $query->getCacheTags());
+    $this->assertEqualsCanonicalizing($expected_contexts, $query->getCacheContexts());
+    $this->assertEqualsCanonicalizing($expected_tags, $query->getCacheTags());
   }
 
   /**
@@ -219,8 +219,8 @@ class DefaultFacetManagerTest extends EntityKernelTestBase {
     $metadata = CacheableMetadata::createFromObject($facet);
     $metadata->applyTo($build);
     $this->assertEquals($expected_metadata['max-age'], $build['#cache']['max-age']);
-    $this->assertCacheabillityArrays($expected_metadata['contexts'], $build['#cache']['contexts']);
-    $this->assertCacheabillityArrays($expected_metadata['tags'], $build['#cache']['tags']);
+    $this->assertEqualsCanonicalizing($expected_metadata['contexts'], $build['#cache']['contexts']);
+    $this->assertEqualsCanonicalizing($expected_metadata['tags'], $build['#cache']['tags']);
 
     $facet->removeProcessor('fpc_sort_processor');
     // Test that un-cacheable plugin kills the cache.
@@ -238,8 +238,8 @@ class DefaultFacetManagerTest extends EntityKernelTestBase {
     $metadata->applyTo($build);
 
     $this->assertEquals(0, $build['#cache']['max-age']);
-    $this->assertCacheabillityArrays($expected_metadata['contexts'], $build['#cache']['contexts']);
-    $this->assertCacheabillityArrays($expected_metadata['tags'], $build['#cache']['tags']);
+    $this->assertEqualsCanonicalizing($expected_metadata['contexts'], $build['#cache']['contexts']);
+    $this->assertEqualsCanonicalizing($expected_metadata['tags'], $build['#cache']['tags']);
   }
 
   /**
@@ -294,22 +294,6 @@ class DefaultFacetManagerTest extends EntityKernelTestBase {
     }
   }
 
-  /**
-   * Assert that actual cachebillity matches expected one.
-   */
-  public function assertCacheabillityArrays($expected, $actual, string $message = ''): void {
-    foreach ([&$expected, &$actual] as &$array) {
-      foreach ($array as &$value) {
-        if (is_array($value)) {
-          sort($value);
-        }
-      }
-    }
-    sort($expected);
-    sort($actual);
-    $this->assertEquals($expected, $actual, $message);
-  }
-
   /**
    * Data provider for testBuildCacheabilityMetadata().
    *