Merge pull request #1657 from acquia/ACMS-2006

ACMS-2006: Remove failing Geocoder patch as released in 3.35 and 4.10 version.
acquia · Oct 25, 2023 · 9f5bd7d · 9f5bd7d
2 parents 59786a3 + c234d97
commit 9f5bd7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/modules/acquia_cms_place/composer.json b/modules/acquia_cms_place/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "drupal/acquia_cms_image": "1.x-dev",
         "drupal/address": "^1.11",
-        "drupal/geocoder": "^3.31 || ^4.4",
+        "drupal/geocoder": "^3.35 || ^4.10",
         "drupal/geofield": "^1.47",
         "drupal/scheduler": "^2.0",
         "geocoder-php/google-maps-provider": "^4.7"
@@ -26,12 +26,6 @@
     "extra": {
         "branch-alias": {
             "dev-develop": "1.x-dev"
-        },
-        "enable-patching": true,
-        "patches": {
-            "drupal/geocoder": {
-                "3224364 - Replace deprecated boolean return in uksort() for PHP 8 compatibility.": "https://www.drupal.org/files/issues/2021-07-19/3224364-2.patch"
-            }
         }
     },
     "repositories": {