feat: add support for POINT and POINT[] data types

seb-jean · seb-jean · commit fac26cdecc48 · 2025-04-23T10:44:13.000+02:00
diff --git a/docs/INTEGRATING-WITH-DOCTRINE.md b/docs/INTEGRATING-WITH-DOCTRINE.md
@@ -30,6 +30,8 @@ Type::addType('inet', "MartinGeorgiev\\Doctrine\\DBAL\\Types\\Inet");
 Type::addType('inet[]', "MartinGeorgiev\\Doctrine\\DBAL\\Types\\InetArray");
 Type::addType('macaddr', "MartinGeorgiev\\Doctrine\\DBAL\\Types\\Macaddr");
 Type::addType('macaddr[]', "MartinGeorgiev\\Doctrine\\DBAL\\Types\\MacaddrArray");
+
+Type::addType('point[]', "MartinGeorgiev\\Doctrine\\DBAL\\Types\\PointArray");
 ```
 
 
@@ -208,6 +210,8 @@ $platform->registerDoctrineTypeMapping('macaddr[]','macaddr[]');
 $platform->registerDoctrineTypeMapping('_macaddr','macaddr[]');
 
 $platform->registerDoctrineTypeMapping('point','point');
+$platform->registerDoctrineTypeMapping('point[]','point[]');
+$platform->registerDoctrineTypeMapping('_point','point[]');
 ...
 
 ```
diff --git a/docs/INTEGRATING-WITH-LARAVEL.md b/docs/INTEGRATING-WITH-LARAVEL.md
@@ -84,6 +84,7 @@ return [
         'macaddr[]' => MartinGeorgiev\Doctrine\DBAL\Types\MacaddrArray::class,
       
         'point' => MartinGeorgiev\Doctrine\DBAL\Types\Point::class,
+        'point[]' => MartinGeorgiev\Doctrine\DBAL\Types\PointArray::class,
     ],
 ];
 ```
@@ -308,6 +309,9 @@ class DoctrineEventSubscriber implements Subscriber
         if (!Type::hasType('point')) {
             Type::addType('point', \MartinGeorgiev\Doctrine\DBAL\Types\Point::class);
         }
+        if (!Type::hasType('point[]')) {
+            Type::addType('point[]', \MartinGeorgiev\Doctrine\DBAL\Types\PointArray::class);
+        }
     }
 }
 ```
diff --git a/docs/INTEGRATING-WITH-SYMFONY.md b/docs/INTEGRATING-WITH-SYMFONY.md
@@ -29,6 +29,7 @@ doctrine:
             macaddr: MartinGeorgiev\Doctrine\DBAL\Types\Macaddr
             macaddr[]: MartinGeorgiev\Doctrine\DBAL\Types\MacaddrArray
             point: MartinGeorgiev\Doctrine\DBAL\Types\Point
+            point[]: MartinGeorgiev\Doctrine\DBAL\Types\PointArray
 ```
 
 
@@ -76,6 +77,8 @@ doctrine:
                     _macaddr: macaddr[]
                     
                     point: point
+                    point[]: point[]
+                    _point: point[]
 ```
 
 
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidPointArrayItemForDatabaseException.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidPointArrayItemForDatabaseException.php
@@ -9,7 +9,7 @@
 /**
  * @since 3.1
  *
- * @author Martin Georgiev <martin.georgiev@gmail.com>
+ * @author Sébastien Jean <sebastien.jean76@gmail.com>
  */
 class InvalidPointArrayItemForDatabaseException extends ConversionException
 {
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidPointArrayItemForPHPException.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidPointArrayItemForPHPException.php
@@ -9,7 +9,7 @@
 /**
  * @since 3.1
  *
- * @author Martin Georgiev <martin.georgiev@gmail.com>
+ * @author Sébastien Jean <sebastien.jean76@gmail.com>
  */
 class InvalidPointArrayItemForPHPException extends ConversionException
 {
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidPointForDatabaseException.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidPointForDatabaseException.php
@@ -9,7 +9,7 @@
 /**
  * @since 3.1
  *
- * @author Martin Georgiev <martin.georgiev@gmail.com>
+ * @author Sébastien Jean <sebastien.jean76@gmail.com>
  */
 class InvalidPointForDatabaseException extends ConversionException
 {
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidPointForPHPException.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidPointForPHPException.php
@@ -9,7 +9,7 @@
 /**
  * @since 3.1
  *
- * @author Martin Georgiev <martin.georgiev@gmail.com>
+ * @author Sébastien Jean <sebastien.jean76@gmail.com>
  */
 class InvalidPointForPHPException extends ConversionException
 {
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/Point.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/Point.php
@@ -7,15 +7,15 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointForDatabaseException;
 use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointForPHPException;
-use MartinGeorgiev\ValueObject\Point as PointValueObject;
+use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Point as PointValueObject;
 
 /**
  * Implementation of PostgreSQL POINT data type.
  *
- * @see https://www.postgresql.org/docs/current/datatype-geometric.html#DATATYPE-GEOMETRIC-POINTS
+ * @see https://www.postgresql.org/docs/17/datatype-geometric.html#DATATYPE-GEOMETRIC-POINTS
  * @since 3.1
  *
- * @author Martin Georgiev <martin.georgiev@gmail.com>
+ * @author Sébastien Jean <sebastien.jean76@gmail.com>
  */
 class Point extends BaseType
 {
@@ -44,7 +44,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?PointVal
             throw InvalidPointForDatabaseException::forInvalidType($value);
         }
 
-        if (!\preg_match('/\((-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)\)/', $value, $matches)) {
+        if (!\preg_match('/\((-?\d+(?:\.\d{1,6})?),\s*(-?\d+(?:\.\d{1,6})?)\)/', $value, $matches)) {
             throw InvalidPointForDatabaseException::forInvalidFormat($value);
         }
 
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/PointArray.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/PointArray.php
@@ -6,15 +6,15 @@
 
 use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointArrayItemForDatabaseException;
 use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointArrayItemForPHPException;
-use MartinGeorgiev\ValueObject\Point as PointValueObject;
+use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Point as PointValueObject;
 
 /**
  * Implementation of PostgreSQL POINT[] data type.
  *
- * @see https://www.postgresql.org/docs/current/datatype-geometric.html#DATATYPE-GEOMETRIC-POINTS
+ * @see https://www.postgresql.org/docs/17/datatype-geometric.html#DATATYPE-GEOMETRIC-POINTS
  * @since 3.1
  *
- * @author Martin Georgiev <martin.georgiev@gmail.com>
+ * @author Sébastien Jean <sebastien.jean76@gmail.com>
  */
 class PointArray extends BaseArray
 {
@@ -53,7 +53,7 @@ public function transformArrayItemForPHP(mixed $item): ?PointValueObject
             $this->throwInvalidTypeException($item);
         }
 
-        if (!\preg_match('/^\((-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)\)$/', $item, $matches)) {
+        if (!\preg_match('/^\((-?\d+(?:\.\d{1,6})?),\s*(-?\d+(?:\.\d{1,6})?)\)$/', $item, $matches)) {
             $this->throwInvalidFormatException($item);
         }
 
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/Point.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/Point.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace MartinGeorgiev\ValueObject;
+namespace MartinGeorgiev\Doctrine\DBAL\Types\ValueObject;
 
 /**
  * @since 3.1
  *
- * @author Martin Georgiev <martin.georgiev@gmail.com>
+ * @author Sébastien Jean <sebastien.jean76@gmail.com>
  */
 final class Point implements \Stringable
 {
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/PointArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/PointArrayTest.php
@@ -7,7 +7,7 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointArrayItemForPHPException;
 use MartinGeorgiev\Doctrine\DBAL\Types\PointArray;
-use MartinGeorgiev\ValueObject\Point as PointValueObject;
+use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Point;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -55,7 +55,7 @@ public function can_transform_to_php_value(?array $phpValue, ?string $postgresVa
     }
 
     /**
-     * @return array<string, array{phpValue: array<PointValueObject>|null, postgresValue: string|null}>
+     * @return array<string, array{phpValue: array<Point>|null, postgresValue: string|null}>
      */
     public static function provideValidTransformations(): array
     {
@@ -69,20 +69,20 @@ public static function provideValidTransformations(): array
                 'postgresValue' => '{}',
             ],
             'single point' => [
-                'phpValue' => [new PointValueObject(1.23, 4.56)],
+                'phpValue' => [new Point(1.23, 4.56)],
                 'postgresValue' => '{"(1.230000, 4.560000)"}',
             ],
             'multiple points' => [
                 'phpValue' => [
-                    new PointValueObject(1.23, 4.56),
-                    new PointValueObject(-7.89, 0.12),
+                    new Point(1.23, 4.56),
+                    new Point(-7.89, 0.12),
                 ],
                 'postgresValue' => '{"(1.230000, 4.560000)","(-7.890000, 0.120000)"}',
             ],
             'points with zero values' => [
                 'phpValue' => [
-                    new PointValueObject(0.0, 0.0),
-                    new PointValueObject(10.5, -3.7),
+                    new Point(0.0, 0.0),
+                    new Point(10.5, -3.7),
                 ],
                 'postgresValue' => '{"(0.000000, 0.000000)","(10.500000, -3.700000)"}',
             ],
@@ -111,7 +111,7 @@ public static function provideInvalidTransformations(): array
             'invalid nested point' => [['(1.23,4.56)']],
             'mixed array (valid and invalid points)' => [
                 [
-                    new PointValueObject(1.23, 4.56),
+                    new Point(1.23, 4.56),
                     'invalid',
                 ],
             ],
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/PointTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/PointTest.php
@@ -8,7 +8,7 @@
 use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointForDatabaseException;
 use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointForPHPException;
 use MartinGeorgiev\Doctrine\DBAL\Types\Point;
-use MartinGeorgiev\ValueObject\Point as PointValueObject;
+use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Point as PointValueObject;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -56,27 +56,31 @@ public function can_transform_to_php_value(?PointValueObject $pointValueObject,
     }
 
     /**
-     * @return array<string, array{phpValue: PointValueObject|null, postgresValue: string|null}>
+     * @return array<string, array{pointValueObject: PointValueObject|null, postgresValue: string|null}>
      */
     public static function provideValidTransformations(): array
     {
         return [
             'null' => [
-                'phpValue' => null,
+                'pointValueObject' => null,
                 'postgresValue' => null,
             ],
             'valid point' => [
-                'phpValue' => new PointValueObject(1.23, 4.56),
+                'pointValueObject' => new PointValueObject(1.23, 4.56),
                 'postgresValue' => '(1.230000, 4.560000)',
             ],
             'negative coordinates' => [
-                'phpValue' => new PointValueObject(-1.23, -4.56),
+                'pointValueObject' => new PointValueObject(-1.23, -4.56),
                 'postgresValue' => '(-1.230000, -4.560000)',
             ],
             'zero coordinates' => [
-                'phpValue' => new PointValueObject(0.0, 0.0),
+                'pointValueObject' => new PointValueObject(0.0, 0.0),
                 'postgresValue' => '(0.000000, 0.000000)',
             ],
+            'maximum float precision' => [
+                'pointValueObject' => new PointValueObject(45.123456, 179.987654),
+                'postgresValue' => '(45.123456, 179.987654)',
+            ],
         ];
     }
 
@@ -127,6 +131,7 @@ public static function provideInvalidDatabaseValues(): array
             'non-numeric values' => ['(a,b)'],
             'too many coordinates' => ['(1.23,4.56,7.89)'],
             'not a string' => [123],
+            'maximum float precision' => ['(1.23456789,7.89)'],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ return [`
`84`	`84`	`'macaddr[]' => MartinGeorgiev\Doctrine\DBAL\Types\MacaddrArray::class,`
`85`	`85`
`86`	`86`	`'point' => MartinGeorgiev\Doctrine\DBAL\Types\Point::class,`
	`87`	`+ 'point[]' => MartinGeorgiev\Doctrine\DBAL\Types\PointArray::class,`
`87`	`88`	`],`
`88`	`89`	`];`
`89`	`90`	```
`@@ -308,6 +309,9 @@ class DoctrineEventSubscriber implements Subscriber`
`308`	`309`	`if (!Type::hasType('point')) {`
`309`	`310`	`Type::addType('point', \MartinGeorgiev\Doctrine\DBAL\Types\Point::class);`
`310`	`311`	`}`
	`312`	`+ if (!Type::hasType('point[]')) {`
	`313`	`+ Type::addType('point[]', \MartinGeorgiev\Doctrine\DBAL\Types\PointArray::class);`
	`314`	`+ }`
`311`	`315`	`}`
`312`	`316`	`}`
`313`	`317`	```
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`/**`
`10`	`10`	`* @since 3.1`
`11`	`11`	`*`
`12`		`- * @author Martin Georgiev <martin.georgiev@gmail.com>`
	`12`	`+ * @author Sébastien Jean <sebastien.jean76@gmail.com>`
`13`	`13`	`*/`
`14`	`14`	`class InvalidPointArrayItemForDatabaseException extends ConversionException`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@`
`7`	`7`	`use Doctrine\DBAL\Platforms\AbstractPlatform;`
`8`	`8`	`use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointForDatabaseException;`
`9`	`9`	`use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointForPHPException;`
`10`		`-use MartinGeorgiev\ValueObject\Point as PointValueObject;`
	`10`	`+use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Point as PointValueObject;`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* Implementation of PostgreSQL POINT data type.`
`14`	`14`	`*`
`15`		`- * @see https://www.postgresql.org/docs/current/datatype-geometric.html#DATATYPE-GEOMETRIC-POINTS`
	`15`	`+ * @see https://www.postgresql.org/docs/17/datatype-geometric.html#DATATYPE-GEOMETRIC-POINTS`
`16`	`16`	`* @since 3.1`
`17`	`17`	`*`
`18`		`- * @author Martin Georgiev <martin.georgiev@gmail.com>`
	`18`	`+ * @author Sébastien Jean <sebastien.jean76@gmail.com>`
`19`	`19`	`*/`
`20`	`20`	`class Point extends BaseType`
`21`	`21`	`{`
`@@ -44,7 +44,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?PointVal`
`44`	`44`	`throw InvalidPointForDatabaseException::forInvalidType($value);`
`45`	`45`	`}`
`46`	`46`
`47`		`- if (!\preg_match('/\((-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)\)/', $value, $matches)) {`
	`47`	`+ if (!\preg_match('/\((-?\d+(?:\.\d{1,6})?),\s*(-?\d+(?:\.\d{1,6})?)\)/', $value, $matches)) {`
`48`	`48`	`throw InvalidPointForDatabaseException::forInvalidFormat($value);`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@`
`6`	`6`
`7`	`7`	`use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointArrayItemForDatabaseException;`
`8`	`8`	`use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidPointArrayItemForPHPException;`
`9`		`-use MartinGeorgiev\ValueObject\Point as PointValueObject;`
	`9`	`+use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Point as PointValueObject;`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Implementation of PostgreSQL POINT[] data type.`
`13`	`13`	`*`
`14`		`- * @see https://www.postgresql.org/docs/current/datatype-geometric.html#DATATYPE-GEOMETRIC-POINTS`
	`14`	`+ * @see https://www.postgresql.org/docs/17/datatype-geometric.html#DATATYPE-GEOMETRIC-POINTS`
`15`	`15`	`* @since 3.1`
`16`	`16`	`*`
`17`		`- * @author Martin Georgiev <martin.georgiev@gmail.com>`
	`17`	`+ * @author Sébastien Jean <sebastien.jean76@gmail.com>`
`18`	`18`	`*/`
`19`	`19`	`class PointArray extends BaseArray`
`20`	`20`	`{`
`@@ -53,7 +53,7 @@ public function transformArrayItemForPHP(mixed $item): ?PointValueObject`
`53`	`53`	`$this->throwInvalidTypeException($item);`
`54`	`54`	`}`
`55`	`55`
`56`		`- if (!\preg_match('/^\((-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)\)$/', $item, $matches)) {`
	`56`	`+ if (!\preg_match('/^\((-?\d+(?:\.\d{1,6})?),\s*(-?\d+(?:\.\d{1,6})?)\)$/', $item, $matches)) {`
`57`	`57`	`$this->throwInvalidFormatException($item);`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace MartinGeorgiev\ValueObject;`
	`5`	`+namespace MartinGeorgiev\Doctrine\DBAL\Types\ValueObject;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* @since 3.1`
`9`	`9`	`*`
`10`		`- * @author Martin Georgiev <martin.georgiev@gmail.com>`
	`10`	`+ * @author Sébastien Jean <sebastien.jean76@gmail.com>`
`11`	`11`	`*/`
`12`	`12`	`final class Point implements \Stringable`
`13`	`13`	`{`