EWPP-1914: PHP 8 support.

.drone.yml

@@ -89,4 +89,5 @@ matrix:
     - lowest
     - highest
   PHP_VERSION:
-    - 7.3
+    - 7.4
+    - 8.0

composer.json

@@ -6,8 +6,8 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.3",
-        "drupal/core": "^8.9 || ^9.1",
+        "php": ">=7.4",
+        "drupal/core": "^9.2",
         "drupal/emr": "^1.0-beta11",
         "drupal/facets": "^1.6",
         "drupal/multivalue_form_element": "^1.0@beta",

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:7.3
+    image: fpfis/httpd-php-dev:8.0
     working_dir: /var/www/html
     ports:
       - 8080:8080

modules/oe_list_pages_link_list_source/tests/src/Kernel/ListPageLinkSourcePluginTest.php

@@ -188,8 +188,8 @@ public function testCacheabilityMetadata(): void {
 
     $this->assertEquals([
       'config:search_api.index.database_search_index',
-      'entity_test_with_bundle_list',
       'search_api_list:database_search_index',
+      'entity_test_with_bundle_list',
     ], $links->getCacheTags());
     $this->assertEquals(['route'], $links->getCacheContexts());
     $this->assertEquals(Cache::PERMANENT, $links->getCacheMaxAge());
@@ -217,9 +217,9 @@ public function testCacheabilityMetadata(): void {
     $this->assertCount(1, $links);
     $this->assertEquals([
       'config:search_api.index.database_search_index',
-      'entity_test_with_bundle:' . $entity->id(),
-      'entity_test_with_bundle_list',
       'search_api_list:database_search_index',
+      'entity_test_with_bundle_list',
+      'entity_test_with_bundle:' . $entity->id(),
     ], $links->getCacheTags());
     $this->assertEquals(['route'], $links->getCacheContexts());
     $this->assertEquals(Cache::PERMANENT, $links->getCacheMaxAge());

src/Form/ListPageConfigurationSubForm.php

@@ -369,7 +369,7 @@ public function submitForm(array &$form, FormStateInterface $form_state): void {
     }
 
     if ($sort) {
-      list($name, $direction) = explode('__', $sort);
+      [$name, $direction] = explode('__', $sort);
       $this->configuration->setSort([
         'name' => $name,
         'direction' => strtoupper($direction),

src/ListPageWrapper.php

@@ -48,7 +48,7 @@ public function getSourceEntityType(): ?string {
       return NULL;
     }
 
-    list($entity_type, $bundle) = explode(':', $source);
+    [$entity_type, $bundle] = explode(':', $source);
     return $entity_type;
   }
 
@@ -64,7 +64,7 @@ public function getSourceEntityBundle(): ?string {
       return NULL;
     }
 
-    list($entity_type, $bundle) = explode(':', $source);
+    [$entity_type, $bundle] = explode(':', $source);
     return $bundle;
   }
 

src/ListSourceFactory.php

@@ -140,7 +140,7 @@ protected function create(string $entity_type, string $bundle, IndexInterface $i
     $id = self::generateFacetSourcePluginId($entity_type, $bundle);
     $facets = $this->facetsManager->getFacetsByFacetSourceId($id);
     usort($facets, function ($facet1, $facet2) {
-      return ($facet1->getWeight() > $facet2->getWeight());
+      return ($facet1->getWeight() <=> $facet2->getWeight());
     });
 
     foreach ($facets as $facet) {

src/Plugin/facets/query_type/Date.php

@@ -94,7 +94,7 @@ public function build() {
 
     $operator = $active_filters['operator'];
     $first_date = $active_filters['first'];
-    $second_date = isset($active_filters['second']) ? $active_filters['second'] : NULL;
+    $second_date = $active_filters['second'] ?? $active_filters['second'];
 
     $operators = [
       'gt' => $this->t('After'),

tests/src/Kernel/MultiSelectFilterFieldPluginTest.php

@@ -304,7 +304,7 @@ public function testBooleanFieldPlugin(): void {
     /** @var \Drupal\oe_list_pages\MultiselectFilterFieldPluginInterface $plugin */
     $plugin = $this->pluginManager->createInstance($plugin_id, [
       'facet' => $facet,
-      'preset_filter' => new ListPresetFilter($facet->id(), [0]),
+      'preset_filter' => new ListPresetFilter($facet->id(), ['0']),
       'list_source' => $item_list,
     ]);
 
@@ -318,7 +318,7 @@ public function testBooleanFieldPlugin(): void {
     $this->assertEquals('0', $plugin->getDefaultValuesLabel());
     $plugin->setConfiguration([
       'facet' => $facet,
-      'preset_filter' => new ListPresetFilter($facet->id(), [1]),
+      'preset_filter' => new ListPresetFilter($facet->id(), ['1']),
       'list_source' => $item_list,
     ]);
     $this->assertEquals('1', $plugin->getDefaultValuesLabel());