Merge pull request #16610 from mattwire/settingstrait_datepicker

[civicrm-core.git] / CRM / Utils / Geocode / Google.php

diff --git a/CRM/Utils/Geocode/Google.php b/CRM/Utils/Geocode/Google.php
index f8db5f4e6b0ecda9feb3fbe0ec515976fb872839..6ab1397fea8d8be13c67b0ca51c570f4dff30798 100644 (file)
--- a/CRM/Utils/Geocode/Google.php
+++ b/CRM/Utils/Geocode/Google.php
@@ -60,7 +60,7 @@ class CRM_Utils_Geocode_Google {
       $add .= ',+';
     }
 
-    $city = CRM_Utils_Array::value('city', $values);
+    $city = $values['city'] ?? NULL;
     if ($city) {
       $add .= '+' . urlencode(str_replace('', '+', $city));
       $add .= ',+';
@@ -105,10 +105,9 @@ class CRM_Utils_Geocode_Google {
 
     $query = 'https://' . self::$_server . self::$_uri . $add;
 
-    require_once 'HTTP/Request.php';
-    $request = new HTTP_Request($query);
-    $request->sendRequest();
-    $string = $request->getResponseBody();
+    $client = new GuzzleHttp\Client();
+    $request = $client->request('GET', $query);
+    $string = $request->getBody();
 
     libxml_use_internal_errors(TRUE);
     $xml = @simplexml_load_string($string);