From fbd0dbb7dec71d4558af62a079a55235d9bb87a9 Mon Sep 17 00:00:00 2001
From: Alexis Urien <alexis.urien@free.fr>
Date: Thu, 11 May 2023 11:24:15 +0200
Subject: [PATCH] Use longitude-one/wkt-parser, remove php 7.4 & 8.0 support
 (#37)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Allows axi version

* Use longitude-one/wkt-parser

* Use longitude-one/wkt-parser

* Migrate tests from annotations to attributes, fixes for doctrine/annotation 2

* Remove php7.4 & 8.0 support

* Fix codeclimate error ?

Generating code coverage report in Clover XML format ... done [00:00.232]
Script phpunit --configuration phpunit.mysql5.7.xml handling the test event returned with error code 1
Error: The process '/usr/local/bin/composer' failed with exit code 1
(node:4044) UnhandledPromiseRejectionWarning: Error: The process '/usr/local/bin/composer' failed with exit code 1
    at ExecState._setResult (/home/runner/work/_actions/paambaati/codeclimate-action/v2.7.5/node_modules/@actions/exec/lib/toolrunner.js:574:25)
    at ExecState.CheckComplete (/home/runner/work/_actions/paambaati/codeclimate-action/v2.7.5/node_modules/@actions/exec/lib/toolrunner.js:557:18)
    at ChildProcess.<anonymous> (/home/runner/work/_actions/paambaati/codeclimate-action/v2.7.5/node_modules/@actions/exec/lib/toolrunner.js:451:27)
    at ChildProcess.emit (events.js:314:20)
    at maybeClose (internal/child_process.js:1022:16)
    at Process.ChildProcess._handle.onexit (internal/child_process.js:287:5)
(node:4044) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 1)
(node:4044) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.
Error: 🚨 Coverage run failed!

* Test: do not compare float strictly (see https://www.php.net/manual/en/language.types.float.php "Floating point precision") so tests will succeed on different linux / windows platforms

* Tests: fix 2 more tests

* Allows tests to be executed by GitHub Actions in forked repositories

* Apply php-cs-fixer command

---------

Co-authored-by: Alexis Urien <alexis@smiile.com>
---
 .github/workflows/full.yaml                   | 12 ++-
 .php-cs-fixer.dist.php                        | 50 +++++++----
 .travis.yml                                   | 84 ++-----------------
 CHANGELOG.md                                  | 11 ++-
 README.md                                     |  5 +-
 composer.json                                 |  8 +-
 docker/README.md                              | 10 +--
 docker/docker-compose.yaml                    |  6 --
 docker/php7/Dockerfile                        | 19 -----
 docker/php8/Dockerfile                        |  2 +-
 docs/Contributing.rst                         |  2 +-
 docs/Test.rst                                 | 13 +--
 .../DBAL/Platform/AbstractPlatform.php        | 18 ++--
 .../Spatial/DBAL/Platform/MySql.php           |  2 +-
 .../DBAL/Platform/PlatformInterface.php       |  2 +-
 .../Spatial/DBAL/Platform/PostgreSql.php      |  6 +-
 .../DBAL/Types/AbstractSpatialType.php        | 30 +++----
 .../DBAL/Types/Geography/LineStringType.php   |  2 +-
 .../DBAL/Types/Geography/PointType.php        |  2 +-
 .../DBAL/Types/Geography/PolygonType.php      |  2 +-
 .../Spatial/DBAL/Types/GeographyType.php      |  2 +-
 .../DBAL/Types/Geometry/LineStringType.php    |  2 +-
 .../Types/Geometry/MultiLineStringType.php    |  2 +-
 .../DBAL/Types/Geometry/MultiPointType.php    |  2 +-
 .../DBAL/Types/Geometry/MultiPolygonType.php  |  2 +-
 .../Spatial/DBAL/Types/Geometry/PointType.php |  2 +-
 .../DBAL/Types/Geometry/PolygonType.php       |  2 +-
 .../Spatial/DBAL/Types/GeometryType.php       |  2 +-
 .../Exception/InvalidValueException.php       |  6 +-
 .../UnsupportedPlatformException.php          |  6 +-
 .../Functions/AbstractSpatialDQLFunction.php  |  2 +-
 .../Query/AST/Functions/MySql/SpBuffer.php    |  2 +-
 .../AST/Functions/MySql/SpBufferStrategy.php  |  2 +-
 .../Query/AST/Functions/MySql/SpDistance.php  |  2 +-
 .../AST/Functions/MySql/SpGeometryType.php    |  2 +-
 .../AST/Functions/MySql/SpLineString.php      |  2 +-
 .../AST/Functions/MySql/SpMbrContains.php     |  2 +-
 .../AST/Functions/MySql/SpMbrDisjoint.php     |  2 +-
 .../Query/AST/Functions/MySql/SpMbrEquals.php |  2 +-
 .../AST/Functions/MySql/SpMbrIntersects.php   |  2 +-
 .../AST/Functions/MySql/SpMbrOverlaps.php     |  2 +-
 .../AST/Functions/MySql/SpMbrTouches.php      |  2 +-
 .../Query/AST/Functions/MySql/SpMbrWithin.php |  2 +-
 .../ORM/Query/AST/Functions/MySql/SpPoint.php |  2 +-
 .../AST/Functions/PostgreSql/SpAsGeoJson.php  |  2 +-
 .../AST/Functions/PostgreSql/SpAzimuth.php    |  2 +-
 .../Functions/PostgreSql/SpClosestPoint.php   |  2 +-
 .../AST/Functions/PostgreSql/SpCollect.php    |  2 +-
 .../PostgreSql/SpContainsProperly.php         |  2 +-
 .../AST/Functions/PostgreSql/SpCoveredBy.php  |  2 +-
 .../AST/Functions/PostgreSql/SpCovers.php     |  2 +-
 .../AST/Functions/PostgreSql/SpDWithin.php    |  2 +-
 .../Functions/PostgreSql/SpDistanceSphere.php |  6 +-
 .../AST/Functions/PostgreSql/SpExpand.php     |  6 +-
 .../Functions/PostgreSql/SpGeogFromText.php   |  2 +-
 .../PostgreSql/SpGeographyFromText.php        |  2 +-
 .../Functions/PostgreSql/SpGeomFromEwkt.php   |  2 +-
 .../Functions/PostgreSql/SpGeometryType.php   |  2 +-
 .../PostgreSql/SpLineCrossingDirection.php    |  2 +-
 .../PostgreSql/SpLineInterpolatePoint.php     |  6 +-
 .../PostgreSql/SpLineLocatePoint.php          |  6 +-
 .../Functions/PostgreSql/SpLineSubstring.php  |  6 +-
 .../AST/Functions/PostgreSql/SpMakeBox2D.php  |  2 +-
 .../Functions/PostgreSql/SpMakeEnvelope.php   |  2 +-
 .../AST/Functions/PostgreSql/SpMakeLine.php   |  2 +-
 .../AST/Functions/PostgreSql/SpMakePoint.php  |  2 +-
 .../AST/Functions/PostgreSql/SpNPoints.php    |  2 +-
 .../AST/Functions/PostgreSql/SpScale.php      |  6 +-
 .../AST/Functions/PostgreSql/SpSimplify.php   |  2 +-
 .../AST/Functions/PostgreSql/SpSnapToGrid.php |  2 +-
 .../AST/Functions/PostgreSql/SpSplit.php      |  2 +-
 .../AST/Functions/PostgreSql/SpSummary.php    |  2 +-
 .../AST/Functions/PostgreSql/SpTransform.php  |  2 +-
 .../AST/Functions/PostgreSql/SpTranslate.php  |  2 +-
 .../Functions/ReturnsGeometryInterface.php    |  2 +-
 .../Query/AST/Functions/Standard/StArea.php   |  2 +-
 .../AST/Functions/Standard/StAsBinary.php     |  2 +-
 .../Query/AST/Functions/Standard/StAsText.php |  2 +-
 .../AST/Functions/Standard/StBoundary.php     |  2 +-
 .../Query/AST/Functions/Standard/StBuffer.php |  2 +-
 .../AST/Functions/Standard/StCentroid.php     |  2 +-
 .../AST/Functions/Standard/StContains.php     |  2 +-
 .../AST/Functions/Standard/StConvexHull.php   |  2 +-
 .../AST/Functions/Standard/StCrosses.php      |  2 +-
 .../AST/Functions/Standard/StDifference.php   |  2 +-
 .../AST/Functions/Standard/StDimension.php    |  2 +-
 .../AST/Functions/Standard/StDisjoint.php     |  2 +-
 .../AST/Functions/Standard/StDistance.php     |  2 +-
 .../AST/Functions/Standard/StEndPoint.php     |  2 +-
 .../AST/Functions/Standard/StEnvelope.php     |  2 +-
 .../Query/AST/Functions/Standard/StEquals.php |  2 +-
 .../AST/Functions/Standard/StExteriorRing.php |  2 +-
 .../AST/Functions/Standard/StGeomFromText.php |  2 +-
 .../AST/Functions/Standard/StGeomFromWkb.php  |  2 +-
 .../AST/Functions/Standard/StGeometryN.php    |  2 +-
 .../AST/Functions/Standard/StGeometryType.php |  2 +-
 .../Functions/Standard/StInteriorRingN.php    |  2 +-
 .../AST/Functions/Standard/StIntersection.php |  2 +-
 .../AST/Functions/Standard/StIntersects.php   |  2 +-
 .../AST/Functions/Standard/StIsClosed.php     |  2 +-
 .../AST/Functions/Standard/StIsEmpty.php      |  2 +-
 .../Query/AST/Functions/Standard/StIsRing.php |  2 +-
 .../AST/Functions/Standard/StIsSimple.php     |  2 +-
 .../Query/AST/Functions/Standard/StLength.php |  2 +-
 .../Standard/StLineStringFromWkb.php          |  2 +-
 .../AST/Functions/Standard/StMLineFromWkb.php |  2 +-
 .../Functions/Standard/StMPointFromWkb.php    |  2 +-
 .../AST/Functions/Standard/StMPolyFromWkb.php |  2 +-
 .../Functions/Standard/StNumGeometries.php    |  2 +-
 .../Functions/Standard/StNumInteriorRing.php  |  2 +-
 .../AST/Functions/Standard/StNumPoints.php    |  2 +-
 .../AST/Functions/Standard/StOverlaps.php     |  2 +-
 .../AST/Functions/Standard/StPerimeter.php    |  2 +-
 .../Query/AST/Functions/Standard/StPoint.php  |  2 +-
 .../AST/Functions/Standard/StPointFromWkb.php |  2 +-
 .../Query/AST/Functions/Standard/StPointN.php |  2 +-
 .../Functions/Standard/StPointOnSurface.php   |  2 +-
 .../AST/Functions/Standard/StPolyFromWkb.php  |  2 +-
 .../Query/AST/Functions/Standard/StRelate.php |  2 +-
 .../AST/Functions/Standard/StSetSRID.php      |  2 +-
 .../Query/AST/Functions/Standard/StSrid.php   |  2 +-
 .../AST/Functions/Standard/StStartPoint.php   |  2 +-
 .../Functions/Standard/StSymDifference.php    |  2 +-
 .../AST/Functions/Standard/StTouches.php      |  2 +-
 .../Query/AST/Functions/Standard/StUnion.php  |  2 +-
 .../Query/AST/Functions/Standard/StWithin.php |  2 +-
 .../ORM/Query/AST/Functions/Standard/StX.php  |  2 +-
 .../ORM/Query/AST/Functions/Standard/StY.php  |  2 +-
 .../Spatial/ORM/Query/GeometryWalker.php      |  6 +-
 .../Spatial/PHP/Types/AbstractGeometry.php    | 36 ++++----
 .../Spatial/PHP/Types/AbstractLineString.php  |  2 +-
 .../PHP/Types/AbstractMultiLineString.php     | 10 +--
 .../Spatial/PHP/Types/AbstractMultiPoint.php  | 10 +--
 .../PHP/Types/AbstractMultiPolygon.php        |  8 +-
 .../Spatial/PHP/Types/AbstractPoint.php       | 22 ++---
 .../Spatial/PHP/Types/AbstractPolygon.php     | 10 +--
 .../Types/Geography/GeographyInterface.php    |  2 +-
 .../PHP/Types/Geography/LineString.php        |  2 +-
 .../Spatial/PHP/Types/Geography/Point.php     | 10 +--
 .../Spatial/PHP/Types/Geography/Polygon.php   |  2 +-
 .../PHP/Types/Geometry/GeometryInterface.php  |  2 +-
 .../Spatial/PHP/Types/Geometry/LineString.php |  2 +-
 .../PHP/Types/Geometry/MultiLineString.php    |  2 +-
 .../Spatial/PHP/Types/Geometry/MultiPoint.php |  2 +-
 .../PHP/Types/Geometry/MultiPolygon.php       |  2 +-
 .../Spatial/PHP/Types/Geometry/Point.php      |  2 +-
 .../Spatial/PHP/Types/Geometry/Polygon.php    |  2 +-
 .../Tests/DBAL/Platform/PlatformTest.php      |  5 +-
 .../DBAL/Types/Geography/GeoPointSridTest.php |  3 +-
 .../Types/Geography/GeoPolygonTypeTest.php    |  3 +-
 .../Tests/DBAL/Types/GeographyTypeTest.php    |  3 +-
 .../Types/Geometry/LineStringTypeTest.php     |  5 +-
 .../Types/Geometry/MultiPolygonTypeTest.php   |  5 +-
 .../DBAL/Types/Geometry/PointTypeTest.php     |  5 +-
 .../DBAL/Types/Geometry/PolygonTypeTest.php   |  3 +-
 .../Tests/DBAL/Types/GeometryTypeTest.php     |  3 +-
 .../Spatial/Tests/DBAL/Types/SchemaTest.php   |  5 +-
 .../Spatial/Tests/FileSQLLogger.php           |  2 +-
 .../Tests/Fixtures/GeoLineStringEntity.php    | 17 ++--
 .../Tests/Fixtures/GeoPointSridEntity.php     | 15 ++--
 .../Tests/Fixtures/GeoPolygonEntity.php       | 17 ++--
 .../Tests/Fixtures/GeographyEntity.php        | 15 ++--
 .../Spatial/Tests/Fixtures/GeometryEntity.php | 17 ++--
 .../Tests/Fixtures/LineStringEntity.php       | 17 ++--
 .../Tests/Fixtures/MultiLineStringEntity.php  | 17 ++--
 .../Tests/Fixtures/MultiPointEntity.php       | 17 ++--
 .../Tests/Fixtures/MultiPolygonEntity.php     | 17 ++--
 .../Tests/Fixtures/NoHintGeometryEntity.php   | 17 ++--
 .../Spatial/Tests/Fixtures/PointEntity.php    | 17 ++--
 .../Spatial/Tests/Fixtures/PolygonEntity.php  | 17 ++--
 .../Tests/Helper/GeometryHelperTrait.php      |  2 +-
 .../Tests/Helper/LineStringHelperTrait.php    |  2 +-
 .../Tests/Helper/MultiPointHelperTrait.php    |  2 +-
 .../Tests/Helper/PersistHelperTrait.php       |  2 +-
 .../Spatial/Tests/Helper/PointHelperTrait.php |  2 +-
 .../Tests/Helper/PolygonHelperTrait.php       |  2 +-
 .../AST/Functions/MySql/SpBufferTest.php      |  3 +-
 .../AST/Functions/MySql/SpDistanceTest.php    |  3 +-
 .../Functions/MySql/SpGeometryTypeTest.php    |  3 +-
 .../AST/Functions/MySql/SpLineStringTest.php  |  3 +-
 .../AST/Functions/MySql/SpMbrContainsTest.php |  7 +-
 .../AST/Functions/MySql/SpMbrDisjointTest.php | 11 +--
 .../AST/Functions/MySql/SpMbrEqualsTest.php   | 11 +--
 .../Functions/MySql/SpMbrIntersectsTest.php   |  3 +-
 .../AST/Functions/MySql/SpMbrOverlapsTest.php |  3 +-
 .../AST/Functions/MySql/SpMbrTouchesTest.php  |  3 +-
 .../AST/Functions/MySql/SpMbrWithinTest.php   |  3 +-
 .../Query/AST/Functions/MySql/SpPointTest.php |  3 +-
 .../Functions/PostgreSql/SpAsGeoJsonTest.php  |  3 +-
 .../Functions/PostgreSql/SpAzimuthTest.php    |  5 +-
 .../PostgreSql/SpClosestPointTest.php         |  7 +-
 .../Functions/PostgreSql/SpCollectTest.php    |  5 +-
 .../PostgreSql/SpContainsProperlyTest.php     |  3 +-
 .../Functions/PostgreSql/SpCoveredByTest.php  |  3 +-
 .../AST/Functions/PostgreSql/SpCoversTest.php |  3 +-
 .../Functions/PostgreSql/SpDWithinTest.php    |  5 +-
 .../PostgreSql/SpDistanceSphereTest.php       |  3 +-
 .../AST/Functions/PostgreSql/SpExpandTest.php |  3 +-
 .../PostgreSql/SpGeogFromTextTest.php         |  3 +-
 .../PostgreSql/SpGeomFromEwktTest.php         |  3 +-
 .../PostgreSql/SpGeometryTypeTest.php         |  3 +-
 .../SpLineCrossingDirectionTest.php           |  3 +-
 .../PostgreSql/SpLineInterpolatePointTest.php |  3 +-
 .../PostgreSql/SpLineLocatePointTest.php      |  5 +-
 .../PostgreSql/SpLineSubstringTest.php        |  3 +-
 .../Functions/PostgreSql/SpMakeBox2dTest.php  |  3 +-
 .../PostgreSql/SpMakeEnvelopeTest.php         |  3 +-
 .../Functions/PostgreSql/SpMakeLineTest.php   |  3 +-
 .../Functions/PostgreSql/SpMakePointTest.php  |  3 +-
 .../AST/Functions/PostgreSql/SpScaleTest.php  |  9 +-
 .../Functions/PostgreSql/SpSimplifyTest.php   |  3 +-
 .../Functions/PostgreSql/SpSnapToGridTest.php | 11 +--
 .../AST/Functions/PostgreSql/SpSplitTest.php  |  3 +-
 .../Functions/PostgreSql/SpSummaryTest.php    |  3 +-
 .../Functions/PostgreSql/SpTransformTest.php  |  6 +-
 .../Functions/PostgreSql/SpTranslateTest.php  |  4 +-
 .../AST/Functions/Standard/CoordinateTest.php |  3 +-
 .../AST/Functions/Standard/StAreaTest.php     |  3 +-
 .../AST/Functions/Standard/StAsBinaryTest.php |  3 +-
 .../AST/Functions/Standard/StAsTextTest.php   |  3 +-
 .../AST/Functions/Standard/StBoundaryTest.php |  9 +-
 .../AST/Functions/Standard/StBufferTest.php   |  3 +-
 .../AST/Functions/Standard/StCentroidTest.php |  3 +-
 .../AST/Functions/Standard/StContainsTest.php |  5 +-
 .../Functions/Standard/StConvexHullTest.php   |  3 +-
 .../AST/Functions/Standard/StCrossesTest.php  |  3 +-
 .../Functions/Standard/StDifferenceTest.php   |  7 +-
 .../Functions/Standard/StDimensionTest.php    |  3 +-
 .../AST/Functions/Standard/StDisjointTest.php |  3 +-
 .../AST/Functions/Standard/StDistanceTest.php | 13 +--
 .../AST/Functions/Standard/StEndPointTest.php |  3 +-
 .../AST/Functions/Standard/StEnvelopeTest.php |  5 +-
 .../AST/Functions/Standard/StEqualsTest.php   |  5 +-
 .../Functions/Standard/StExteriorRingTest.php |  3 +-
 .../Functions/Standard/StGeomFromTextTest.php |  3 +-
 .../Functions/Standard/StGeomFromWkbTest.php  |  3 +-
 .../Functions/Standard/StGeometryNTest.php    |  3 +-
 .../Functions/Standard/StGeometryTypeTest.php |  3 +-
 .../Standard/StInteriorRingNTest.php          |  3 +-
 .../Functions/Standard/StIntersectionTest.php |  3 +-
 .../Functions/Standard/StIntersectsTest.php   |  3 +-
 .../AST/Functions/Standard/StIsClosedTest.php |  3 +-
 .../AST/Functions/Standard/StIsEmptyTest.php  |  3 +-
 .../AST/Functions/Standard/StIsRingTest.php   |  3 +-
 .../AST/Functions/Standard/StIsSimpleTest.php |  3 +-
 .../AST/Functions/Standard/StLengthTest.php   |  5 +-
 .../Standard/StLineStringFromWkbTest.php      |  3 +-
 .../Functions/Standard/StMLineFromWkbTest.php |  3 +-
 .../Standard/StMPointFromWkbTest.php          |  3 +-
 .../Functions/Standard/StMPolyFromWkbTest.php |  3 +-
 .../Standard/StNumGeometriesTest.php          |  3 +-
 .../Standard/StNumInteriorRingTest.php        |  3 +-
 .../Functions/Standard/StNumPointsTest.php    |  3 +-
 .../AST/Functions/Standard/StOverlapsTest.php |  5 +-
 .../Functions/Standard/StPerimeterTest.php    |  3 +-
 .../Functions/Standard/StPointFromWkbTest.php |  3 +-
 .../AST/Functions/Standard/StPointNTest.php   |  3 +-
 .../Standard/StPointOnSurfaceTest.php         |  3 +-
 .../AST/Functions/Standard/StPointTest.php    |  3 +-
 .../Functions/Standard/StPolyFromWkbTest.php  |  3 +-
 .../AST/Functions/Standard/StRelateTest.php   |  3 +-
 .../AST/Functions/Standard/StSridTest.php     |  7 +-
 .../Functions/Standard/StStartPointTest.php   |  3 +-
 .../Standard/StSymDifferenceTest.php          |  7 +-
 .../AST/Functions/Standard/StTouchesTest.php  |  3 +-
 .../AST/Functions/Standard/StUnionTest.php    |  3 +-
 .../AST/Functions/Standard/StWithinTest.php   |  3 +-
 .../Tests/ORM/Query/GeometryWalkerTest.php    |  3 +-
 .../Spatial/Tests/ORM/Query/WrappingTest.php  |  3 +-
 .../Spatial/Tests/OrmMockTestCase.php         | 17 ++--
 .../Spatial/Tests/OrmTestCase.php             | 42 +++++-----
 .../Tests/PHP/Types/Geography/PointTest.php   | 31 +++----
 .../PHP/Types/Geometry/LineStringTest.php     |  3 +-
 .../Types/Geometry/MultiLineStringTest.php    |  3 +-
 .../PHP/Types/Geometry/MultiPointTest.php     |  3 +-
 .../PHP/Types/Geometry/MultiPolygonTest.php   |  3 +-
 .../Tests/PHP/Types/Geometry/PointTest.php    | 29 +++----
 .../Tests/PHP/Types/Geometry/PolygonTest.php  |  3 +-
 tests/LongitudeOne/Spatial/Tests/TestInit.php |  2 +-
 279 files changed, 712 insertions(+), 713 deletions(-)
 delete mode 100644 docker/php7/Dockerfile

diff --git a/.github/workflows/full.yaml b/.github/workflows/full.yaml
index 9f99e66b..4fbbaace 100644
--- a/.github/workflows/full.yaml
+++ b/.github/workflows/full.yaml
@@ -9,8 +9,10 @@ jobs:
     environment: 'Test environment'
     strategy:
       matrix:
-        php: [ '7.4', '8.0' ]
+        php: [ '8.1' ]
     name: PHP${{ matrix.php }}/MySQL5.7/MySQL8.0/PgSQL
+    env:
+      HAS_CC_SECRET: ${{secrets.CC_TEST_REPORTER_ID != '' }}
     services:
       mysql5:
         image: mysql:5.7
@@ -72,12 +74,16 @@ jobs:
         run: cp .github/phpunit.*.xml .
       - name: Install libraries
         run: composer update -vvv
-      - name: Run test suite and covergage
-        uses: paambaati/codeclimate-action@v2.7.5
+      - name: Run test suite and coverage
+        if: env.HAS_CC_SECRET == 'true'
+        uses: paambaati/codeclimate-action@v3.2.0
         env:
            CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
         with:
            coverageCommand: composer run-script test
            coverageLocations: ${{github.workspace}}/.phpunit.cache/clover*.xml:clover
+      - name: Run test suite for forks
+        if: env.HAS_CC_SECRET != 'true'
+        run: composer run-script test
       - name: Check quality code
         run: composer run-script check-quality-code
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 5aa8d181..5d703eb8 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,4 +1,17 @@
 <?php
+/**
+ * This file is part of the doctrine spatial extension.
+ *
+ * PHP 8.1
+ *
+ * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
+ * (c) Longitude One 2020 - 2022
+ * (c) 2015 Derek J. Lambert
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ */
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
@@ -6,19 +19,19 @@
     ->exclude('vendor')
 ;
 
-$header = <<<EOF
-This file is part of the doctrine spatial extension.
+$header = <<<'EOF'
+    This file is part of the doctrine spatial extension.
 
-PHP 7.4 | 8.0 | 8.1
+    PHP 8.1
 
-(c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
-(c) Longitude One 2020 - 2022 
-(c) 2015 Derek J. Lambert
+    (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
+    (c) Longitude One 2020 - 2022 
+    (c) 2015 Derek J. Lambert
 
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
+    For the full copyright and license information, please view the LICENSE
+    file that was distributed with this source code.
 
-EOF;
+    EOF;
 
 return (new PhpCsFixer\Config())
 //    ->setCacheFile(__DIR__.'/.php_cs.cache')
@@ -30,7 +43,7 @@
         '@PHP70Migration' => true,
         '@PHP71Migration' => true,
         '@PHP73Migration' => true,
-//        'strict_param' => true,
+        //        'strict_param' => true,
         'array_syntax' => ['syntax' => 'short'],
         'dir_constant' => true,
         'ereg_to_preg' => true,
@@ -38,15 +51,15 @@
             'comment_type' => 'PHPDoc',
             'header' => $header,
             'location' => 'after_open',
-            'separate' => 'bottom'
+            'separate' => 'bottom',
         ],
-//        'date_time_immutable' => true,
-//        'declare_strict_types' => true,
+        //        'date_time_immutable' => true,
+        //        'declare_strict_types' => true,
         'is_null' => true,
         'mb_str_functions' => true,
         'modernize_types_casting' => true,
         'no_unneeded_final_method' => true,
-//        'no_alias_functions' =>true,
+        //        'no_alias_functions' =>true,
         'ordered_interfaces' => [
             'direction' => 'ascend',
             'order' => 'alpha',
@@ -60,12 +73,13 @@
                 'construct', 'destruct',
                 'phpunit',
                 'method_public_static', 'method_protected_static', 'method_private_static', 'method_static',
-                'method_public', 'method_protected', 'method_private', 'method', 'magic'
+                'method_public', 'method_protected', 'method_private', 'method', 'magic',
             ],
-            'sort_algorithm' => 'alpha'
+            'sort_algorithm' => 'alpha',
         ],
         'php_unit_test_case_static_method_calls' => true,
-        'single_line_throw' => false
+        'single_line_throw' => false,
     ])
+    ->setRiskyAllowed(true)
     ->setFinder($finder)
-    ;
\ No newline at end of file
+;
diff --git a/.travis.yml b/.travis.yml
index ee0e867c..a5308b5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,102 +34,30 @@ notifications:
 
 jobs:
   include:
-    #MySQL 5.7 PHP 7.4
-    - stage: PHP7.4
-      name: 'MySQL5.7'
-      php: 7.4
-      env: DB=mysql MYSQL_VERSION=5.7 COVERAGE=yes
-      services:
-        - mysql
-    #MySQL 8 PHP 7.4
-    - stage: PHP7.4
-      name: MySQL8
-      php: 7.4
-      env: DB=mysql.docker MYSQL_VERSION=8.0 COVERAGE=yes
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-mysql-8.0.sh
-    #MySQLi5.7 PHP 7.4
-    - stage: PHP7.4
-      name: MySQLi5.7
-      php: 7.4
-      env: DB=mysqli MYSQL_VERSION=5.7 COVERAGE=yes
-      services:
-        - mysql
-    #MySQLi8 PHP 7.4
-    - stage: PHP7.4
-      name: MySQLi8.0
-      php: 7.4
-      env: DB=mysqli.docker MYSQL_VERSION=8.0 COVERAGE=yes
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-mysql-8.0.sh
-    #PostgreSQL9.6 PHP7.4 Postgis 2.5
-    - stage: PHP7.4
-      name: PgSQL9.6 Postgis 2.5
-      php: 7.4
-      env: DB=pgsql POSTGRESQL_VERSION=9.6 COVERAGE=yes
-      addons:
-        postgresql: "9.6"
-        apt:
-          packages:
-            - postgis
-            - postgresql-9.6-postgis-2.5
-    #PostgreSQL10 PHP7.4 Postgis 2.5
-    - stage: PHP7.4
-      name: PgSQL10 Postgis 2.5
-      php: 7.4
-      env: DB=pgsql POSTGRESQL_VERSION=10.0 COVERAGE=yes
-      sudo: required
-      addons:
-        postgresql: "10"
-        apt:
-          packages:
-            - postgresql-10
-            - postgresql-client-10
-            - postgis
-            - postgresql-10-postgis-2.5
-    #PostgreSQL11 PHP7.4 Postgis 2.5
-    - stage: PHP7.4
-      name: PostgreSQL11 Postgis2.5
-      php: 7.4
-      env: DB=pgsql POSTGRESQL_VERSION=11.0 COVERAGE=yes
-      sudo: required
-      addons:
-        postgresql: "11"
-        apt:
-          packages:
-            - postgis
-            - postgresql-11-postgis-2.5
-
-    #MySQL 8 PHP 8.0
+    #MySQL 8 PHP 8.1
     - stage: PHP8
       name: MySQL8
-      php: 8.0
+      php: 8.1
       env: DB=mysql.docker MYSQL_VERSION=8.0
       sudo: required
       services:
         - docker
       before_script:
         - bash ./tests/travis/install-mysql-8.0.sh
-    #MySQLi 8 PHP 8.0
+    #MySQLi 8 PHP 8.1
     - stage: PHP8
       name: MySQLi8
-      php: 8.0
+      php: 8.1
       env: DB=mysqli.docker MYSQL_VERSION=8.0
       sudo: required
       services:
         - docker
       before_script:
         - bash ./tests/travis/install-mysql-8.0.sh
-    #PostgreSQL11 PHP 8.0 Postgis 2.5
+    #PostgreSQL11 PHP 8.1 Postgis 2.5
     - stage: PHP8
       name: PostgreSQL11 Postgis 2.5
-      php: 8.0
+      php: 8.1
       env: DB=pgsql POSTGRESQL_VERSION=11.0
       sudo: required
       addons:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f716c9ea..c7cbb740 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,21 @@
 All notable changes to this project will be documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
-## LongitudeOne/doctrine-spatial [3.0.0-dev]
+## LongitudeOne/doctrine-spatial [4.0.0-dev]
+
+### Changed
+- longitude-one/wkt-parser replaces creof/wkt-parser
+
+### Removed
+- Removing support of PHP7.4, PHP8.0
 
 ### TODO
 - Support of CircleCI on Github actions (help is welcomed)
 - Support for code coverage on Github Actions (help is welcomed)
 
+
+## LongitudeOne/doctrine-spatial [3.0.2] - 2022-02-16
+
 ### Added
 - longitude-one/doctrine-spatial replaces CrEOF/doctrine2-spatial
 - Support of PHP8.0
diff --git a/README.md b/README.md
index 70e86698..27d7597c 100644
--- a/README.md
+++ b/README.md
@@ -33,14 +33,13 @@ because project seems to be non-active since 2017.
 The `dev` branch can be used, but be careful backward compatibility aren't warrantied.
 The `main` branch will be dedicated to fix issue.
 The release 3.0 has been published during summer 2021.
-The release 3.1 will published during spring 2022.
-The release 4.0 will be published during winter 2022 and compatibility with PHP7.4 will be abandoned because of 
+The release 4.0 will be published during spring 2023 and compatibility with PHP7.4 and 8.0 will be abandoned because of 
 [PHP roadmap](https://www.php.net/supported-versions.php)
 
 Compatibility
 -------------
 ### PHP
-This doctrine extension is compatible with PHP 7.4+ and PHP 8.0
+This doctrine extension is compatible with PHP 8.1+
 Security fixes will follow the [PHP Roadmap](https://www.php.net/supported-versions.php).
 
 ### MySQL 5.7 and 8.0
diff --git a/composer.json b/composer.json
index ad45f2ca..e164fd64 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,11 @@
         "creof/doctrine2-spatial": "*"
     },
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.1",
         "ext-json": "*",
         "ext-mbstring": "*",
         "creof/geo-parser": "~2.2",
-        "creof/wkt-parser": "~2.2",
+        "longitude-one/wkt-parser": "dev-main",
         "creof/wkb-parser": "~2.3",
         "doctrine/orm": "^2.8.0"
     },
@@ -68,5 +68,7 @@
             "LongitudeOne\\Spatial": "lib/",
             "LongitudeOne\\Spatial\\Tests": "tests/"
         }
-    }
+    },
+    "repositories" : [
+    ]
 }
diff --git a/docker/README.md b/docker/README.md
index b74283db..996572c1 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,7 +1,7 @@
 Docker
 ======
 
-This directory is only used to help the contributing developers. It creates a docker environment with PHP 7.4, 
+This directory is only used to help the contributing developers. It creates a docker environment with PHP 8.1, 
 PostgreSQL/PostGis, MySQL5.7 and MySQL8.0. Feel free to use it or to use another solution.
 
 How to start services?
@@ -15,7 +15,7 @@ docker exec spatial-php composer update
 How to start test
 -----------------
 ```bash
-docker exec spatial-php cp docker/phpunit*.xml . 
-docker exec spatial-php composer test-mysql5
-docker exec spatial-php composer test-mysql8
-docker exec spatial-php composer test-pgsql
+docker exec spatial-php8 cp docker/phpunit*.xml . 
+docker exec spatial-php8 composer test-mysql5
+docker exec spatial-php8 composer test-mysql8
+docker exec spatial-php8 composer test-pgsql
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index c7991285..f6ce1ab9 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -6,12 +6,6 @@ services:
       context: ./php8
     volumes:
       - ${APP_FOLDER}:/var/www
-  php7:
-    container_name: "spatial-php7"
-    build:
-      context: ./php7
-    volumes:
-      - ${APP_FOLDER}:/var/www
   database-pgsql:
     container_name: "spatial-postgis"
     image: postgis/postgis
diff --git a/docker/php7/Dockerfile b/docker/php7/Dockerfile
deleted file mode 100644
index 0b4409cb..00000000
--- a/docker/php7/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM php:7-fpm-alpine
-
-RUN apk --update --no-cache add bash git postgresql-dev mysql-dev  \
-        && docker-php-ext-install pdo_pgsql pdo_mysql  \
-        && docker-php-ext-enable pdo_pgsql pdo_mysql
-
-#Install composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-##Install symfony
-RUN wget https://get.symfony.com/cli/installer -O /tmp/installer && \
-    chmod a+x /tmp/installer && \
-    /tmp/installer --install-dir=/usr/local/bin/ && \
-    rm /tmp/installer
-
-WORKDIR /var/www
-
-CMD composer install ;  php-fpm
-EXPOSE 9000
diff --git a/docker/php8/Dockerfile b/docker/php8/Dockerfile
index d9a4f34e..82fcf5d1 100644
--- a/docker/php8/Dockerfile
+++ b/docker/php8/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8-fpm-alpine
+FROM php:8.1-fpm-alpine
 
 RUN apk --update --no-cache add bash git postgresql-dev mysql-dev  \
         && docker-php-ext-install pdo_pgsql pdo_mysql  \
diff --git a/docs/Contributing.rst b/docs/Contributing.rst
index bdb4e745..e43439a5 100644
--- a/docs/Contributing.rst
+++ b/docs/Contributing.rst
@@ -94,7 +94,7 @@ Don't forget to check your code respect our standard of quality:
 
 .. code-block:: bash
 
-    docker exec spatial-php7 composer check-quality-code
+    docker exec spatial-php8 composer check-quality-code
 
 How to test your new function?
 ------------------------------
diff --git a/docs/Test.rst b/docs/Test.rst
index 4563d0c7..e6fa2210 100644
--- a/docs/Test.rst
+++ b/docs/Test.rst
@@ -24,14 +24,12 @@ Done! Your environment is ready with five services:
 1. A MySQL5.7 service, you can connect to database with mysql://main@main:127.0.0.1:3357/main/
 2. A MySQL8.0 service, you can connect to database with mysql://main@main:127.0.0.1:3380/main
 3. A PostGreSQL service, you can connect to database with mysql://main@main:127.0.0.1:5432/main
-4. A PHP7.4 service, you can test it via: docker exec spatial-php7 php -v
-5. A PHP8.0 service, you can test it via: docker exec spatial-php8 php -v
+4. A PHP8.1 service, you can test it via: docker exec spatial-php8 php -v
 
-Composer is installed on spatial-php7 and spatial-php8.
+Composer is installed on spatial-php8.
 
 .. code-block:: bash
 
-    docker exec spatial-php7 composer -v
     docker exec spatial-php8 composer -v
 
 How to start test?
@@ -42,13 +40,10 @@ Copy docker/phpunit.*.xml to the project directory
 
     cp docker/phpunit.*.xml .
 
-Then, you can launch the test on php7, then php8:
+Then, you can launch the test on php8:
 
 .. code-block:: bash
 
-    docker exec spatial-php7 composer test-mysql5.7
-    docker exec spatial-php7 composer test-mysql8.0
-    docker exec spatial-php7 composer test-pgsql
     docker exec spatial-php8 composer test-mysql5.7
     docker exec spatial-php8 composer test-mysql8.0
     docker exec spatial-php8 composer test-pgsql
@@ -57,4 +52,4 @@ After any update, before any commit, simply check your code with this composer c
 
 .. code-block:: bash
 
-    docker exec spatial-php7 composer check-quality-code
+    docker exec spatial-php8 composer check-quality-code
diff --git a/lib/LongitudeOne/Spatial/DBAL/Platform/AbstractPlatform.php b/lib/LongitudeOne/Spatial/DBAL/Platform/AbstractPlatform.php
index 830fdc07..527436cd 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Platform/AbstractPlatform.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Platform/AbstractPlatform.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -16,7 +16,7 @@
 namespace LongitudeOne\Spatial\DBAL\Platform;
 
 use CrEOF\Geo\WKB\Parser as BinaryParser;
-use CrEOF\Geo\WKT\Parser as StringParser;
+use LongitudeOne\Geo\WKT\Parser as StringParser;
 use LongitudeOne\Spatial\DBAL\Types\AbstractSpatialType;
 use LongitudeOne\Spatial\DBAL\Types\GeographyType;
 use LongitudeOne\Spatial\Exception\InvalidValueException;
@@ -37,9 +37,9 @@ abstract class AbstractPlatform implements PlatformInterface
      * @param AbstractSpatialType $type    The abstract spatial type
      * @param string              $sqlExpr the SQL expression
      *
-     * @throws InvalidValueException when the provided type is not supported
-     *
      * @return GeometryInterface
+     *
+     * @throws InvalidValueException when the provided type is not supported
      */
     public function convertBinaryToPhpValue(AbstractSpatialType $type, $sqlExpr)
     {
@@ -54,9 +54,9 @@ public function convertBinaryToPhpValue(AbstractSpatialType $type, $sqlExpr)
      * @param AbstractSpatialType $type    The abstract spatial type
      * @param string              $sqlExpr the SQL expression
      *
-     * @throws InvalidValueException when the provided type is not supported
-     *
      * @return GeometryInterface
+     *
+     * @throws InvalidValueException when the provided type is not supported
      */
     public function convertStringToPhpValue(AbstractSpatialType $type, $sqlExpr)
     {
@@ -77,7 +77,7 @@ public function convertStringToPhpValue(AbstractSpatialType $type, $sqlExpr)
      */
     public function convertToDatabaseValue(AbstractSpatialType $type, GeometryInterface $value)
     {
-        //the unused variable $type is used by overriding method
+        // the unused variable $type is used by overriding method
         return sprintf('%s(%s)', mb_strtoupper($value->getType()), $value);
     }
 
@@ -107,9 +107,9 @@ public function getMappedDatabaseTypes(AbstractSpatialType $type)
      * @param AbstractSpatialType $type  The type spatial type
      * @param array               $value The value of the spatial object
      *
-     * @throws InvalidValueException when the provided type is not supported
-     *
      * @return GeometryInterface
+     *
+     * @throws InvalidValueException when the provided type is not supported
      */
     private function newObjectFromValue(AbstractSpatialType $type, $value)
     {
diff --git a/lib/LongitudeOne/Spatial/DBAL/Platform/MySql.php b/lib/LongitudeOne/Spatial/DBAL/Platform/MySql.php
index 635d88d6..bddb3032 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Platform/MySql.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Platform/MySql.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Platform/PlatformInterface.php b/lib/LongitudeOne/Spatial/DBAL/Platform/PlatformInterface.php
index 2dda8ac3..8a9340c6 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Platform/PlatformInterface.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Platform/PlatformInterface.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Platform/PostgreSql.php b/lib/LongitudeOne/Spatial/DBAL/Platform/PostgreSql.php
index 344090cf..9e0be0d4 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Platform/PostgreSql.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Platform/PostgreSql.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -36,9 +36,9 @@ class PostgreSql extends AbstractPlatform
      * @param AbstractSpatialType $type    Spatial type
      * @param string              $sqlExpr Sql expression
      *
-     * @throws InvalidValueException when SQL expression is not a resource
-     *
      * @return GeometryInterface
+     *
+     * @throws InvalidValueException when SQL expression is not a resource
      */
     public function convertBinaryToPhpValue(AbstractSpatialType $type, $sqlExpr)
     {
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/AbstractSpatialType.php b/lib/LongitudeOne/Spatial/DBAL/Types/AbstractSpatialType.php
index 419d85b3..9ef4d34b 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/AbstractSpatialType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/AbstractSpatialType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -58,9 +58,9 @@ public function canRequireSQLConversion()
      * @param GeometryInterface $value    the value to convert
      * @param AbstractPlatform  $platform the database platform
      *
-     * @throws UnsupportedPlatformException|InvalidValueException when value is not an instance of Geometry Interface
-     *
      * @return string|null
+     *
+     * @throws UnsupportedPlatformException|InvalidValueException when value is not an instance of Geometry Interface
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
@@ -81,9 +81,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
      * @param string           $sqlExpr  the SQL expression
      * @param AbstractPlatform $platform the database platform
      *
-     * @throws UnsupportedPlatformException when platform is unsupported
-     *
      * @return string
+     *
+     * @throws UnsupportedPlatformException when platform is unsupported
      */
     public function convertToDatabaseValueSql($sqlExpr, AbstractPlatform $platform)
     {
@@ -98,9 +98,9 @@ public function convertToDatabaseValueSql($sqlExpr, AbstractPlatform $platform)
      * @param resource|string|null $value    value to convert to PHP
      * @param AbstractPlatform     $platform platform database
      *
-     * @throws UnsupportedPlatformException when platform is unsupported
-     *
      * @return GeometryInterface|null
+     *
+     * @throws UnsupportedPlatformException when platform is unsupported
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
@@ -123,9 +123,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      * @param string           $sqlExpr  SQL expression
      * @param AbstractPlatform $platform platform database
      *
-     * @throws UnsupportedPlatformException when platform is unsupported
-     *
      * @return string
+     *
+     * @throws UnsupportedPlatformException when platform is unsupported
      */
     public function convertToPhpValueSql($sqlExpr, $platform)
     {
@@ -137,9 +137,9 @@ public function convertToPhpValueSql($sqlExpr, $platform)
      *
      * @param AbstractPlatform $platform platform database
      *
-     * @throws UnsupportedPlatformException when platform is unsupported
-     *
      * @return array
+     *
+     * @throws UnsupportedPlatformException when platform is unsupported
      */
     public function getMappedDatabaseTypes(AbstractPlatform $platform)
     {
@@ -162,9 +162,9 @@ public function getName()
      * @param array            $fieldDeclaration the field declaration
      * @param AbstractPlatform $platform         database platform
      *
-     * @throws UnsupportedPlatformException when platform is unsupported
-     *
      * @return string
+     *
+     * @throws UnsupportedPlatformException when platform is unsupported
      */
     public function getSqlDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
@@ -222,9 +222,9 @@ public function requiresSQLCommentHint(AbstractPlatform $platform)
      *
      * @param AbstractPlatform $platform the database platform
      *
-     * @throws UnsupportedPlatformException when platform is not declared in constant
-     *
      * @return PlatformInterface
+     *
+     * @throws UnsupportedPlatformException when platform is not declared in constant
      */
     private function getSpatialPlatform(AbstractPlatform $platform)
     {
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/LineStringType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/LineStringType.php
index 828fc54e..9931cb96 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/LineStringType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/LineStringType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PointType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PointType.php
index 2a3b9fd4..75b29337 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PointType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PointType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PolygonType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PolygonType.php
index 37a40854..c3304f55 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PolygonType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geography/PolygonType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/GeographyType.php b/lib/LongitudeOne/Spatial/DBAL/Types/GeographyType.php
index d64648be..b0b3cdb4 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/GeographyType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/GeographyType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/LineStringType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/LineStringType.php
index ded13e1e..df34b401 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/LineStringType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/LineStringType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiLineStringType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiLineStringType.php
index 8c890409..972812c2 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiLineStringType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiLineStringType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPointType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPointType.php
index ddb1293d..de5b782c 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPointType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPointType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPolygonType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPolygonType.php
index 5e2c313f..043cb615 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPolygonType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/MultiPolygonType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PointType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PointType.php
index 7e05aefe..d5d9daf5 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PointType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PointType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PolygonType.php b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PolygonType.php
index e7faa8a3..5fd65773 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PolygonType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/Geometry/PolygonType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/DBAL/Types/GeometryType.php b/lib/LongitudeOne/Spatial/DBAL/Types/GeometryType.php
index df567f8e..ed117d7e 100644
--- a/lib/LongitudeOne/Spatial/DBAL/Types/GeometryType.php
+++ b/lib/LongitudeOne/Spatial/DBAL/Types/GeometryType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/Exception/InvalidValueException.php b/lib/LongitudeOne/Spatial/Exception/InvalidValueException.php
index b87dde1e..c9fc2365 100644
--- a/lib/LongitudeOne/Spatial/Exception/InvalidValueException.php
+++ b/lib/LongitudeOne/Spatial/Exception/InvalidValueException.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -15,14 +15,12 @@
 
 namespace LongitudeOne\Spatial\Exception;
 
-use Exception;
-
 /**
  * InvalidValueException class.
  *
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  */
-class InvalidValueException extends Exception
+class InvalidValueException extends \Exception
 {
 }
diff --git a/lib/LongitudeOne/Spatial/Exception/UnsupportedPlatformException.php b/lib/LongitudeOne/Spatial/Exception/UnsupportedPlatformException.php
index 78c07198..8a05d8e9 100644
--- a/lib/LongitudeOne/Spatial/Exception/UnsupportedPlatformException.php
+++ b/lib/LongitudeOne/Spatial/Exception/UnsupportedPlatformException.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -15,14 +15,12 @@
 
 namespace LongitudeOne\Spatial\Exception;
 
-use Exception;
-
 /**
  * UnsupportedPlatformException class.
  *
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  */
-class UnsupportedPlatformException extends Exception
+class UnsupportedPlatformException extends \Exception
 {
 }
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php
index bf5a9c7c..729b4275 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBuffer.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBuffer.php
index ea5d9aec..b9cc7c93 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBuffer.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBuffer.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBufferStrategy.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBufferStrategy.php
index f037fc2f..4a745a7e 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBufferStrategy.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpBufferStrategy.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpDistance.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpDistance.php
index 5ab7a760..a2d7e168 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpDistance.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpDistance.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpGeometryType.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpGeometryType.php
index c6e1cf6b..2bc78818 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpGeometryType.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpGeometryType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpLineString.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpLineString.php
index 4df92746..fc143531 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpLineString.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpLineString.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrContains.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrContains.php
index a3a38701..9dba4326 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrContains.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrContains.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrDisjoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrDisjoint.php
index 5a33fb65..d491249a 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrDisjoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrDisjoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrEquals.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrEquals.php
index cb1fd56c..5755f904 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrEquals.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrEquals.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrIntersects.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrIntersects.php
index d9fb3b50..5315b121 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrIntersects.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrIntersects.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrOverlaps.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrOverlaps.php
index e05280e3..37f7b642 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrOverlaps.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrOverlaps.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrTouches.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrTouches.php
index 81c7d95c..03550f56 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrTouches.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrTouches.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrWithin.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrWithin.php
index 71360f64..3590729e 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrWithin.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpMbrWithin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpPoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpPoint.php
index a462873a..35924dcd 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpPoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/MySql/SpPoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJson.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJson.php
index d9a1ef86..d44d4b37 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJson.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJson.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAzimuth.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAzimuth.php
index c10e2267..f14b4084 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAzimuth.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpAzimuth.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpClosestPoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpClosestPoint.php
index c2358296..52a3ef19 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpClosestPoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpClosestPoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCollect.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCollect.php
index db56cccc..b911cdf1 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCollect.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCollect.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpContainsProperly.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpContainsProperly.php
index 9629ad89..683b077b 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpContainsProperly.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpContainsProperly.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCoveredBy.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCoveredBy.php
index a4d95836..47ecafcd 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCoveredBy.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCoveredBy.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCovers.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCovers.php
index 43f05b65..b8b46462 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCovers.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpCovers.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpDWithin.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpDWithin.php
index 5cea1d3e..f26b6c76 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpDWithin.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpDWithin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpDistanceSphere.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpDistanceSphere.php
index be80bb8f..044da127 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpDistanceSphere.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpDistanceSphere.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -33,8 +33,8 @@ class SpDistanceSphere extends AbstractSpatialDQLFunction
      */
     protected function getFunctionName(): string
     {
-        //Since Postgis 2.1 ST_Distance_Sphere renamed to ST_DistanceSphere
-        //@see http://postgis.net/docs/manual-3.1/PostGIS_Special_Functions_Index.html#NewFunctions
+        // Since Postgis 2.1 ST_Distance_Sphere renamed to ST_DistanceSphere
+        // @see http://postgis.net/docs/manual-3.1/PostGIS_Special_Functions_Index.html#NewFunctions
         return 'ST_DistanceSphere';
     }
 
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpExpand.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpExpand.php
index 15893a3b..faa794b8 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpExpand.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpExpand.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -44,8 +44,8 @@ protected function getFunctionName(): string
      */
     protected function getMaxParameter(): int
     {
-        //This should be upgrade to 4 when third coordinate will be implemented
-        //This should be upgrade to 5 when fourth coordinate will be implemented
+        // This should be upgrade to 4 when third coordinate will be implemented
+        // This should be upgrade to 5 when fourth coordinate will be implemented
         return 3;
     }
 
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeogFromText.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeogFromText.php
index ea896cd4..cb84d644 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeogFromText.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeogFromText.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeographyFromText.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeographyFromText.php
index aa6095ea..70da39c9 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeographyFromText.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeographyFromText.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeomFromEwkt.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeomFromEwkt.php
index 090af15f..b29be403 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeomFromEwkt.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeomFromEwkt.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeometryType.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeometryType.php
index 75bde7bc..9d026f56 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeometryType.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpGeometryType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineCrossingDirection.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineCrossingDirection.php
index d2f9e05a..d85c3ce5 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineCrossingDirection.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineCrossingDirection.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineInterpolatePoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineInterpolatePoint.php
index cca3c292..d1b01490 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineInterpolatePoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineInterpolatePoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -33,8 +33,8 @@ class SpLineInterpolatePoint extends AbstractSpatialDQLFunction
      */
     protected function getFunctionName(): string
     {
-        //Since Postgis 2.1 ST_Line_Interpolate_Point renamed to ST_LineInterpolatePoint
-        //@see http://postgis.net/docs/manual-3.1/PostGIS_Special_Functions_Index.html#NewFunctions
+        // Since Postgis 2.1 ST_Line_Interpolate_Point renamed to ST_LineInterpolatePoint
+        // @see http://postgis.net/docs/manual-3.1/PostGIS_Special_Functions_Index.html#NewFunctions
         return 'ST_LineInterpolatePoint';
     }
 
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineLocatePoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineLocatePoint.php
index f7427758..ff0c6639 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineLocatePoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineLocatePoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -33,8 +33,8 @@ class SpLineLocatePoint extends AbstractSpatialDQLFunction
      */
     protected function getFunctionName(): string
     {
-        //since Postgis 2.1 ST_Line_Locate_Point renamed to ST_LineLocatePoint
-        //@see http://postgis.net/docs/manual-3.1/PostGIS_Special_Functions_Index.html#NewFunctions
+        // since Postgis 2.1 ST_Line_Locate_Point renamed to ST_LineLocatePoint
+        // @see http://postgis.net/docs/manual-3.1/PostGIS_Special_Functions_Index.html#NewFunctions
         return 'ST_LineLocatePoint';
     }
 
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineSubstring.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineSubstring.php
index 54fa99d9..edbb43b4 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineSubstring.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpLineSubstring.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -34,8 +34,8 @@ class SpLineSubstring extends AbstractSpatialDQLFunction implements ReturnsGeome
      */
     protected function getFunctionName(): string
     {
-        //since Postgis 2.1 ST_Line_Substring renamed to ST_LineSubstring
-        //@see http://postgis.net/docs/manual-3.1/PostGIS_Special_Functions_Index.html#NewFunctions
+        // since Postgis 2.1 ST_Line_Substring renamed to ST_LineSubstring
+        // @see http://postgis.net/docs/manual-3.1/PostGIS_Special_Functions_Index.html#NewFunctions
         return 'ST_LineSubstring';
     }
 
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeBox2D.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeBox2D.php
index e273d96b..0a51d02c 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeBox2D.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeBox2D.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeEnvelope.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeEnvelope.php
index 4b1421c6..359a0d4f 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeEnvelope.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeEnvelope.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeLine.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeLine.php
index 24ada758..a37c65a6 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeLine.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakeLine.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakePoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakePoint.php
index d97ed524..9528d387 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakePoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpMakePoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpNPoints.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpNPoints.php
index 8f73c359..c8ee2301 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpNPoints.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpNPoints.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpScale.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpScale.php
index cdaab69d..eeb574c7 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpScale.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpScale.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -45,8 +45,8 @@ protected function getFunctionName(): string
      */
     protected function getMaxParameter(): int
     {
-        //TODO When third dimension will be implemented, this function will be able to accept 4 parameters
-        //TODO When fourth dimension will be implemented, this function will be able to accept 5 parameters
+        // TODO When third dimension will be implemented, this function will be able to accept 4 parameters
+        // TODO When fourth dimension will be implemented, this function will be able to accept 5 parameters
         return 3;
     }
 
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSimplify.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSimplify.php
index 66b4143c..4b244368 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSimplify.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSimplify.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSnapToGrid.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSnapToGrid.php
index 338064cc..51b45b94 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSnapToGrid.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSnapToGrid.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSplit.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSplit.php
index 515f39b6..d49d15b9 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSplit.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSplit.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSummary.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSummary.php
index c6f11c7a..ff9bf0ca 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSummary.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpSummary.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpTransform.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpTransform.php
index 516c87e5..df44db88 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpTransform.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpTransform.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpTranslate.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpTranslate.php
index cf0fc95b..7c51a080 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpTranslate.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/PostgreSql/SpTranslate.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/ReturnsGeometryInterface.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/ReturnsGeometryInterface.php
index d37d71a0..72f435d9 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/ReturnsGeometryInterface.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/ReturnsGeometryInterface.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StArea.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StArea.php
index c30f1a39..9e48a5a5 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StArea.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StArea.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StAsBinary.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StAsBinary.php
index d68efb14..880d0534 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StAsBinary.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StAsBinary.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StAsText.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StAsText.php
index 10c1777d..59742fca 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StAsText.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StAsText.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StBoundary.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StBoundary.php
index 3734310b..6705f924 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StBoundary.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StBoundary.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StBuffer.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StBuffer.php
index 1872721e..2bb201c8 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StBuffer.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StBuffer.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StCentroid.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StCentroid.php
index 1aa8323d..49705258 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StCentroid.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StCentroid.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StContains.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StContains.php
index 208b45b6..1c87e896 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StContains.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StContains.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StConvexHull.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StConvexHull.php
index d41c0a00..a37fdd80 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StConvexHull.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StConvexHull.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StCrosses.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StCrosses.php
index 4d176970..e7f4dc80 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StCrosses.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StCrosses.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDifference.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDifference.php
index c48bbd2d..b0380bd4 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDifference.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDifference.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDimension.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDimension.php
index 42335e50..987a327c 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDimension.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDimension.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDisjoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDisjoint.php
index 54357c16..102b5365 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDisjoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDisjoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDistance.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDistance.php
index 825ccd69..65cfbbdc 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDistance.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StDistance.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEndPoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEndPoint.php
index 57ce940f..d0044e15 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEndPoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEndPoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEnvelope.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEnvelope.php
index 8b24c612..2554c09d 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEnvelope.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEnvelope.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEquals.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEquals.php
index 9888fc87..a6f4f621 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEquals.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StEquals.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StExteriorRing.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StExteriorRing.php
index 9ef38859..aa15832a 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StExteriorRing.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StExteriorRing.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeomFromText.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeomFromText.php
index 1984834a..7b04c002 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeomFromText.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeomFromText.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeomFromWkb.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeomFromWkb.php
index 99750b7b..1b2efd1e 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeomFromWkb.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeomFromWkb.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeometryN.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeometryN.php
index 4a3a32b3..aaa1e3a0 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeometryN.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeometryN.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeometryType.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeometryType.php
index b8ad31c9..8980e255 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeometryType.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StGeometryType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StInteriorRingN.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StInteriorRingN.php
index 6c0f0096..2d66ed56 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StInteriorRingN.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StInteriorRingN.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIntersection.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIntersection.php
index 48cc820d..5909fddd 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIntersection.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIntersection.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIntersects.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIntersects.php
index 4ddd656a..f7348556 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIntersects.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIntersects.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsClosed.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsClosed.php
index d7dda521..50319799 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsClosed.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsClosed.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsEmpty.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsEmpty.php
index f4071d9a..b0d6f12b 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsEmpty.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsEmpty.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsRing.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsRing.php
index 122a998f..eb72a1a6 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsRing.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsRing.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsSimple.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsSimple.php
index 04414fcb..8341c0f3 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsSimple.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StIsSimple.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StLength.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StLength.php
index 0660afa9..35787d5f 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StLength.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StLength.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StLineStringFromWkb.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StLineStringFromWkb.php
index 6595ef4b..a3d5b681 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StLineStringFromWkb.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StLineStringFromWkb.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMLineFromWkb.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMLineFromWkb.php
index 6e5bbff5..d5a88929 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMLineFromWkb.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMLineFromWkb.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMPointFromWkb.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMPointFromWkb.php
index 10dbdb4e..76c63e83 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMPointFromWkb.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMPointFromWkb.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMPolyFromWkb.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMPolyFromWkb.php
index 8022b6a5..ab227b17 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMPolyFromWkb.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StMPolyFromWkb.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumGeometries.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumGeometries.php
index 4744e664..28b39a78 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumGeometries.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumGeometries.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumInteriorRing.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumInteriorRing.php
index a33dbbe0..557cb521 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumInteriorRing.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumInteriorRing.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumPoints.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumPoints.php
index 4d095f85..cc1cc90a 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumPoints.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StNumPoints.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StOverlaps.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StOverlaps.php
index 838d678c..0a4fba5c 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StOverlaps.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StOverlaps.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPerimeter.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPerimeter.php
index b5120795..6da3bcbf 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPerimeter.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPerimeter.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPoint.php
index 6402a453..c7b841fd 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointFromWkb.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointFromWkb.php
index fe1ce287..f6c864b1 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointFromWkb.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointFromWkb.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointN.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointN.php
index 71d4ac56..b56b9049 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointN.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointN.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointOnSurface.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointOnSurface.php
index 27a2f698..b2163f51 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointOnSurface.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPointOnSurface.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPolyFromWkb.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPolyFromWkb.php
index 61d4a505..ae338882 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPolyFromWkb.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StPolyFromWkb.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StRelate.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StRelate.php
index 71c86430..0e49674c 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StRelate.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StRelate.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSetSRID.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSetSRID.php
index e10e7d40..2523b5ca 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSetSRID.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSetSRID.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSrid.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSrid.php
index 1eaf878d..80713c17 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSrid.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSrid.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StStartPoint.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StStartPoint.php
index 2eff26b6..9095b6f5 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StStartPoint.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StStartPoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSymDifference.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSymDifference.php
index 1e360662..1251faac 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSymDifference.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StSymDifference.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StTouches.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StTouches.php
index 7d0866e6..17059cb8 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StTouches.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StTouches.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StUnion.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StUnion.php
index 0cf919ea..795b03f2 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StUnion.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StUnion.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StWithin.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StWithin.php
index 20a7a269..96f033b6 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StWithin.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StWithin.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StX.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StX.php
index 5e693455..20d6edea 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StX.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StX.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StY.php b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StY.php
index cbe76a67..53a43e71 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StY.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/AST/Functions/Standard/StY.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/ORM/Query/GeometryWalker.php b/lib/LongitudeOne/Spatial/ORM/Query/GeometryWalker.php
index bab2aea4..83d57d0f 100644
--- a/lib/LongitudeOne/Spatial/ORM/Query/GeometryWalker.php
+++ b/lib/LongitudeOne/Spatial/ORM/Query/GeometryWalker.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -59,9 +59,9 @@ public function __construct($query, $parserResult, array $queryComponents)
      *
      * @param SelectExpression $selectExpression Select expression AST node
      *
-     * @throws QueryException when error happend during walking into select expression
-     *
      * @return string the SQL
+     *
+     * @throws QueryException when error happend during walking into select expression
      */
     public function walkSelectExpression($selectExpression)
     {
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/AbstractGeometry.php b/lib/LongitudeOne/Spatial/PHP/Types/AbstractGeometry.php
index e2e5126c..1f03670c 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/AbstractGeometry.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/AbstractGeometry.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -25,7 +25,7 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  */
-abstract class AbstractGeometry implements GeometryInterface, JsonSerializable
+abstract class AbstractGeometry implements \JsonSerializable, GeometryInterface
 {
     /**
      * Spatial Reference System Identifier.
@@ -112,9 +112,9 @@ protected function getNamespace()
      *
      * @param AbstractLineString|AbstractPoint[]|array[] $lineString line string to validate
      *
-     * @throws InvalidValueException when a point of line string is not valid
-     *
      * @return array[]
+     *
+     * @throws InvalidValueException when a point of line string is not valid
      */
     protected function validateLineStringValue($lineString)
     {
@@ -126,9 +126,9 @@ protected function validateLineStringValue($lineString)
      *
      * @param AbstractLineString[] $lineStrings the array of line strings to validate
      *
-     * @throws InvalidValueException as soon as a point of a line string is not valid
-     *
      * @return array
+     *
+     * @throws InvalidValueException as soon as a point of a line string is not valid
      */
     protected function validateMultiLineStringValue(array $lineStrings)
     {
@@ -144,9 +144,9 @@ protected function validateMultiLineStringValue(array $lineStrings)
      *
      * @param AbstractLineString|AbstractPoint[]|array[] $points array of geometric data to validate
      *
-     * @throws InvalidValueException when one point is not valid
-     *
      * @return array[]
+     *
+     * @throws InvalidValueException when one point is not valid
      */
     protected function validateMultiPointValue($points)
     {
@@ -166,9 +166,9 @@ protected function validateMultiPointValue($points)
      *
      * @param AbstractPolygon[] $polygons the array of polygons to validate
      *
-     * @throws InvalidValueException when one polygon is not valid
-     *
      * @return array the validated polygons
+     *
+     * @throws InvalidValueException when one polygon is not valid
      */
     protected function validateMultiPolygonValue(array $polygons)
     {
@@ -187,9 +187,9 @@ protected function validateMultiPolygonValue(array $polygons)
      *
      * @param AbstractPoint|array $point the geometric point(s) to validate
      *
-     * @throws InvalidValueException as soon as one point is not valid
-     *
      * @return array
+     *
+     * @throws InvalidValueException as soon as one point is not valid
      */
     protected function validatePointValue($point)
     {
@@ -202,7 +202,7 @@ protected function validatePointValue($point)
                 throw new InvalidValueException(sprintf(
                     'Invalid %s Point value of type "%s"',
                     $this->getType(),
-                    (is_object($point) ? get_class($point) : gettype($point))
+                    is_object($point) ? get_class($point) : gettype($point)
                 ));
         }
     }
@@ -212,9 +212,9 @@ protected function validatePointValue($point)
      *
      * @param AbstractLineString[] $rings the array of rings
      *
-     * @throws InvalidValueException when ring is not valid
-     *
      * @return array the validated rings
+     *
+     * @throws InvalidValueException when ring is not valid
      */
     protected function validatePolygonValue(array $rings)
     {
@@ -230,9 +230,9 @@ protected function validatePolygonValue(array $rings)
      *
      * @param AbstractLineString|array[] $ring the ring or a ring converted to array
      *
-     * @throws InvalidValueException when the ring is not an abstract line string or is not closed
-     *
      * @return array[] the validate ring
+     *
+     * @throws InvalidValueException when the ring is not an abstract line string or is not closed
      */
     protected function validateRingValue($ring)
     {
@@ -246,7 +246,7 @@ protected function validateRingValue($ring)
                 throw new InvalidValueException(sprintf(
                     'Invalid %s LineString value of type "%s"',
                     $this->getType(),
-                    (is_object($ring) ? get_class($ring) : gettype($ring))
+                    is_object($ring) ? get_class($ring) : gettype($ring)
                 ));
         }
 
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/AbstractLineString.php b/lib/LongitudeOne/Spatial/PHP/Types/AbstractLineString.php
index ff6a09cd..27111810 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/AbstractLineString.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/AbstractLineString.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiLineString.php b/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiLineString.php
index 4760c36f..2d748e0f 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiLineString.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiLineString.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -52,9 +52,9 @@ public function __construct(array $rings, $srid = null)
      *
      * @param AbstractLineString|array[] $lineString the line string to add to Geometry
      *
-     * @throws InvalidValueException when linestring is not valid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when linestring is not valid
      */
     public function addLineString($lineString)
     {
@@ -112,9 +112,9 @@ public function getType()
      *
      * @param AbstractLineString[] $lineStrings array of LineString
      *
-     * @throws InvalidValueException when a linestring is not valid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when a linestring is not valid
      */
     public function setLineStrings(array $lineStrings)
     {
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiPoint.php b/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiPoint.php
index 3bde03b2..96fc29c8 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiPoint.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiPoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -50,9 +50,9 @@ public function __construct(array $points, $srid = null)
      *
      * @param AbstractPoint|array $point Point to add to geometry
      *
-     * @throws InvalidValueException when the point is not valid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when the point is not valid
      */
     public function addPoint($point)
     {
@@ -115,9 +115,9 @@ public function getType()
      *
      * @param AbstractPoint[]|array[] $points the points
      *
-     * @throws InvalidValueException when a point is invalid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when a point is invalid
      */
     public function setPoints($points)
     {
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiPolygon.php b/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiPolygon.php
index 16248caa..aea12dd9 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiPolygon.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/AbstractMultiPolygon.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -77,7 +77,7 @@ public function addPolygon($polygon): self
      */
     public function getPolygon(int $index): AbstractPolygon
     {
-        //TODO replace by a function to be compliant with -1, -2, etc.
+        // TODO replace by a function to be compliant with -1, -2, etc.
         if (-1 == $index) {
             $index = count($this->polygons) - 1;
         }
@@ -118,9 +118,9 @@ public function getType()
      *
      * @param AbstractPolygon[] $polygons polygons to set
      *
-     * @throws InvalidValueException when a polygon is invalid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when a polygon is invalid
      */
     public function setPolygons(array $polygons)
     {
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/AbstractPoint.php b/lib/LongitudeOne/Spatial/PHP/Types/AbstractPoint.php
index 28ab438d..34f294c9 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/AbstractPoint.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/AbstractPoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -112,9 +112,9 @@ public function getY()
      *
      * @param mixed $latitude the new latitude of point
      *
-     * @throws InvalidValueException when latitude is not valid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when latitude is not valid
      */
     public function setLatitude($latitude)
     {
@@ -126,9 +126,9 @@ public function setLatitude($latitude)
      *
      * @param mixed $longitude the new longitude
      *
-     * @throws InvalidValueException when longitude is not valid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when longitude is not valid
      */
     public function setLongitude($longitude)
     {
@@ -140,9 +140,9 @@ public function setLongitude($longitude)
      *
      * @param mixed $x the new X
      *
-     * @throws InvalidValueException when x is not valid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when x is not valid
      */
     public function setX($x)
     {
@@ -162,9 +162,9 @@ public function setX($x)
      *
      * @param mixed $y the new Y value
      *
-     * @throws InvalidValueException when Y is invalid, not in valid range
-     *
      * @return self
+     *
+     * @throws InvalidValueException when Y is invalid, not in valid range
      */
     public function setY($y)
     {
@@ -212,9 +212,9 @@ protected function construct($x, $y, $srid = null)
      *
      * @param ?array $argv list of arguments
      *
-     * @throws InvalidValueException when an argument is not valid
-     *
      * @return array
+     *
+     * @throws InvalidValueException when an argument is not valid
      */
     protected function validateArguments(array $argv = null)
     {
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/AbstractPolygon.php b/lib/LongitudeOne/Spatial/PHP/Types/AbstractPolygon.php
index 46995160..5b88b2ac 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/AbstractPolygon.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/AbstractPolygon.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -52,9 +52,9 @@ public function __construct(array $rings, $srid = null)
      *
      * @param AbstractLineString|array[] $ring Ring to add to geometry
      *
-     * @throws InvalidValueException when a ring is invalid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when a ring is invalid
      */
     public function addRing($ring)
     {
@@ -115,9 +115,9 @@ public function getType()
      *
      * @param AbstractLineString[] $rings Rings to set
      *
-     * @throws InvalidValueException when a ring is invalid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when a ring is invalid
      */
     public function setRings(array $rings)
     {
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geography/GeographyInterface.php b/lib/LongitudeOne/Spatial/PHP/Types/Geography/GeographyInterface.php
index feb6562b..0770193b 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geography/GeographyInterface.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geography/GeographyInterface.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geography/LineString.php b/lib/LongitudeOne/Spatial/PHP/Types/Geography/LineString.php
index 1d1db271..9ea3c6eb 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geography/LineString.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geography/LineString.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geography/Point.php b/lib/LongitudeOne/Spatial/PHP/Types/Geography/Point.php
index d03ec22f..b0385109 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geography/Point.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geography/Point.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -34,9 +34,9 @@ class Point extends AbstractPoint implements GeographyInterface
      *
      * @param mixed $x X coordinate
      *
-     * @throws InvalidValueException when y is not in range of accepted value, or is totally invalid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when y is not in range of accepted value, or is totally invalid
      */
     public function setX($x)
     {
@@ -62,9 +62,9 @@ public function setX($x)
      *
      * @param mixed $y the Y coordinate
      *
-     * @throws InvalidValueException when y is not in range of accepted value, or is totally invalid
-     *
      * @return self
+     *
+     * @throws InvalidValueException when y is not in range of accepted value, or is totally invalid
      */
     public function setY($y)
     {
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geography/Polygon.php b/lib/LongitudeOne/Spatial/PHP/Types/Geography/Polygon.php
index 6feb9c17..ece12287 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geography/Polygon.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geography/Polygon.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/GeometryInterface.php b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/GeometryInterface.php
index f4bbf24b..1cab3321 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/GeometryInterface.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/GeometryInterface.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/LineString.php b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/LineString.php
index cb8b0b7b..45741e96 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/LineString.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/LineString.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiLineString.php b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiLineString.php
index 36011add..4a7c336e 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiLineString.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiLineString.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiPoint.php b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiPoint.php
index d3ccee3c..53e51aa8 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiPoint.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiPoint.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiPolygon.php b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiPolygon.php
index f433170e..95e5b9ca 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiPolygon.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/MultiPolygon.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/Point.php b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/Point.php
index decf510d..21369c73 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/Point.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/Point.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/Polygon.php b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/Polygon.php
index 3235ee60..7bf549b8 100644
--- a/lib/LongitudeOne/Spatial/PHP/Types/Geometry/Polygon.php
+++ b/lib/LongitudeOne/Spatial/PHP/Types/Geometry/Polygon.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Platform/PlatformTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Platform/PlatformTest.php
index 9bb43115..c063d2b1 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Platform/PlatformTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Platform/PlatformTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -21,6 +21,7 @@
 use Doctrine\ORM\Exception\ORMException;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\ORM\Tools\ToolsException;
+use LongitudeOne\Spatial\DBAL\Types\Geometry\PointType;
 use LongitudeOne\Spatial\Exception\UnsupportedPlatformException;
 use LongitudeOne\Spatial\Tests\OrmMockTestCase;
 
@@ -50,7 +51,7 @@ public function setUp(): void
         BypassFinals::enable();
 
         if (!Type::hasType('point')) {
-            Type::addType('point', 'LongitudeOne\Spatial\DBAL\Types\Geometry\PointType');
+            Type::addType('point', PointType::class);
         }
 
         parent::setUp();
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geography/GeoPointSridTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geography/GeoPointSridTest.php
index 97f68ab4..28516175 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geography/GeoPointSridTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geography/GeoPointSridTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @group srid
  *
  * @internal
+ *
  * @coversDefaultClass \LongitudeOne\Spatial\DBAL\Types\Geography\PointType
  */
 class GeoPointSridTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geography/GeoPolygonTypeTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geography/GeoPolygonTypeTest.php
index 83663a6e..33138c67 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geography/GeoPolygonTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geography/GeoPolygonTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -32,6 +32,7 @@
  * @group geography
  *
  * @internal
+ *
  * @coversDefaultClass \LongitudeOne\Spatial\DBAL\Types\Geography\PolygonType
  */
 class GeoPolygonTypeTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/GeographyTypeTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/GeographyTypeTest.php
index 780142e2..e1644413 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/GeographyTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/GeographyTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group geography
  *
  * @internal
+ *
  * @coversDefaultClass \LongitudeOne\Spatial\DBAL\Types\GeographyType
  */
 class GeographyTypeTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/LineStringTypeTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/LineStringTypeTest.php
index 9e6401cc..e4f335cc 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/LineStringTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/LineStringTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @group geometry
  *
  * @internal
+ *
  * @coversDefaultClass \LongitudeOne\Spatial\DBAL\Types\Geometry\LineStringType
  */
 class LineStringTypeTest extends OrmTestCase
@@ -95,5 +96,5 @@ public function testNullLineStringType()
         static::assertIsRetrievableById($this->getEntityManager(), $entity);
     }
 
-    //TODO test to find all null linestring
+    // TODO test to find all null linestring
 }
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/MultiPolygonTypeTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/MultiPolygonTypeTest.php
index 6f929635..7887bde4 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/MultiPolygonTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/MultiPolygonTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -33,6 +33,7 @@
  * @group geometry
  *
  * @internal
+ *
  * @coversDefaultClass \LongitudeOne\Spatial\DBAL\Types\Geometry\MultiPolygonType
  */
 class MultiPolygonTypeTest extends OrmTestCase
@@ -105,5 +106,5 @@ public function testNullMultiPolygon()
         static::assertIsRetrievableById($this->getEntityManager(), $entity);
     }
 
-    //TODO Try to find a null multiploygon
+    // TODO Try to find a null multiploygon
 }
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/PointTypeTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/PointTypeTest.php
index 648b950b..063f660a 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/PointTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/PointTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group geometry
  *
  * @internal
+ *
  * @coversDefaultClass \LongitudeOne\Spatial\DBAL\Types\Geometry\PointType
  */
 class PointTypeTest extends OrmTestCase
@@ -80,5 +81,5 @@ public function testPoint()
         static::assertIsRetrievableById($this->getEntityManager(), $entity);
     }
 
-    //TODO test to find a null geometry
+    // TODO test to find a null geometry
 }
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/PolygonTypeTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/PolygonTypeTest.php
index 2be5dcfa..87eae01b 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/PolygonTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/Geometry/PolygonTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group geometry
  *
  * @internal
+ *
  * @coversDefaultClass \LongitudeOne\Spatial\DBAL\Types\Geometry\PolygonType
  */
 class PolygonTypeTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/GeometryTypeTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/GeometryTypeTest.php
index 8f74b463..0033ff22 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/GeometryTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/GeometryTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -35,6 +35,7 @@
  * @group geometry
  *
  * @internal
+ *
  * @coversDefaultClass \LongitudeOne\Spatial\DBAL\Types\GeometryType
  */
 class GeometryTypeTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/SchemaTest.php b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/SchemaTest.php
index b1c414ae..70c8bc73 100644
--- a/tests/LongitudeOne/Spatial/Tests/DBAL/Types/SchemaTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/DBAL/Types/SchemaTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @license https://dlambert.mit-license.org MIT
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SchemaTest extends OrmTestCase
@@ -43,7 +44,7 @@ protected function setUp(): void
         $this->usesEntity(self::MULTIPOINT_ENTITY);
         $this->usesEntity(self::MULTIPOLYGON_ENTITY);
 
-        //TODO : Verify what MySQL can do with geography
+        // TODO : Verify what MySQL can do with geography
         if ('postgresql' === $this->getPlatform()->getName()) {
             $this->usesEntity(self::GEOGRAPHY_ENTITY);
             $this->usesEntity(self::GEO_POINT_SRID_ENTITY);
diff --git a/tests/LongitudeOne/Spatial/Tests/FileSQLLogger.php b/tests/LongitudeOne/Spatial/Tests/FileSQLLogger.php
index 1b0a2ee2..2aa68d43 100644
--- a/tests/LongitudeOne/Spatial/Tests/FileSQLLogger.php
+++ b/tests/LongitudeOne/Spatial/Tests/FileSQLLogger.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoLineStringEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoLineStringEntity.php
index 6ea31f4f..4efe78cb 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoLineStringEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoLineStringEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class GeoLineStringEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var LineString
-     *
-     * @Column(type="geolinestring", nullable=true)
      */
+    #[Column(type: 'geolinestring', nullable: true)]
     protected $lineString;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoPointSridEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoPointSridEntity.php
index b1b61220..24d8429f 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoPointSridEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoPointSridEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,26 +27,23 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- *
  * @internal
  */
+#[Entity]
 class GeoPointSridEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var Point
-     *
-     * @Column(type="geopoint", nullable=true, options={"srid": "4326"})
      */
+    #[Column(type: 'geopoint', nullable: true, options: ['srid' => 4326])]
     protected $point;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoPolygonEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoPolygonEntity.php
index cfb72529..eccebe40 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoPolygonEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeoPolygonEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class GeoPolygonEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var Polygon
-     *
-     * @Column(type="geopolygon", nullable=true)
      */
+    #[Column(type: 'geopolygon', nullable: true)]
     protected $polygon;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeographyEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeographyEntity.php
index b580e4f7..a2371751 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeographyEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeographyEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,26 +27,23 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- *
  * @internal
  */
+#[Entity]
 class GeographyEntity
 {
     /**
      * @var GeographyInterface
-     *
-     * @Column(type="geography", nullable=true)
      */
+    #[Column(type: 'geography', nullable: true)]
     protected $geography;
 
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeometryEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeometryEntity.php
index c0e50b34..3c3c9ec0 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/GeometryEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/GeometryEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class GeometryEntity
 {
     /**
      * @var GeometryInterface
-     *
-     * @Column(type="geometry", nullable=true)
      */
+    #[Column(type: 'geometry', nullable: true)]
     protected $geometry;
 
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/LineStringEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/LineStringEntity.php
index a6caef6e..a059304c 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/LineStringEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/LineStringEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class LineStringEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var LineString
-     *
-     * @Column(type="linestring", nullable=true)
      */
+    #[Column(type: 'linestring', nullable: true)]
     protected $lineString;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiLineStringEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiLineStringEntity.php
index 02220234..fb51a0d8 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiLineStringEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiLineStringEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Alexandre Tranchant <alexandre.tranchant@gmail.com>
  * @license https://alexandre-tranchant.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class MultiLineStringEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var MultiLineString
-     *
-     * @Column(type="multilinestring", nullable=true)
      */
+    #[Column(type: 'multilinestring', nullable: true)]
     protected $multiLineString;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiPointEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiPointEntity.php
index 85c968e3..44fce9aa 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiPointEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiPointEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Alexandre Tranchant <alexandre.tranchant@gmail.com>
  * @license https://alexandre-tranchant.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class MultiPointEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var MultiPoint
-     *
-     * @Column(type="multipoint", nullable=true)
      */
+    #[Column(type: 'multipoint', nullable: true)]
     protected $multiPoint;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiPolygonEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiPolygonEntity.php
index 53d48a92..314be1eb 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiPolygonEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/MultiPolygonEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class MultiPolygonEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var MultiPolygon
-     *
-     * @Column(type="multipolygon", nullable=true)
      */
+    #[Column(type: 'multipolygon', nullable: true)]
     protected $multiPolygon;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/NoHintGeometryEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/NoHintGeometryEntity.php
index d4b10aa2..802f476c 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/NoHintGeometryEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/NoHintGeometryEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,27 +27,24 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class NoHintGeometryEntity
 {
     /**
      * @var mixed
-     *
-     * @Column(type="geometry", nullable=true)
      */
+    #[Column(type: 'geometry', nullable: true)]
     protected $geometry;
 
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/PointEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/PointEntity.php
index c1d65ad7..04cf8e91 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/PointEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/PointEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class PointEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var Point
-     *
-     * @Column(type="point", nullable=true)
      */
+    #[Column(type: 'point', nullable: true)]
     protected $point;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Fixtures/PolygonEntity.php b/tests/LongitudeOne/Spatial/Tests/Fixtures/PolygonEntity.php
index 161fde58..9aa41d59 100644
--- a/tests/LongitudeOne/Spatial/Tests/Fixtures/PolygonEntity.php
+++ b/tests/LongitudeOne/Spatial/Tests/Fixtures/PolygonEntity.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,27 +28,24 @@
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license https://dlambert.mit-license.org MIT
  *
- * @Entity
- * @Table
- *
  * @internal
  */
+#[Table]
+#[Entity]
 class PolygonEntity
 {
     /**
      * @var int
-     *
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     * @Column(type="integer")
      */
+    #[Id]
+    #[GeneratedValue(strategy: 'AUTO')]
+    #[Column(type: 'integer')]
     protected $id;
 
     /**
      * @var Polygon
-     *
-     * @Column(type="polygon", nullable=true)
      */
+    #[Column(type: 'polygon', nullable: true)]
     protected $polygon;
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/Helper/GeometryHelperTrait.php b/tests/LongitudeOne/Spatial/Tests/Helper/GeometryHelperTrait.php
index 90efe09d..c6ee511d 100644
--- a/tests/LongitudeOne/Spatial/Tests/Helper/GeometryHelperTrait.php
+++ b/tests/LongitudeOne/Spatial/Tests/Helper/GeometryHelperTrait.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/tests/LongitudeOne/Spatial/Tests/Helper/LineStringHelperTrait.php b/tests/LongitudeOne/Spatial/Tests/Helper/LineStringHelperTrait.php
index daed2ede..12c6a347 100644
--- a/tests/LongitudeOne/Spatial/Tests/Helper/LineStringHelperTrait.php
+++ b/tests/LongitudeOne/Spatial/Tests/Helper/LineStringHelperTrait.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/tests/LongitudeOne/Spatial/Tests/Helper/MultiPointHelperTrait.php b/tests/LongitudeOne/Spatial/Tests/Helper/MultiPointHelperTrait.php
index af9f5587..29b000f1 100644
--- a/tests/LongitudeOne/Spatial/Tests/Helper/MultiPointHelperTrait.php
+++ b/tests/LongitudeOne/Spatial/Tests/Helper/MultiPointHelperTrait.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/tests/LongitudeOne/Spatial/Tests/Helper/PersistHelperTrait.php b/tests/LongitudeOne/Spatial/Tests/Helper/PersistHelperTrait.php
index 5f7c2f66..17aba47f 100644
--- a/tests/LongitudeOne/Spatial/Tests/Helper/PersistHelperTrait.php
+++ b/tests/LongitudeOne/Spatial/Tests/Helper/PersistHelperTrait.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/tests/LongitudeOne/Spatial/Tests/Helper/PointHelperTrait.php b/tests/LongitudeOne/Spatial/Tests/Helper/PointHelperTrait.php
index be9a5d42..687d4238 100644
--- a/tests/LongitudeOne/Spatial/Tests/Helper/PointHelperTrait.php
+++ b/tests/LongitudeOne/Spatial/Tests/Helper/PointHelperTrait.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/tests/LongitudeOne/Spatial/Tests/Helper/PolygonHelperTrait.php b/tests/LongitudeOne/Spatial/Tests/Helper/PolygonHelperTrait.php
index d1d0b968..6f4c4680 100644
--- a/tests/LongitudeOne/Spatial/Tests/Helper/PolygonHelperTrait.php
+++ b/tests/LongitudeOne/Spatial/Tests/Helper/PolygonHelperTrait.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpBufferTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpBufferTest.php
index 618bae47..04b4bd06 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpBufferTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpBufferTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -30,6 +30,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpBufferTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpDistanceTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpDistanceTest.php
index 711a4562..086766ce 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpDistanceTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpDistanceTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -30,6 +30,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpDistanceTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpGeometryTypeTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpGeometryTypeTest.php
index 724d58b5..17c3dd31 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpGeometryTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpGeometryTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpGeometryTypeTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpLineStringTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpLineStringTest.php
index 10f2e98e..1595cbfc 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpLineStringTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpLineStringTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpLineStringTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrContainsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrContainsTest.php
index 70810a54..0dd7515f 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrContainsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrContainsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMbrContainsTest extends OrmTestCase
@@ -100,9 +101,9 @@ public function testSelectContains()
         $this->getEntityManager()->clear();
 
         $query = $this->getEntityManager()->createQuery(
-        // phpcs:disable Generic.Files.LineLength.MaxExceeded
+            // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT p, MySql_MBRContains(p.polygon, ST_GeomFromText(:p1)), MySql_MBRContains(p.polygon, ST_GeomFromText(:p2)) FROM LongitudeOne\Spatial\Tests\Fixtures\PolygonEntity p'
-        // phpcs:enable
+            // phpcs:enable
         );
 
         $query->setParameter('p1', 'POINT(2 2)', 'string');
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrDisjointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrDisjointTest.php
index b07e5d15..8edad998 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrDisjointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrDisjointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMbrDisjointTest extends OrmTestCase
@@ -60,9 +61,9 @@ public function testMbrDisjointWhereParameter()
         $this->getEntityManager()->clear();
 
         $query = $this->getEntityManager()->createQuery(
-        // phpcs:disable Generic.Files.LineLength.MaxExceeded
+            // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT p FROM LongitudeOne\Spatial\Tests\Fixtures\PolygonEntity p WHERE MySql_MBRDisjoint(p.polygon, ST_GeomFromText(:p)) = 1'
-        // phpcs:enable
+            // phpcs:enable
         );
 
         $query->setParameter('p', 'POLYGON((5 5,7 5,7 7,5 7,5 5))', 'string');
@@ -74,9 +75,9 @@ public function testMbrDisjointWhereParameter()
         $this->getEntityManager()->clear();
 
         $query = $this->getEntityManager()->createQuery(
-        // phpcs:disable Generic.Files.LineLength.MaxExceeded
+            // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT p FROM LongitudeOne\Spatial\Tests\Fixtures\PolygonEntity p WHERE MySql_MBRDisjoint(p.polygon, ST_GeomFromText(:p)) = 1'
-        // phpcs:enable
+            // phpcs:enable
         );
 
         $query->setParameter('p', 'POLYGON((15 15,17 15,17 17,15 17,15 15))', 'string');
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrEqualsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrEqualsTest.php
index 9571300f..b49ed006 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrEqualsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrEqualsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMbrEqualsTest extends OrmTestCase
@@ -59,9 +60,9 @@ public function testMbrEqualsWhereParameter()
         $this->getEntityManager()->clear();
 
         $query = $this->getEntityManager()->createQuery(
-        // phpcs:disable Generic.Files.LineLength.MaxExceeded
+            // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT p FROM LongitudeOne\Spatial\Tests\Fixtures\PolygonEntity p WHERE MySql_MBREquals(p.polygon, ST_GeomFromText(:p)) = 1'
-        // phpcs:enable
+            // phpcs:enable
         );
 
         $query->setParameter('p', 'LINESTRING(5 5,7 7,6 5)', 'string');
@@ -73,9 +74,9 @@ public function testMbrEqualsWhereParameter()
         $this->getEntityManager()->clear();
 
         $query = $this->getEntityManager()->createQuery(
-        // phpcs:disable Generic.Files.LineLength.MaxExceeded
+            // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT p FROM LongitudeOne\Spatial\Tests\Fixtures\PolygonEntity p WHERE MySql_MBREquals(p.polygon, ST_GeomFromText(:p)) = 1'
-        // phpcs:enable
+            // phpcs:enable
         );
 
         $query->setParameter('p', 'LINESTRING(15 15,17 17)', 'string');
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrIntersectsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrIntersectsTest.php
index 08db3990..ddf3ea72 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrIntersectsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrIntersectsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMbrIntersectsTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrOverlapsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrOverlapsTest.php
index 99b23cd5..1ff1d151 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrOverlapsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrOverlapsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMbrOverlapsTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrTouchesTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrTouchesTest.php
index d6a2e7a6..37d9feb1 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrTouchesTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrTouchesTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMbrTouchesTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrWithinTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrWithinTest.php
index 82d81e36..9ae08560 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrWithinTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpMbrWithinTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMbrWithinTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpPointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpPointTest.php
index c8b59db1..f0a936cb 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpPointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/MySql/SpPointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group mysql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpPointTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJsonTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJsonTest.php
index e716c5c1..7a0d7da1 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJsonTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpAsGeoJsonTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpAsGeoJsonTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpAzimuthTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpAzimuthTest.php
index 13832fb8..bdc78645 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpAzimuthTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpAzimuthTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpAzimuthTest extends OrmTestCase
@@ -69,7 +70,7 @@ public function testFunction()
         static::assertIsArray($result);
         static::assertCount(3, $result);
         static::assertEquals($pointA, $result[0][0]);
-        static::assertEquals(5.96143475278294, $result[0][1]);
+        static::assertEqualsWithDelta(5.96143475278294, $result[0][1], 0.000000000001);
         static::assertEquals($pointO, $result[1][0]);
         static::assertEquals(0, $result[1][1]);
         static::assertEquals($pointE, $result[2][0]);
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpClosestPointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpClosestPointTest.php
index 9bac6c9e..2dea2685 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpClosestPointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpClosestPointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -30,6 +30,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpClosestPointTest extends OrmTestCase
@@ -93,9 +94,9 @@ public function testFunctionWithPolygonInSelect()
         $this->getEntityManager()->clear();
 
         $query = $this->getEntityManager()->createQuery(
-        // phpcs:disable Generic.Files.LineLength.MaxExceeded
+            // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT p, ST_AsText(PgSql_ClosestPoint(p.polygon, ST_GeomFromText(:p1))) FROM LongitudeOne\Spatial\Tests\Fixtures\PolygonEntity p'
-        // phpcs:enable
+            // phpcs:enable
         );
 
         $query->setParameter('p1', 'POINT(2 2)', 'string');
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCollectTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCollectTest.php
index f29f1ab5..4dde3f52 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCollectTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCollectTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -34,6 +34,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpCollectTest extends OrmTestCase
@@ -77,7 +78,7 @@ public function testFunctionSelect()
         $result = $query->getResult();
 
         $expected = [
-            [1 => 'MULTIPOINT(1 2,-2 3)'],
+            [1 => 'MULTIPOINT((1 2),(-2 3))'],
         ];
 
         static::assertEquals($expected, $result);
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpContainsProperlyTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpContainsProperlyTest.php
index 94a705ab..66dcf0c0 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpContainsProperlyTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpContainsProperlyTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpContainsProperlyTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCoveredByTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCoveredByTest.php
index 54d399b7..a7dd2d31 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCoveredByTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCoveredByTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpCoveredByTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCoversTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCoversTest.php
index 98c33df9..e0870ab4 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCoversTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpCoversTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpCoversTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpDWithinTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpDWithinTest.php
index 7d807884..c5716f06 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpDWithinTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpDWithinTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpDWithinTest extends OrmTestCase
@@ -64,7 +65,7 @@ public function testSelectGeography()
         );
 
         $query->setParameter('p', 'POINT(-89.4 43.066667)', 'string');
-        $query->setParameter('d', 2000000.0); //2.000.000m=2.000km
+        $query->setParameter('d', 2000000.0); // 2.000.000m=2.000km
         $query->setParameter('spheroid', true, 'boolean');
 
         $result = $query->getResult();
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpDistanceSphereTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpDistanceSphereTest.php
index b386df68..b4e77ce0 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpDistanceSphereTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpDistanceSphereTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpDistanceSphereTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpExpandTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpExpandTest.php
index 9a7cb71b..77e0f444 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpExpandTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpExpandTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpExpandTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeogFromTextTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeogFromTextTest.php
index 7ef62d9f..5e78531b 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeogFromTextTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeogFromTextTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpGeogFromTextTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeomFromEwktTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeomFromEwktTest.php
index eea821b4..1eaee2da 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeomFromEwktTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeomFromEwktTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpGeomFromEwktTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeometryTypeTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeometryTypeTest.php
index 54f179f0..d8a7925e 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeometryTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpGeometryTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -34,6 +34,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpGeometryTypeTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineCrossingDirectionTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineCrossingDirectionTest.php
index b5966ab2..0bbd2402 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineCrossingDirectionTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineCrossingDirectionTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpLineCrossingDirectionTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineInterpolatePointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineInterpolatePointTest.php
index 466eba8d..5fbf56a5 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineInterpolatePointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineInterpolatePointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpLineInterpolatePointTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineLocatePointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineLocatePointTest.php
index 7ad10058..8820c3b8 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineLocatePointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineLocatePointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpLineLocatePointTest extends OrmTestCase
@@ -98,6 +99,6 @@ public function testSelect()
 
         static::assertEquals(0.7, $result[0][1]);
         static::assertEquals(0.35, $result[1][1]);
-        static::assertEquals(0.4, $result[2][1]);
+        static::assertEqualsWithDelta(0.4, $result[2][1], 0.000000000001);
     }
 }
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineSubstringTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineSubstringTest.php
index 57418e39..d89ed9d2 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineSubstringTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpLineSubstringTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpLineSubstringTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeBox2dTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeBox2dTest.php
index 494508d8..36506d3d 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeBox2dTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeBox2dTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMakeBox2dTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeEnvelopeTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeEnvelopeTest.php
index 09e4e423..347acbcd 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeEnvelopeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeEnvelopeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMakeEnvelopeTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeLineTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeLineTest.php
index 3b7e7715..5c56342c 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeLineTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakeLineTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMakeLineTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakePointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakePointTest.php
index 2445d5cd..6f35b2d8 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakePointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpMakePointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpMakePointTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpScaleTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpScaleTest.php
index f99c7d7f..e39b5a5e 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpScaleTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpScaleTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpScaleTest extends OrmTestCase
@@ -65,9 +66,9 @@ public function testFunctionInSelect()
         );
         $query->setParameter('x', 2);
         $query->setParameter('y', 4);
-        //TODO Try to solve this issue on Travis Linux
-        //SQLSTATE[XX000]: Internal error: 7 ERROR:  parse error - invalid geometry
-        //HINT:  "2" <-- parse error at position 2 within geometry
+        // TODO Try to solve this issue on Travis Linux
+        // SQLSTATE[XX000]: Internal error: 7 ERROR:  parse error - invalid geometry
+        // HINT:  "2" <-- parse error at position 2 within geometry
         static::markTestSkipped('On Linux env only, Postgis throw an internal error');
         $result = $query->getResult();
 
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSimplifyTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSimplifyTest.php
index 219e730e..e5dfa1df 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSimplifyTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSimplifyTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpSimplifyTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSnapToGridTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSnapToGridTest.php
index 56d145eb..eada49ba 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSnapToGridTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSnapToGridTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpSnapToGridTest extends OrmTestCase
@@ -100,9 +101,9 @@ public function testSelectStSnapToGridSignature5Parameters()
         $this->persistGeometryPoint('in grid', 5.25, 6.55);
 
         $query = $this->getEntityManager()->createQuery(
-        // phpcs:disable Generic.Files.LineLength.MaxExceeded
+            // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT ST_AsText(PgSql_SnapToGrid(p.point, 5.55, 6.25, 0.5, 0.5)) FROM LongitudeOne\Spatial\Tests\Fixtures\PointEntity p'
-        // phpcs:enable
+            // phpcs:enable
         );
         $result = $query->getResult();
 
@@ -123,9 +124,9 @@ public function testSelectStSnapToGridSignature6Parameters()
         $this->persistGeometryPoint('in grid', 5.25, 6.55);
 
         $query = $this->getEntityManager()->createQuery(
-        // phpcs:disable Generic.Files.LineLength.MaxExceeded
+            // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT ST_AsText(PgSql_SnapToGrid(p.point, p.point, 0.005, 0.025, 0.5, 0.01)) FROM LongitudeOne\Spatial\Tests\Fixtures\PointEntity p'
-        // phpcs:enable
+            // phpcs:enable
         );
         $result = $query->getResult();
 
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSplitTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSplitTest.php
index 1c46cc4c..28fa7b77 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSplitTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSplitTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpSplitTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSummaryTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSummaryTest.php
index 998afc60..134cdcdc 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSummaryTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpSummaryTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -40,6 +40,7 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class SpSummaryTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpTransformTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpTransformTest.php
index 26369f27..be7c87f2 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpTransformTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpTransformTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,7 +28,9 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @transformDefaultClass
+ *
  * @coversNothing
  */
 class SpTransformTest extends OrmTestCase
@@ -106,7 +108,7 @@ public function testFunctionInSelectWithSrid()
         $this->getEntityManager()->flush();
         $this->getEntityManager()->clear();
 
-        //TODO The test above failed because DQL SRID is seen as a string
+        // TODO The test above failed because DQL SRID is seen as a string
         static::markTestSkipped('The test above failed because DQL SRID is seen as a string');
         $query = $this->getEntityManager()->createQuery(
             // phpcs:disable Generic.Files.LineLength.MaxExceeded
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpTranslateTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpTranslateTest.php
index 9fe00d4c..b0da4d76 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpTranslateTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/SpTranslateTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,7 +28,9 @@
  * @group pgsql-only
  *
  * @internal
+ *
  * @translateDefaultClass
+ *
  * @coversNothing
  */
 class SpTranslateTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/CoordinateTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/CoordinateTest.php
index 8d15c0ea..c1fffdd2 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/CoordinateTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/CoordinateTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class CoordinateTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAreaTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAreaTest.php
index 1647e23e..a855ced2 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAreaTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAreaTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StAreaTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAsBinaryTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAsBinaryTest.php
index 98dea957..6202c205 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAsBinaryTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAsBinaryTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StAsBinaryTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAsTextTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAsTextTest.php
index 7c35c742..82f8304a 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAsTextTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StAsTextTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StAsTextTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StBoundaryTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StBoundaryTest.php
index 42e03304..ab654325 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StBoundaryTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StBoundaryTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StBoundaryTest extends OrmTestCase
@@ -41,7 +42,7 @@ protected function setUp(): void
     {
         $this->usesEntity(self::LINESTRING_ENTITY);
         $this->supportsPlatform('postgresql');
-        //This function is not supported by mysql
+        // This function is not supported by mysql
 
         parent::setUp();
     }
@@ -67,8 +68,8 @@ public function testFunction()
         static::assertCount(2, $result);
         static::assertIsArray($result[0]);
         static::assertCount(1, $result[0]);
-        static::assertSame('MULTIPOINT(0 0,5 5)', $result[0][1]);
+        static::assertSame('MULTIPOINT((0 0),(5 5))', $result[0][1]);
         static::assertCount(1, $result[1]);
-        static::assertSame('MULTIPOINT(3 3,5 22)', $result[1][1]);
+        static::assertSame('MULTIPOINT((3 3),(5 22))', $result[1][1]);
     }
 }
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StBufferTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StBufferTest.php
index e8234638..c770cde2 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StBufferTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StBufferTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StBufferTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StCentroidTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StCentroidTest.php
index 1d8379f9..e66d7dee 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StCentroidTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StCentroidTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StCentroidTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StContainsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StContainsTest.php
index 9272ebee..d5b591c2 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StContainsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StContainsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StContainsTest extends OrmTestCase
@@ -117,7 +118,7 @@ public function testStContainsWhereParameter()
 
         switch ($this->getPlatform()->getName()) {
             case 'mysql':
-                //MySQL does not respect the initial polygon and reconstructs it in a bad (direction) way
+                // MySQL does not respect the initial polygon and reconstructs it in a bad (direction) way
                 break;
             case 'postgresql':
             default:
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StConvexHullTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StConvexHullTest.php
index 43528b16..2c04dba8 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StConvexHullTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StConvexHullTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StConvexHullTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StCrossesTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StCrossesTest.php
index 14ab471a..fcc4a436 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StCrossesTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StCrossesTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StCrossesTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDifferenceTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDifferenceTest.php
index 2134fa8e..4345125b 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDifferenceTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDifferenceTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StDifferenceTest extends OrmTestCase
@@ -74,12 +75,12 @@ public function testSelectStDifference()
         static::assertEquals($lineStringB, $result[1][0]);
         switch ($this->getPlatform()->getName()) {
             case 'mysql':
-                //MySQL failed ST_Difference implementation, so I test the bad result.
+                // MySQL failed ST_Difference implementation, so I test the bad result.
                 static::assertEquals('LINESTRING(0 0,12 12)', $result[1][1]);
                 break;
             case 'postgresl':
             default:
-                //Here is the good result.
+                // Here is the good result.
                 // A linestring minus another crossing linestring returns initial linestring splited
                 static::assertEquals('MULTILINESTRING((0 0,6 6),(6 6,12 12))', $result[1][1]);
         }
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDimensionTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDimensionTest.php
index 039a8ce5..452589bb 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDimensionTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDimensionTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StDimensionTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDisjointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDisjointTest.php
index 90a08e6b..307bec1b 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDisjointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDisjointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StDisjointTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDistanceTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDistanceTest.php
index ef54d844..3a8b9603 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDistanceTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StDistanceTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StDistanceTest extends OrmTestCase
@@ -71,7 +72,7 @@ public function testSelectStDistanceGeographyCartesian()
 
         $result = $query->getResult();
 
-        //TODO: Test should be fixed, distance are differents on Windows and on Linux.
+        // TODO: Test should be fixed, distance are differents on Windows and on Linux.
         static::assertCount(3, $result);
         static::assertEquals($newYork, $result[0][0]);
         static::assertGreaterThan(1309000, $result[0][1]);
@@ -97,7 +98,7 @@ public function testSelectStDistanceGeographySpheroid()
         $this->getEntityManager()->flush();
         $this->getEntityManager()->clear();
 
-        //TODO This test should be moved to a class implementing only PgSQL
+        // TODO This test should be moved to a class implementing only PgSQL
         $query = $this->getEntityManager()->createQuery(
             // phpcs:disable Generic.Files.LineLength.MaxExceeded
             'SELECT g, ST_Distance(g.geography, PgSql_GeographyFromText(:p1)) FROM LongitudeOne\Spatial\Tests\Fixtures\GeographyEntity g'
@@ -142,10 +143,10 @@ public function testSelectStDistanceGeometryCartesian()
 
         static::assertCount(3, $result);
         static::assertEquals($newYork, $result[0][0]);
-        static::assertEquals(15.646934398128, $result[0][1]);
+        static::assertEqualsWithDelta(15.646934398128, $result[0][1], 0.000000000001);
         static::assertEquals($losAngeles, $result[1][0]);
-        static::assertEquals(30.2188561049899, $result[1][1]);
+        static::assertEqualsWithDelta(30.2188561049899, $result[1][1], 0.000000000001);
         static::assertEquals($dallas, $result[2][0]);
-        static::assertEquals(12.6718564262953, $result[2][1]);
+        static::assertEqualsWithDelta(12.6718564262953, $result[2][1], 0.000000000001);
     }
 }
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEndPointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEndPointTest.php
index 4df8e64e..b076a21d 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEndPointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEndPointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StEndPointTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEnvelopeTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEnvelopeTest.php
index adbb3273..19329112 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEnvelopeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEnvelopeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StEnvelopeTest extends OrmTestCase
@@ -65,7 +66,7 @@ public function testSelectStEnvelope()
 
         switch ($this->getPlatform()->getName()) {
             case 'mysql':
-                //polygon is equals, but not the same
+                // polygon is equals, but not the same
                 $expected = 'POLYGON((0 0,10 0,10 10,0 10,0 0))';
                 break;
             case 'postgresql':
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEqualsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEqualsTest.php
index a14d9714..1477477a 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEqualsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StEqualsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StEqualsTest extends OrmTestCase
@@ -52,7 +53,7 @@ protected function setUp(): void
      */
     public function testFunction()
     {
-        $this->persistStraightLineString(); //Linestring has three points (0 0, 2 2, 5 5)
+        $this->persistStraightLineString(); // Linestring has three points (0 0, 2 2, 5 5)
         $this->getEntityManager()->flush();
         $this->getEntityManager()->clear();
 
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StExteriorRingTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StExteriorRingTest.php
index fc92d47a..a8557488 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StExteriorRingTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StExteriorRingTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StExteriorRingTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeomFromTextTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeomFromTextTest.php
index 4373583d..d399f3fa 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeomFromTextTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeomFromTextTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StGeomFromTextTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeomFromWkbTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeomFromWkbTest.php
index 4c9c766d..a02003b0 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeomFromWkbTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeomFromWkbTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StGeomFromWkbTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeometryNTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeometryNTest.php
index ed8e36e8..70dc89c9 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeometryNTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeometryNTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StGeometryNTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeometryTypeTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeometryTypeTest.php
index 55bd41fa..0bf8bf42 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeometryTypeTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StGeometryTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StGeometryTypeTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StInteriorRingNTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StInteriorRingNTest.php
index 10aedfc5..f77cdcb0 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StInteriorRingNTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StInteriorRingNTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StInteriorRingNTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIntersectionTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIntersectionTest.php
index ed5b1fab..283e53f2 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIntersectionTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIntersectionTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StIntersectionTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIntersectsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIntersectsTest.php
index df3b2843..02e62473 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIntersectsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIntersectsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StIntersectsTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsClosedTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsClosedTest.php
index 38256ccb..c47ff633 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsClosedTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsClosedTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StIsClosedTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsEmptyTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsEmptyTest.php
index 67a01deb..a7d513b8 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsEmptyTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsEmptyTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StIsEmptyTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsRingTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsRingTest.php
index cdf4f6a3..4610d4cf 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsRingTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsRingTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StIsRingTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsSimpleTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsSimpleTest.php
index f9f3bb08..ade2f644 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsSimpleTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StIsSimpleTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StIsSimpleTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StLengthTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StLengthTest.php
index 596c4e43..0c136820 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StLengthTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StLengthTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StLengthTest extends OrmTestCase
@@ -66,7 +67,7 @@ public function testSelectStLength()
 
         static::assertCount(1, $result);
         static::assertEquals($angularLineString, $result[0][0]);
-        static::assertEquals(19.1126623906578, $result[0][1]);
+        static::assertEqualsWithDelta(19.1126623906578, $result[0][1], 0.000000000001);
     }
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StLineStringFromWkbTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StLineStringFromWkbTest.php
index 588e0581..3f0ae2a5 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StLineStringFromWkbTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StLineStringFromWkbTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StLineStringFromWkbTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMLineFromWkbTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMLineFromWkbTest.php
index 509a9fb5..f4b7294e 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMLineFromWkbTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMLineFromWkbTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StMLineFromWkbTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMPointFromWkbTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMPointFromWkbTest.php
index b5969074..6ac8db57 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMPointFromWkbTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMPointFromWkbTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StMPointFromWkbTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMPolyFromWkbTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMPolyFromWkbTest.php
index 665cb99b..10d470e6 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMPolyFromWkbTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StMPolyFromWkbTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StMPolyFromWkbTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumGeometriesTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumGeometriesTest.php
index 7a97c597..babe2089 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumGeometriesTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumGeometriesTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StNumGeometriesTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumInteriorRingTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumInteriorRingTest.php
index c0c93aa0..20a429d3 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumInteriorRingTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumInteriorRingTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StNumInteriorRingTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumPointsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumPointsTest.php
index fd89eae6..f8e3a5d7 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumPointsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StNumPointsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StNumPointsTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StOverlapsTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StOverlapsTest.php
index 5e601c34..d30f6951 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StOverlapsTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StOverlapsTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StOverlapsTest extends OrmTestCase
@@ -71,7 +72,7 @@ public function testFunctionInPredicate()
         static::assertEquals($bigPolygon, $result[0]);
         switch ($this->getPlatform()->getName()) {
             case 'mysql':
-                //MySQL does not respect the initial polygon and reconstructs it in a bad (direction) way
+                // MySQL does not respect the initial polygon and reconstructs it in a bad (direction) way
                 break;
             case 'postgresql':
                 static::assertEquals($holeyPolygon, $result[1]);
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPerimeterTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPerimeterTest.php
index 4266ff1c..23f7d42f 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPerimeterTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPerimeterTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StPerimeterTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointFromWkbTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointFromWkbTest.php
index 7566a469..39ba2a71 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointFromWkbTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointFromWkbTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StPointFromWkbTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointNTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointNTest.php
index e71a971c..5f2b6b60 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointNTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointNTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StPointNTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointOnSurfaceTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointOnSurfaceTest.php
index 6cb1c797..d95a61bb 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointOnSurfaceTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointOnSurfaceTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StPointOnSurfaceTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointTest.php
index c7f3d8cd..16954e52 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StPointTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPolyFromWkbTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPolyFromWkbTest.php
index eadcd22b..6c24629d 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPolyFromWkbTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StPolyFromWkbTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StPolyFromWkbTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StRelateTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StRelateTest.php
index 4b8a2e14..b5132990 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StRelateTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StRelateTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StRelateTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StSridTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StSridTest.php
index 7b107947..f2b87b70 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StSridTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StSridTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StSridTest extends OrmTestCase
@@ -65,7 +66,7 @@ public function testFunctionWithGeography()
         static::assertIsArray($result);
         static::assertCount(1, $result);
         if ('mysql' == $this->getPlatform()->getName()) {
-            //TODO MySQL is returning 0 insteadof 2154
+            // TODO MySQL is returning 0 insteadof 2154
             static::markTestIncomplete('SRID not implemented in Abstraction of MySQL');
         }
         static::assertSame(4326, $result[0][1]);
@@ -89,7 +90,7 @@ public function testFunctionWithGeometry()
         static::assertIsArray($result[0]);
         static::assertCount(1, $result[0]);
         if ('mysql' == $this->getPlatform()->getName()) {
-            //TODO MySQL is returning 0 insteadof 2154
+            // TODO MySQL is returning 0 insteadof 2154
             static::markTestIncomplete('SRID not implemented in Abstraction of MySQL');
         }
         static::assertSame(2154, $result[0][1]);
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StStartPointTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StStartPointTest.php
index 0d715d80..756ea26f 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StStartPointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StStartPointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,6 +28,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StStartPointTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StSymDifferenceTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StSymDifferenceTest.php
index 8e454ec5..bd82f5da 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StSymDifferenceTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StSymDifferenceTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StSymDifferenceTest extends OrmTestCase
@@ -74,12 +75,12 @@ public function testSelectStDifference()
         static::assertEquals($lineStringB, $result[1][0]);
         switch ($this->getPlatform()->getName()) {
             case 'mysql':
-                //MySQL failed ST_SymDifference implementation, so I test the bad result.
+                // MySQL failed ST_SymDifference implementation, so I test the bad result.
                 static::assertEquals('MULTILINESTRING((0 0,12 12),(0 10,15 0))', $result[1][1]);
                 break;
             case 'postgresl':
             default:
-                //Here is the good result.
+                // Here is the good result.
                 // A linestring minus another crossing linestring returns initial linestring splited
                 static::assertStringStartsWith('MULTILINESTRING((0 0,6 6', $result[1][1]);
         }
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StTouchesTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StTouchesTest.php
index e361b868..50bccd8d 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StTouchesTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StTouchesTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StTouchesTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StUnionTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StUnionTest.php
index 23598995..9c43e5f5 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StUnionTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StUnionTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StUnionTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StWithinTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StWithinTest.php
index c0537547..4c92720a 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StWithinTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/AST/Functions/Standard/StWithinTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class StWithinTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/GeometryWalkerTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/GeometryWalkerTest.php
index 73bec5c3..b7734bc2 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/GeometryWalkerTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/GeometryWalkerTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class GeometryWalkerTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/ORM/Query/WrappingTest.php b/tests/LongitudeOne/Spatial/Tests/ORM/Query/WrappingTest.php
index d4709ccb..6f9da43e 100644
--- a/tests/LongitudeOne/Spatial/Tests/ORM/Query/WrappingTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/ORM/Query/WrappingTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @group dql
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class WrappingTest extends OrmTestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/OrmMockTestCase.php b/tests/LongitudeOne/Spatial/Tests/OrmMockTestCase.php
index 339d4f18..397d5e4a 100644
--- a/tests/LongitudeOne/Spatial/Tests/OrmMockTestCase.php
+++ b/tests/LongitudeOne/Spatial/Tests/OrmMockTestCase.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -19,10 +19,12 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Exception\ORMException;
+use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -47,9 +49,9 @@ protected function setUp(): void
     /**
      * Return the mocked connection.
      *
-     * @throws Exception when connection is not successful
-     *
      * @return Connection
+     *
+     * @throws Exception when connection is not successful
      */
     protected function getMockConnection()
     {
@@ -58,7 +60,7 @@ protected function getMockConnection()
             ->onlyMethods(['getDatabasePlatform'])
             ->getMock()
         ;
-        $platform = $this->getMockBuilder('Doctrine\DBAL\Platforms\SqlitePlatform')
+        $platform = $this->getMockBuilder(SqlitePlatform::class)
             ->onlyMethods(['getName'])
             ->getMock()
         ;
@@ -76,10 +78,10 @@ protected function getMockConnection()
     /**
      * Get the mocked entity manager.
      *
+     * @return EntityManagerInterface a mocked entity manager
+     *
      * @throws Exception    When connection is not successful
      * @throws ORMException won't happen because Metadata cache is set
-     *
-     * @return EntityManagerInterface a mocked entity manager
      */
     protected function getMockEntityManager()
     {
@@ -93,8 +95,7 @@ protected function getMockEntityManager()
         $config->setMetadataCache(new ArrayCachePool());
         $config->setProxyDir(__DIR__.'/Proxies');
         $config->setProxyNamespace('LongitudeOne\Spatial\Tests\Proxies');
-        //TODO Warning wrong paramater is provided
-        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($path, true));
+        $config->setMetadataDriverImpl(new AttributeDriver($path));
 
         return EntityManager::create($this->getMockConnection(), $config);
     }
diff --git a/tests/LongitudeOne/Spatial/Tests/OrmTestCase.php b/tests/LongitudeOne/Spatial/Tests/OrmTestCase.php
index 29391fe5..c23e8949 100644
--- a/tests/LongitudeOne/Spatial/Tests/OrmTestCase.php
+++ b/tests/LongitudeOne/Spatial/Tests/OrmTestCase.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -28,10 +28,10 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Exception\ORMException;
+use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\ORM\Tools\ToolsException;
 use Doctrine\Persistence\Mapping\MappingException;
-use InvalidArgumentException;
 use LongitudeOne\Spatial\DBAL\Types\Geography\LineStringType as GeographyLineStringType;
 use LongitudeOne\Spatial\DBAL\Types\Geography\PointType as GeographyPointType;
 use LongitudeOne\Spatial\DBAL\Types\Geography\PolygonType as GeographyPolygonType;
@@ -154,7 +154,6 @@
 use LongitudeOne\Spatial\Tests\Fixtures\PolygonEntity;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\TestCase;
-use Throwable;
 
 // phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.WrongNumber
 // phpcs miss the Exception
@@ -164,7 +163,7 @@
  */
 abstract class OrmTestCase extends TestCase
 {
-    //Fixtures and entities
+    // Fixtures and entities
     public const GEO_LINESTRING_ENTITY = GeoLineStringEntity::class;
     public const GEO_POINT_SRID_ENTITY = GeoPointSridEntity::class;
     public const GEO_POLYGON_ENTITY = GeoPolygonEntity::class;
@@ -362,12 +361,12 @@ protected static function assertBigPolygon($value, AbstractPlatform $platform =
     {
         switch ($platform->getName()) {
             case 'mysql':
-                //MySQL does not respect creation order of points composing a Polygon.
+                // MySQL does not respect creation order of points composing a Polygon.
                 static::assertSame('POLYGON((0 10,0 0,10 0,10 10,0 10))', $value);
                 break;
             case 'postgresl':
             default:
-                //Here is the good result.
+                // Here is the good result.
                 // A linestring minus another crossing linestring returns initial linestring splited
                 static::assertSame('POLYGON((0 10,10 10,10 0,0 0,0 10))', $value);
         }
@@ -387,8 +386,8 @@ protected static function assertEmptyGeometry($value, AbstractPlatform $platform
         $method = 'assertStringEndsWith';
 
         if ($platform instanceof MySQL57Platform && !$platform instanceof MySQL80Platform) {
-            //MySQL5 does not return the standard answer
-            //This bug was solved in MySQL8
+            // MySQL5 does not return the standard answer
+            // This bug was solved in MySQL8
             $expected = 'GEOMETRYCOLLECTION()';
             $method = 'assertSame';
         }
@@ -434,10 +433,10 @@ protected static function getCommonConnectionParameters()
     /**
      * Establish the connection if it is not already done, then returns it.
      *
+     * @return Connection
+     *
      * @throws Exception                    when connection is not successful
      * @throws UnsupportedPlatformException when platform is unsupported
-     *
-     * @return Connection
      */
     protected static function getConnection()
     {
@@ -466,9 +465,9 @@ protected static function getConnection()
     /**
      * Return connection parameters.
      *
-     * @throws Exception when connection is not successful
-     *
      * @return array
+     *
+     * @throws Exception when connection is not successful
      */
     protected static function getConnectionParameters()
     {
@@ -520,8 +519,7 @@ protected function getEntityManager()
             $config->setMetadataCache(new ArrayCachePool());
             $config->setProxyDir(__DIR__.'/Proxies');
             $config->setProxyNamespace('LongitudeOne\Spatial\Tests\Proxies');
-            //TODO WARNING: a non-expected parameter is provided.
-            $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($realPaths, true));
+            $config->setMetadataDriverImpl(new AttributeDriver($realPaths));
 
             return EntityManager::create(static::getConnection(), $config);
         } catch (ORMException|Exception|UnsupportedPlatformException $e) {
@@ -586,12 +584,12 @@ protected function getUsedEntityClasses()
     /**
      * On not successful test.
      *
-     * @param Throwable $throwable the exception
+     * @param \Throwable $throwable the exception
      *
-     * @throws InvalidArgumentException the formatted exception when sql logger is on
-     * @throws Throwable                the exception provided as parameter
+     * @throws \InvalidArgumentException the formatted exception when sql logger is on
+     * @throws \Throwable                the exception provided as parameter
      */
-    protected function onNotSuccessfulTest(Throwable $throwable): void
+    protected function onNotSuccessfulTest(\Throwable $throwable): void
     {
         if (!$GLOBALS['opt_use_debug_stack'] || $throwable instanceof AssertionFailedError) {
             throw $throwable;
@@ -637,7 +635,7 @@ protected function onNotSuccessfulTest(Throwable $throwable): void
             $message = sprintf("[%s] %s\n\n", get_class($throwable), $throwable->getMessage());
             $message .= sprintf("With queries:\n%s\nTrace:\n%s", $queries, $traceMsg);
 
-            throw new InvalidArgumentException($message, $throwable->getCode(), $throwable);
+            throw new \InvalidArgumentException($message, $throwable->getCode(), $throwable);
         }
 
         throw $throwable;
@@ -676,11 +674,11 @@ protected function setUpFunctions()
         $this->addStandardFunctions($configuration);
 
         if ('postgresql' === $this->getPlatformAndVersion()) {
-            //Specific functions of PostgreSQL server
+            // Specific functions of PostgreSQL server
             $this->addSpecificPostgreSqlFunctions($configuration);
         }
 
-        //This test does not work when we compare to 'mysql' (on Travis only)
+        // This test does not work when we compare to 'mysql' (on Travis only)
         if ('postgresql' !== $this->getPlatform()->getName()) {
             $this->addSpecificMySqlFunctions($configuration);
         }
@@ -818,7 +816,7 @@ private function addSpecificPostgreSqlFunctions(Configuration $configuration): v
      */
     private function addStandardFunctions(Configuration $configuration): void
     {
-        //Generic spatial functions described in OGC Standard
+        // Generic spatial functions described in OGC Standard
         $configuration->addCustomNumericFunction('ST_Area', StArea::class);
         $configuration->addCustomStringFunction('ST_AsBinary', StAsBinary::class);
         $configuration->addCustomStringFunction('ST_AsText', StAsText::class);
diff --git a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geography/PointTest.php b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geography/PointTest.php
index d595c2df..f382dfd9 100644
--- a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geography/PointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geography/PointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -25,6 +25,7 @@
  * @group php
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class PointTest extends TestCase
@@ -221,8 +222,8 @@ public function testGoodStringPoints()
         $point = new Point('79:56:55W', '40:26:46N');
         $expected = '{"type":"Point","coordinates":[-79.9486111111111,40.44611111111111],"srid":null}';
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.446111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.948611111111, $point->getLongitude(), 0.000000000001);
         static::assertEquals($expected, $point->toJson());
         static::assertEquals($expected, json_encode($point));
 
@@ -230,35 +231,35 @@ public function testGoodStringPoints()
         $point->setSrid(4326);
         $expected = '{"type":"Point","coordinates":[-79.9486111111111,40.44611111111111],"srid":4326}';
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.446111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.948611111111, $point->getLongitude(), 0.000000000001);
         static::assertEquals($expected, $point->toJson());
         static::assertEquals($expected, json_encode($point));
 
         $point = new Point('79° 56\' 55" W', '40° 26\' 46" N');
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.446111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.948611111111, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('79°56′55″W', '40°26′46″N');
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.446111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.948611111111, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('79° 56′ 55″ W', '40° 26′ 46″ N');
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.446111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.948611111111, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('79:56:55.832W', '40:26:46.543N');
 
-        static::assertEquals(40.446261944444, $point->getLatitude());
-        static::assertEquals(-79.948842222222, $point->getLongitude());
+        static::assertEqualsWithDelta(40.446261944444, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.948842222222, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('112:4:0W', '33:27:0N');
 
         static::assertEquals(33.45, $point->getLatitude());
-        static::assertEquals(-112.06666666667, $point->getLongitude());
+        static::assertEqualsWithDelta(-112.06666666666666, $point->getLongitude(), 0.00000000001);
     }
 
     /**
@@ -301,7 +302,7 @@ public function testPointWithSrid()
 
         static::assertEquals(4326, $result);
 
-        //Lambert
+        // Lambert
         $point = new Point(10, 10, 2154);
         $result = $point->getSrid();
 
diff --git a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/LineStringTest.php b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/LineStringTest.php
index bf509fcb..c195fa83 100644
--- a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/LineStringTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/LineStringTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group php
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class LineStringTest extends TestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiLineStringTest.php b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiLineStringTest.php
index 74910d1f..72c66176 100644
--- a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiLineStringTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiLineStringTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -27,6 +27,7 @@
  * @group php
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class MultiLineStringTest extends TestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiPointTest.php b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiPointTest.php
index 7d08caf6..7769cccd 100644
--- a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiPointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiPointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @license https://alexandre-tranchant.mit-license.org MIT
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class MultiPointTest extends TestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiPolygonTest.php b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiPolygonTest.php
index 29861251..e587552a 100644
--- a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiPolygonTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/MultiPolygonTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -31,6 +31,7 @@
  * @license https://alexandre-tranchant.mit-license.org MIT
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class MultiPolygonTest extends TestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PointTest.php b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PointTest.php
index f9a42aec..b47bffdd 100644
--- a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PointTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PointTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -26,6 +26,7 @@
  * @group php
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class PointTest extends TestCase
@@ -165,38 +166,38 @@ public function testGoodStringPoints()
     {
         $point = new Point('79:56:55W', '40:26:46N');
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.44611111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.9486111111111, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('79°56\'55"W', '40°26\'46"N');
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.44611111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.9486111111111, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('79° 56\' 55" W', '40° 26\' 46" N');
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.44611111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.9486111111111, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('79°56′55″W', '40°26′46″N');
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.44611111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.9486111111111, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('79° 56′ 55″ W', '40° 26′ 46″ N');
 
-        static::assertEquals(40.446111111111, $point->getLatitude());
-        static::assertEquals(-79.948611111111, $point->getLongitude());
+        static::assertEqualsWithDelta(40.44611111111111, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.9486111111111, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('79:56:55.832W', '40:26:46.543N');
 
-        static::assertEquals(40.446261944444, $point->getLatitude());
-        static::assertEquals(-79.948842222222, $point->getLongitude());
+        static::assertEqualsWithDelta(40.446261944444444, $point->getLatitude(), 0.000000000001);
+        static::assertEqualsWithDelta(-79.94884222222223, $point->getLongitude(), 0.000000000001);
 
         $point = new Point('112:4:0W', '33:27:0N');
 
         static::assertEquals(33.45, $point->getLatitude());
-        static::assertEquals(-112.06666666667, $point->getLongitude());
+        static::assertEqualsWithDelta(-112.06666666666666, $point->getLongitude(), 0.000000000001);
     }
 
     /**
diff --git a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PolygonTest.php b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PolygonTest.php
index e2cafe30..776f8459 100644
--- a/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PolygonTest.php
+++ b/tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PolygonTest.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022
@@ -29,6 +29,7 @@
  * @group php
  *
  * @internal
+ *
  * @coversDefaultClass
  */
 class PolygonTest extends TestCase
diff --git a/tests/LongitudeOne/Spatial/Tests/TestInit.php b/tests/LongitudeOne/Spatial/Tests/TestInit.php
index e1d4a94d..d29d8f32 100644
--- a/tests/LongitudeOne/Spatial/Tests/TestInit.php
+++ b/tests/LongitudeOne/Spatial/Tests/TestInit.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the doctrine spatial extension.
  *
- * PHP 7.4 | 8.0 | 8.1
+ * PHP 8.1
  *
  * (c) Alexandre Tranchant <alexandre.tranchant@gmail.com> 2017 - 2022
  * (c) Longitude One 2020 - 2022