Fix SRID and options not being optional for expression in GeometryCast

MatanYadaev · Jul 3, 2024 · b76c6c2 · b76c6c2
1 parent a6bae05
commit b76c6c2
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/src/GeometryCast.php b/src/GeometryCast.php
@@ -36,8 +36,7 @@ public function get($model, string $key, $value, array $attributes): ?Geometry
         }
 
         if ($value instanceof ExpressionContract) {
-            $wkt = $this->extractWktFromExpression($value, $model->getConnection());
-            $srid = $this->extractSridFromExpression($value, $model->getConnection());
+            [$wkt, $srid, $options] = $this->extractFromExpression($value, $model->getConnection());
 
             return $this->className::fromWkt($wkt, $srid);
         }
@@ -76,23 +75,16 @@ public function set($model, string $key, $value, array $attributes): ?Expression
         return $value->toSqlExpression($model->getConnection());
     }
 
-    private function extractWktFromExpression(ExpressionContract $expression, Connection $connection): string
-    {
-        $grammar = $connection->getQueryGrammar();
-        $expressionValue = $expression->getValue($grammar);
-
-        preg_match('/ST_GeomFromText\(\'(.+)\', .+(, .+)?\)/', (string) $expressionValue, $match);
-
-        return $match[1];
-    }
-
-    private function extractSridFromExpression(ExpressionContract $expression, Connection $connection): int
+    /**
+     * @return array{string, int, string}
+     */
+    private function extractFromExpression(ExpressionContract $expression, Connection $connection): array
     {
         $grammar = $connection->getQueryGrammar();
         $expressionValue = $expression->getValue($grammar);
 
-        preg_match('/ST_GeomFromText\(\'.+\', (.+)(, .+)?\)/', (string) $expressionValue, $match);
+        preg_match("/ST_GeomFromText\(\s*'([^']+)'\s*(?:,\s*(\d+))?\s*(?:,\s*'([^']+)')?\s*\)/", (string) $expressionValue, $matches);
 
-        return (int) $match[1];
+        return [$matches[1], (int) ($matches[2] ?? 0), $matches[3] ?? ''];
     }
 }