Fixed check of value for coordinates.

Author: Daniel Berthereau

src/DataType/GeographyCoordinates.php

@@ -73,16 +73,28 @@ public function form(PhpRenderer $view)
 
     public function isValid(array $valueObject)
     {
+        // Value is stored as string, but the json representation is an array.
+        // So the check may be done on the string or on the array.
         return !empty($valueObject)
             && !empty($valueObject['@value'])
-            && preg_match($this->regexLatitudeLongitude, (string) $valueObject['@value']);
+            && preg_match($this->regexLatitudeLongitude,
+                is_array($valueObject['@value'])
+                    ? implode(',', $valueObject['@value'])
+                    : (string) $valueObject['@value']
+            );
     }
 
     public function hydrate(array $valueObject, Value $value, AbstractEntityAdapter $adapter): void
     {
         // Remove the leading + if any. The value is already checked.
         $matches = [];
-        preg_match($this->regexLatitudeLongitude, (string) $valueObject['@value'], $matches);
+        preg_match(
+            $this->regexLatitudeLongitude,
+            is_array($valueObject['@value'])
+                ? implode(',', $valueObject['@value'])
+                : (string) $valueObject['@value'],
+            $matches
+        );
         $latitude = trim($matches['latitude'], '+ ');
         $longitude = trim($matches['longitude'], '+ ');
         $value->setValue($latitude . ',' . $longitude);

src/DataType/GeometryCoordinates.php

@@ -67,16 +67,28 @@ public function form(PhpRenderer $view)
 
     public function isValid(array $valueObject)
     {
+        // Value is stored as string, but the json representation is an array.
+        // So the check may be done on the string or on the array.
         return !empty($valueObject)
             && !empty($valueObject['@value'])
-            && preg_match($this->regexCoordinates, (string) $valueObject['@value']);
+            && preg_match($this->regexCoordinates,
+                is_array($valueObject['@value'])
+                    ? implode(',', $valueObject['@value'])
+                    : (string) $valueObject['@value']
+            );
     }
 
     public function hydrate(array $valueObject, Value $value, AbstractEntityAdapter $adapter): void
     {
         // Remove the leading + if any. The value is already checked.
         $matches = [];
-        preg_match($this->regexCoordinates, (string) $valueObject['@value'], $matches);
+        preg_match(
+            $this->regexCoordinates,
+            is_array($valueObject['@value'])
+                ? implode(',', $valueObject['@value'])
+                : (string) $valueObject['@value'],
+            $matches
+        );
         $x = trim($matches['x'], '+ ');
         $y = trim($matches['y'], '+ ');
         $value->setValue($x . ',' . $y);

src/DataType/GeometryPosition.php

@@ -69,16 +69,28 @@ public function form(PhpRenderer $view)
 
     public function isValid(array $valueObject)
     {
+        // Value is stored as string, but the json representation is an array.
+        // So the check may be done on the string or on the array.
         return !empty($valueObject)
             && !empty($valueObject['@value'])
-            && preg_match($this->regexPosition, (string) $valueObject['@value']);
+            && preg_match($this->regexPosition,
+                is_array($valueObject['@value'])
+                    ? implode(',', $valueObject['@value'])
+                    : (string) $valueObject['@value']
+            );
     }
 
     public function hydrate(array $valueObject, Value $value, AbstractEntityAdapter $adapter): void
     {
         // The value is already checked.
         $matches = [];
-        preg_match($this->regexPosition, (string) $valueObject['@value'], $matches);
+        preg_match(
+            $this->regexPosition,
+            is_array($valueObject['@value'])
+                ? implode(',', $valueObject['@value'])
+                : (string) $valueObject['@value'],
+            $matches
+        );
         $x = $matches['x'];
         $y = $matches['y'];
         $value->setValue($x . ',' . $y);