Merge pull request #342 from davidwebca/v4-dev

Fixes for Craft 4

Author: Tam

src/models/UserLocation.php

@@ -60,7 +60,7 @@ public function distance (array $to, string $unit = 'km'): float|int
 		// Coordinates
 		$to = GeoService::normalizeLocation($to);
 
-		if ($to === null)
+		if (empty($to))
 			throw new InvalidConfigException('Invalid target lat/lng');
 
 		$targetLat = $to['lat'];

src/services/GeoService.php

@@ -678,7 +678,7 @@ public static function normalizeLocation (mixed $location, string $country = nul
 		else if ($location instanceof Map)
 			$location = ['lat' => $location->lat, 'lng' => $location->lng];
 		else if (!is_array($location) || !isset($location['lat'], $location['lng']))
-			$location = null;
+			$location = [];
 
 		return $location;
 	}

src/services/MapService.php

@@ -165,10 +165,9 @@ public function getDistance (Map $map): float|int|null
 	 */
 	public function modifyElementsQuery (ElementQueryInterface $query, mixed $value, MapField $field)
 	{
-		if (empty($value))
+		if (is_null($value))
 			return;
 
-
 		// Work-around for Craft built-in GraphQL not supporting custom
 		// arguments for fields:
 
@@ -318,7 +317,7 @@ private function _searchLocation (ElementQuery $query, mixed $value, string $tab
 		$location = GeoService::normalizeLocation($location, $country);
 
 		// If we don't have a location, reduce the search radius to 0
-		if ($location === null)
+		if (empty($location))
 		{
 			$location = ['lat' => 0, 'lng' => 0];
 			$radius = 0;
@@ -398,13 +397,13 @@ private function _searchLocation (ElementQuery $query, mixed $value, string $tab
 	 * @param ElementQuery $query
 	 * @param bool         $search
 	 */
-	private function _replaceOrderBy (ElementQuery $query, bool $search = false)
+	private function _replaceOrderBy (ElementQuery $query, string $search = "")
 	{
 		$nextOrder = [];
 
 		foreach ((array) $query->orderBy as $order => $sort)
 		{
-			if ($order === 'distance' && $search) $nextOrder[$search] = $sort;
+			if ($order === 'distance' && !empty($search)) $nextOrder[$search] = $sort;
 			elseif ($order !== 'distance') $nextOrder[$order] = $sort;
 		}