Merge branch 'refs/heads/5.1.x-dev' into 6.x-dev

Author: Alexandre-T

docker/sphinx/requirements.txt

@@ -1,7 +1,7 @@
 alabaster==0.7.16
 anyio==4.3.0
 Babel==2.15.0
-certifi==2024.2.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 click==8.1.7
 colorama==0.4.6

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php

@@ -196,7 +196,7 @@ abstract protected function getMinParameter(): int;
      * @see https://github.com/doctrine/dbal/issues/4749
      * @see https://github.com/longitude-one/doctrine-spatial/issues/40
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     abstract protected function getPlatforms(): array;
 }

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBuffer.php

@@ -18,13 +18,14 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
 /**
  * Sp_Buffer DQL function.
  * MySQL ST_Buffer function is not able to receive a CHARACTER VARYING as third parameter.
- * This SQL function can only received the result of a ST_Buffer_Strategy function as third parameter.
+ * This SQL function can only receive the result of an ST_Buffer_Strategy function as third parameter.
  * So Sp_Buffer DQL function is specific to MySQL.
  *
  * @author  Alexandre Tranchant <[email protected]>
@@ -72,7 +73,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBufferStrategy.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpDistance.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpDistanceSphere.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpGeometryType.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -69,7 +70,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpLineString.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrContains.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -69,7 +70,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrDisjoint.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -69,7 +70,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrEquals.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrIntersects.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -71,7 +72,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrOverlaps.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -67,12 +68,10 @@ protected function getMinParameter(): int
     /**
      * Get the platforms accepted.
      *
-     * TODO check why this function was used with postgresql.
-     *
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrTouches.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -71,7 +72,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrWithin.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -71,7 +72,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpPoint.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJson.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\ReturnsGeometryInterface;
@@ -71,7 +72,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAzimuth.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpClosestPoint.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -71,7 +72,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCollect.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpContainsProperly.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCoveredBy.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {

lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCovers.php

@@ -18,6 +18,7 @@
 
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use LongitudeOne\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
 
@@ -70,7 +71,7 @@ protected function getMinParameter(): int
      * @since 2.0 This function replace the protected property platforms.
      * @since 5.0 This function returns the class-string[] instead of string[]
      *
-     * @return class-string[] a non-empty array of accepted platforms
+     * @return class-string<AbstractPlatform>[] a non-empty array of accepted platforms
      */
     protected function getPlatforms(): array
     {