Fix SRID and options not being optional for expression in GeometryCast

Author: nickknissen

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] ?? ''];
     }
 }

tests/GeometryCastTest.php

@@ -189,3 +189,20 @@
 
     expect($testPlace->isDirty())->toBeFalse();
 });
+
+it('handles multiple types of expression string', function (
+    string $expression,
+    float $latitude,
+    float $longitude
+): void {
+    $testPlace = TestPlace::factory()
+        ->create(['point' => DB::raw($expression)])
+        ->refresh();
+
+    expect($testPlace->point->latitude)->toEqual($latitude);
+    expect($testPlace->point->longitude)->toEqual($longitude);
+})->with([
+    ["ST_GeomFromText('POINT(51.208773 3.272677)')", 3.272677, 51.208773],
+    ["ST_GeomFromText('POINT(51.208773 3.272677)', 4326)", 51.208773, 3.272677],
+    ["ST_GeomFromText('POINT(51.208773 3.272677)', 4326, 'axis-order=srid-defined')", 51.208773, 3.272677],
+]);