Merge branch 'main' into dev

# Conflicts:
#	lib/LongitudeOne/Spatial/PHP/Types/AbstractGeometry.php

Author: Alexandre-T

.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/[email protected]
+      - name: Run test suite and coverage
+        if: env.HAS_CC_SECRET == 'true'
+        uses: paambaati/[email protected]
         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

.php-cs-fixer.dist.php

@@ -1,24 +1,37 @@
 <?php
+/**
+ * This file is part of the doctrine spatial extension.
+ *
+ * PHP 8.1
+ *
+ * (c) Alexandre Tranchant <[email protected]> 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__)
     ->exclude('var')
     ->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 <[email protected]> 2017 - 2022
-(c) Longitude One 2020 - 2022 
-(c) 2015 Derek J. Lambert
+    (c) Alexandre Tranchant <[email protected]> 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,23 +43,23 @@
         '@PHP70Migration' => true,
         '@PHP71Migration' => true,
         '@PHP73Migration' => true,
-//        'strict_param' => true,
+        //        'strict_param' => true,
         'array_syntax' => ['syntax' => 'short'],
         'dir_constant' => true,
         'ereg_to_preg' => true,
         'header_comment' => [
             '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)
-    ;
+;

.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:

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

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

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": "~1.0",
         "creof/wkb-parser": "~2.3",
         "doctrine/orm": "^2.8.4"
     },
@@ -68,5 +68,7 @@
             "LongitudeOne\\Spatial": "lib/",
             "LongitudeOne\\Spatial\\Tests": "tests/"
         }
-    }
+    },
+    "repositories" : [
+    ]
 }

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

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

docker/php7/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  \

docker/php8/Dockerfile

@@ -127,6 +127,13 @@ You can register functions of the doctrine spatial extension adding them to the
     // This is another example to declare a Postgresql specific function which is returning a string
     $config->addCustomNumericFunction('SP_GeoJson', 'LongitudeOne\Spatial\ORM\Query\AST\Functions\PostgreSql\SpGeoJson');
 
+Coordinates order
+-----------------
+
+In point constructor, the order is the same as the spatial database.
+It means:
+ * longitude shall be set before latitude in point constructor,
+ * X shall be set before Y.
 
 .. _ISO/IEC 13249-3:2016: https://www.iso.org/standard/60343.html
 .. _Open Geospatial Consortium: https://www.ogc.org/

docs/Configuration.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?
 ------------------------------