From c936d240bb00cff005dcf12271afd935bdb30340 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 28 Apr 2023 10:52:57 -0400 Subject: [PATCH] Remove unused broken $config->geocodeMethod This deprecated item in the $config object couldn't possibly work because the class and function it refers to don't exist! --- CRM/Core/Config/MagicMerge.php | 2 -- tests/phpunit/api/v3/ContactTest.php | 1 - 2 files changed, 3 deletions(-) diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php index e88d6d24df..1c7be169ea 100644 --- a/CRM/Core/Config/MagicMerge.php +++ b/CRM/Core/Config/MagicMerge.php @@ -200,8 +200,6 @@ class CRM_Core_Config_MagicMerge { 'userFrameworkResourceURL' => ['setting-url'], // "callback" properties are generated on-demand by calling a function. - // @todo remove geocodeMethod. As of Feb 2018, $config->geocodeMethod works but gives a deprecation warning. - 'geocodeMethod' => ['callback', 'CRM_Utils_Geocode', 'getProviderClass'], 'defaultCurrencySymbol' => ['callback', 'CRM_Core_BAO_Country', 'getDefaultCurrencySymbol'], 'wpBasePage' => ['callback', 'CRM_Utils_System_WordPress', 'getBasePage'], ]; diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php index b72766b860..1df6d0942c 100644 --- a/tests/phpunit/api/v3/ContactTest.php +++ b/tests/phpunit/api/v3/ContactTest.php @@ -4741,7 +4741,6 @@ class api_v3_ContactTest extends CiviUnitTestCase { * */ public function testContactGetProximity(): void { - CRM_Core_Config::singleton()->geocodeMethod = 'CRM_Utils_MockGeocoder'; $this->individualCreate(); $contactID = $this->individualCreate(); $this->callAPISuccess('Address', 'create', [ -- 2.25.1