Merge pull request #332 from localgovdrupal/3.x

3.1.2 release
localgovdrupal · Feb 27, 2024 · 2a0c687 · 2a0c687
2 parents a361c6e + e9aa731
commit 2a0c687
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - '3.x'
+  workflow_dispatch:
 
 env:
   LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_directories
@@ -27,6 +28,7 @@ jobs:
           - '~10.0'
         php-version:
           - '8.1'
+          - '8.2'
 
     steps:
 
@@ -110,6 +112,7 @@ jobs:
           - '~10.0'
         php-version:
           - '8.1'
+          - '8.2'
 
     steps:
 
@@ -145,6 +148,7 @@ jobs:
           - '~10.0'
         php-version:
           - '8.1'
+          - '8.2'
 
     steps:
 
@@ -179,6 +183,7 @@ jobs:
           - '~10.0'
         php-version:
           - '8.1'
+          - '8.2'
 
     steps:
 
@@ -204,4 +209,4 @@ jobs:
           mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
           sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
           docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
-          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
+          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
diff --git a/composer.json b/composer.json
@@ -26,7 +26,8 @@
     "extra": {
         "patches": {
             "drupal/facets": {
-                "Don't render facet block if backend isn't available: https://www.drupal.org/project/facets/issues/3311856": "https://git.drupalcode.org/issue/facets-3311856/-/commit/765d5ef4228906c7f201e116763f3018a7867c96.patch"
+                "Don't render facet block if backend isn't available: https://www.drupal.org/project/facets/issues/3311856": "https://git.drupalcode.org/issue/facets-3311856/-/commit/765d5ef4228906c7f201e116763f3018a7867c96.patch",
+                "PHP 8.2 compatibility for the 2.0.x branch: https://www.drupal.org/project/facets/issues/3336646": "https://www.drupal.org/files/issues/2023-08-16/3336646-function-is-deprecated.patch"
             }
         }
     }

diff --git a/config/optional/block.block.localgov_directories_facets_proximity_search.yml b/config/optional/block.block.localgov_directories_facets_proximity_search.yml
@@ -22,7 +22,7 @@ settings:
   block_id: localgov_directories_facets_proximity_search
 visibility:
   node_type:
-    id: node_type
+    id: entity_bundle:node
     bundles:
       localgov_directory: localgov_directory
     negate: false

diff --git a/config/optional/block.block.localgov_directories_facets_proximity_search_scarfolk.yml b/config/optional/block.block.localgov_directories_facets_proximity_search_scarfolk.yml
@@ -22,7 +22,7 @@ settings:
   block_id: localgov_directories_facets_proximity_search
 visibility:
   node_type:
-    id: node_type
+    id: entity_bundle:node
     bundles:
       localgov_directory: localgov_directory
     negate: false

diff --git a/modules/localgov_directories_location/src/ProximitySearchSetup.php b/modules/localgov_directories_location/src/ProximitySearchSetup.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\localgov_directories_location;
 

diff --git a/...venue/config/install/core.entity_view_display.node.localgov_directories_venue.default.yml b/...venue/config/install/core.entity_view_display.node.localgov_directories_venue.default.yml
@@ -71,7 +71,7 @@ content:
     label: inline
     settings: {  }
     third_party_settings: {  }
-    type: basic_string
+    type: email_mailto
     region: content
   localgov_directory_files:
     weight: 1

diff --git a/modules/localgov_directories_venue/tests/src/Kernel/ViewUpgradeForProximitySearchTest.php b/modules/localgov_directories_venue/tests/src/Kernel/ViewUpgradeForProximitySearchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\localgov_directories_venue\Kernel;
 

diff --git a/src/ConfigurationHelper.php b/src/ConfigurationHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\localgov_directories;
 

diff --git a/src/Constants.php b/src/Constants.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\localgov_directories;
 

diff --git a/src/Plugin/Block/ChannelSearchBlock.php b/src/Plugin/Block/ChannelSearchBlock.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\localgov_directories\Plugin\Block;
 

diff --git a/src/Plugin/facets/processor/WeightOrderProcessor.php b/src/Plugin/facets/processor/WeightOrderProcessor.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\localgov_directories\Plugin\facets\processor;
 

diff --git a/tests/src/Functional/ChannelFacetsWidgetAdminTest.php b/tests/src/Functional/ChannelFacetsWidgetAdminTest.php
@@ -18,8 +18,11 @@ class ChannelFacetsWidgetAdminTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
   use ContentTypeCreationTrait;
-  use EntityReferenceTestTrait;
   use NodeCreationTrait;
+  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
+  // end of life.
+  // @phpstan-ignore-next-line.
+  use EntityReferenceTestTrait;
 
   /**
    * A user with minimum permissions for test.

diff --git a/tests/src/Functional/SearchBlockTest.php b/tests/src/Functional/SearchBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\localgov_directories\Functional;
 

diff --git a/tests/src/FunctionalJavascript/EntityReferenceFacetsWidgetTest.php b/tests/src/FunctionalJavascript/EntityReferenceFacetsWidgetTest.php
@@ -20,8 +20,12 @@
 class EntityReferenceFacetsWidgetTest extends WebDriverTestBase {
 
   use ContentTypeCreationTrait;
-  use EntityReferenceTestTrait;
   use NodeCreationTrait;
+  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
+  // end of life.
+  // @phpstan-ignore-next-line.
+  use EntityReferenceTestTrait;
+
 
   /**
    * Array of directory nodes.

diff --git a/tests/src/Kernel/EntityReferenceChannelsSelectionTest.php b/tests/src/Kernel/EntityReferenceChannelsSelectionTest.php
@@ -16,8 +16,11 @@
  */
 class EntityReferenceChannelsSelectionTest extends KernelTestBase {
 
-  use EntityReferenceTestTrait;
   use NodeCreationTrait;
+  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
+  // end of life.
+  // @phpstan-ignore-next-line.
+  use EntityReferenceTestTrait;
 
   /**
    * {@inheritdoc}

diff --git a/tests/src/Kernel/EntityReferenceDirectoryEntryTypesTest.php b/tests/src/Kernel/EntityReferenceDirectoryEntryTypesTest.php
@@ -15,8 +15,11 @@
  */
 class EntityReferenceDirectoryEntryTypesTest extends KernelTestBase {
 
-  use EntityReferenceTestTrait;
   use NodeCreationTrait;
+  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
+  // end of life.
+  // @phpstan-ignore-next-line.
+  use EntityReferenceTestTrait;
 
   /**
    * {@inheritdoc}

diff --git a/tests/src/Kernel/FacetIndexFieldSetupTest.php b/tests/src/Kernel/FacetIndexFieldSetupTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\localgov_directories\Kernel;
 
@@ -17,8 +17,11 @@
  */
 class FacetIndexFieldSetupTest extends KernelTestBase {
 
-  use EntityReferenceTestTrait;
   use NodeCreationTrait;
+  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
+  // end of life.
+  // @phpstan-ignore-next-line.
+  use EntityReferenceTestTrait;
 
   /**
    * Skip schema checks.

diff --git a/tests/src/Kernel/IndexTitleSortTest.php b/tests/src/Kernel/IndexTitleSortTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\localgov_directories\Kernel;
 
@@ -22,9 +22,12 @@
  */
 class IndexTitleSortTest extends KernelTestBase {
 
-  use EntityReferenceTestTrait;
   use NodeCreationTrait;
   use ResultsTrait;
+  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
+  // end of life.
+  // @phpstan-ignore-next-line.
+  use EntityReferenceTestTrait;
 
   /**
    * {@inheritdoc}

diff --git a/tests/src/Unit/FacetPreprocessTest.php b/tests/src/Unit/FacetPreprocessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\localgov_directories\Unit;