Issue #57 fixed (#59)

* Fix comments in #43 * Fix #57 * "declare(strict_types=1)" added. * Fix CI * Fixing comment headers
longitude-one · May 1, 2024 · 804498e · 804498e
1 parent 23c7e7f
commit 804498e
Show file tree

Hide file tree

Showing 284 changed files with 674 additions and 176 deletions.
diff --git a/.github/workflows/full.yaml b/.github/workflows/full.yaml
@@ -87,18 +87,18 @@ jobs:
       - name: Force doctrine/orm library to ${{ matrix.orm }}
         run: composer --prefer-stable require doctrine/orm:${{ matrix.orm }} --with-all-dependencies
       - name: Run test suite and coverage
-        if: ${{ matrix.php == '8.3' && env.HAS_CC_SECRET == 'true' }}
+        if: ${{ matrix.php == '8.3' && matrix.orm == '^3.1' && env.HAS_CC_SECRET == 'true' }}
         uses: paambaati/codeclimate-action@v5.0.0
         env:
            CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
         with:
            coverageCommand: composer run-script test-coverage
            coverageLocations: ${{github.workspace}}/.phpunit.cache/code-coverage/clover*.xml:clover
       - name: Run test suite for forks or version without coverage
-        if: ${{ matrix.php != '8.3' || env.HAS_CC_SECRET != 'true' }}
+        if: ${{ matrix.php != '8.3' || matrix.orm != '^3.1' || env.HAS_CC_SECRET != 'true' }}
         run: composer run-script test
       - name: Coveralls.io steps
-        if: ${{ matrix.php == '8.3' && env.HAS_CA_SECRET == 'true' }}
+        if: ${{ matrix.php == '8.3' && matrix.orm == '^3.1' && env.HAS_CA_SECRET == 'true' }}
         uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -43,7 +43,9 @@
         '@PHP70Migration' => true,
         '@PHP71Migration' => true,
         '@PHP73Migration' => true,
-        //        'strict_param' => true,
+        '@PHP74Migration' => true,
+        '@PHP80Migration' => true,
+        'declare_strict_types' => true,
         'array_syntax' => ['syntax' => 'short'],
         'dir_constant' => true,
         'ereg_to_preg' => true,

diff --git a/lib/LongitudeOne/Spatial/DBAL/Platform/AbstractPlatform.php b/lib/LongitudeOne/Spatial/DBAL/Platform/AbstractPlatform.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Platform;
 
 use LongitudeOne\Geo\WKB\Parser as BinaryParser;
@@ -43,7 +45,7 @@ abstract class AbstractPlatform implements PlatformInterface
      */
     protected static function checkSrid(array $column, ?int $srid): ?int
     {
-        $srid = $srid ?? $column['srid'] ?? null;
+        $srid ??= $column['srid'] ?? null;
 
         if (null !== $srid && !is_int($srid)) {
             $message = sprintf(
@@ -67,7 +69,7 @@ protected static function checkSrid(array $column, ?int $srid): ?int
      */
     protected static function checkType(array $column, ?AbstractSpatialType $type): AbstractSpatialType
     {
-        $type = $type ?? $column['type'] ?? null;
+        $type ??= $column['type'] ?? null;
 
         if (!$type instanceof AbstractSpatialType) {
             throw new MissingArgumentException('Arguments aren\'t well defined. Please provide a type.');

diff --git a/lib/LongitudeOne/Spatial/DBAL/Platform/MySql.php b/lib/LongitudeOne/Spatial/DBAL/Platform/MySql.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Platform;
 
 use LongitudeOne\Spatial\DBAL\Types\AbstractSpatialType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Platform/PlatformInterface.php b/lib/LongitudeOne/Spatial/DBAL/Platform/PlatformInterface.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Platform;
 
 use LongitudeOne\Spatial\DBAL\Types\AbstractSpatialType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Platform/PostgreSql.php b/lib/LongitudeOne/Spatial/DBAL/Platform/PostgreSql.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Platform;
 
 use LongitudeOne\Spatial\DBAL\Types\AbstractSpatialType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/AbstractSpatialType.php b/lib/LongitudeOne/Spatial/DBAL/Types/AbstractSpatialType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/DoctrineSpatialTypeInterface.php b/lib/LongitudeOne/Spatial/DBAL/Types/DoctrineSpatialTypeInterface.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types;
 
 interface DoctrineSpatialTypeInterface

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/LineStringType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/LineStringType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geography;
 
 use LongitudeOne\Spatial\DBAL\Types\GeographyType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PointType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PointType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geography;
 
 use LongitudeOne\Spatial\DBAL\Types\GeographyType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PolygonType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PolygonType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geography;
 
 use LongitudeOne\Spatial\DBAL\Types\GeographyType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/GeographyType.php b/lib/LongitudeOne/Spatial/DBAL/Types/GeographyType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types;
 
 /**

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/LineStringType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/LineStringType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geometry;
 
 use LongitudeOne\Spatial\DBAL\Types\GeometryType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiLineStringType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiLineStringType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geometry;
 
 use LongitudeOne\Spatial\DBAL\Types\GeometryType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPointType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPointType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geometry;
 
 use LongitudeOne\Spatial\DBAL\Types\GeometryType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPolygonType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPolygonType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geometry;
 
 use LongitudeOne\Spatial\DBAL\Types\GeometryType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PointType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PointType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geometry;
 
 use LongitudeOne\Spatial\DBAL\Types\GeometryType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PolygonType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PolygonType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types\Geometry;
 
 use LongitudeOne\Spatial\DBAL\Types\GeometryType;

diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/GeometryType.php b/lib/LongitudeOne/Spatial/DBAL/Types/GeometryType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\DBAL\Types;
 
 /**

diff --git a/lib/LongitudeOne/Spatial/Exception/ExceptionInterface.php b/lib/LongitudeOne/Spatial/Exception/ExceptionInterface.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\Exception;
 
 /**

diff --git a/lib/LongitudeOne/Spatial/Exception/InvalidValueException.php b/lib/LongitudeOne/Spatial/Exception/InvalidValueException.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\Exception;
 
 /**

diff --git a/lib/LongitudeOne/Spatial/Exception/MissingArgumentException.php b/lib/LongitudeOne/Spatial/Exception/MissingArgumentException.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\Exception;
 
 /**

diff --git a/lib/LongitudeOne/Spatial/Exception/UnsupportedPlatformException.php b/lib/LongitudeOne/Spatial/Exception/UnsupportedPlatformException.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\Exception;
 
 /**

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions;
 
 use Doctrine\DBAL\Exception;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBuffer.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBuffer.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBufferStrategy.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBufferStrategy.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpDistance.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpDistance.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpGeometryType.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpGeometryType.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpLineString.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpLineString.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrContains.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrContains.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrDisjoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrDisjoint.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrEquals.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrEquals.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrIntersects.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrIntersects.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrOverlaps.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrOverlaps.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrTouches.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrTouches.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrWithin.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrWithin.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpPoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpPoint.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\MySql;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJson.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJson.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAzimuth.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAzimuth.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;

diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpClosestPoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpClosestPoint.php
@@ -13,6 +13,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql;
 
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;