Merge pull request #347 from ethercreative/v4-dev

V4 dev

Author: Tam

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.2 - 2022-06-08
+### Fixed
+- Misc fixes via @davidwebca & @jamesedmonston
+
 ## 4.0.1 - 2022-05-18
 ### Fixed
 - Fix Geo Location Token only allowing string (Fixes #343)

src/integrations/graphql/MapType.php

@@ -103,11 +103,11 @@ public static function getQueryInputDefinitions (): array
 
 	public static function getType (): Type
 	{
-		if ($type = GqlEntityRegistry::getEntity(static::class))
+		if ($type = GqlEntityRegistry::getEntity(static::getName()))
 			return $type;
 
 		return GqlEntityRegistry::createEntity(
-			static::class,
+			static::getName(),
 			new ObjectType([
 				'name' => static::getName(),
 				'fields' => static::class . '::getFieldDefinitions',
@@ -117,7 +117,7 @@ public static function getType (): Type
 
 	public static function getInputType (): InputType
 	{
-		$name = static::class . 'Input';
+		$name = static::getName() . 'Input';
 
 		if ($type = GqlEntityRegistry::getEntity($name))
 			return $type;
@@ -133,7 +133,7 @@ public static function getInputType (): InputType
 
 	public static function getQueryType (): InputType
 	{
-		$name = static::class . 'Query';
+		$name = static::getName() . 'Query';
 
 		if ($type = GqlEntityRegistry::getEntity($name))
 			return $type;
@@ -149,7 +149,7 @@ public static function getQueryType (): InputType
 
 	public static function getCoordsType (): InputType
 	{
-		$name = static::class . 'Coords';
+		$name = static::getName() . 'Coords';
 
 		if ($type = GqlEntityRegistry::getEntity($name))
 			return $type;
@@ -174,7 +174,7 @@ public static function getCoordsType (): InputType
 
 	public static function getUnitType (): EnumType
 	{
-		$name = static::class . 'Unit';
+		$name = static::getName() . 'Unit';
 
 		if ($type = GqlEntityRegistry::getEntity($name))
 			return $type;

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;
 		}