Merge pull request #21 from clickbar/subquery-geoparam-fix

Fixed missing unwrapping of geoparam in case of queryable
clickbar · Feb 7, 2023 · cb31be7 · cb31be7
2 parents 99132e1 + aa2b600
commit cb31be7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Laravel 10 support
 - PHP 8.2 support
 
+### Fixed
+- Typing bug when trying to use a Closure as Geoparam
+
 ## [1.0.2](https://github.com/clickbar/laravel-magellan/tree/1.0.2) - 2023-01-05
 
 ### Fixed

diff --git a/src/Database/Builder/BuilderUtils.php b/src/Database/Builder/BuilderUtils.php
@@ -56,8 +56,8 @@ protected static function prepareParams(array $params, $builder, $invadedBuilder
                 if ($value instanceof MagellanBaseExpression) {
                     $invoked = $value->invoke($builder, $bindingType, null);
                     array_splice($params, $i, 1, [GeoParam::wrap(new Expression("{$invoked}$geometryTypeCastAppend"))]);
-                } elseif ($invadedBuilder->isQueryable($param)) {
-                    [$sub, $bindings] = $invadedBuilder->createSub($param);
+                } elseif ($invadedBuilder->isQueryable($value)) {
+                    [$sub, $bindings] = $invadedBuilder->createSub($value);
                     array_splice($params, $i, 1, [GeoParam::wrap(new Expression("($sub)$geometryTypeCastAppend"))]);
                     $invadedBuilder->addBinding($bindings, $bindingType);
                 } elseif (is_array($value)) {