From 46104bc395a12093d6eeb16b184bec819581557d Mon Sep 17 00:00:00 2001 From: Ramon Gutierrez Date: Tue, 28 Mar 2023 11:36:32 +0800 Subject: [PATCH] Replace doctrine spatial lib with forked version #730 --- composer.json | 6 ++- composer.lock | 126 +++++++++++++++++++++++++------------------------- symfony.lock | 6 +-- 3 files changed, 71 insertions(+), 67 deletions(-) diff --git a/composer.json b/composer.json index 468f7809..27e0b4e4 100644 --- a/composer.json +++ b/composer.json @@ -2,6 +2,10 @@ "type": "project", "license": "proprietary", "repositories": [ + { + "type": "vcs", + "url": "https://github.com/jankstudio/doctrine2-spatial.git" + }, { "type": "vcs", "url": "git@gitlab.com:jankstudio1/catalyst-2/api-bundle.git" @@ -19,7 +23,6 @@ "php": "^7.1.3", "ext-iconv": "*", "composer/package-versions-deprecated": "1.11.99.4", - "creof/doctrine2-spatial": "^1.2", "data-dog/audit-bundle": "^0.1.10", "doctrine/common": "^2", "doctrine/doctrine-bundle": "^2", @@ -31,6 +34,7 @@ "jankstudio/catalyst-api-bundle": "dev-master", "jankstudio/catalyst-auth-bundle": "dev-master", "jankstudio/catalyst-menu-bundle": "dev-master", + "jankstudio/doctrine-spatial": "dev-master", "microsoft/azure-storage-blob": "^1.5", "predis/predis": "^1.1", "sensio/framework-extra-bundle": "^5.1", diff --git a/composer.lock b/composer.lock index 93fee474..5c25c204 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9489b680a355544bdcb0ffa5655418b7", + "content-hash": "6e52016d46fa06387dbd9db37e6feb93", "packages": [ { "name": "composer/package-versions-deprecated", @@ -79,67 +79,6 @@ ], "time": "2021-09-13T08:41:34+00:00" }, - { - "name": "creof/doctrine2-spatial", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/creof/doctrine2-spatial.git", - "reference": "58ea5fae1c1b450ee08d7dac25cd9e8f5e6fdebd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/creof/doctrine2-spatial/zipball/58ea5fae1c1b450ee08d7dac25cd9e8f5e6fdebd", - "reference": "58ea5fae1c1b450ee08d7dac25cd9e8f5e6fdebd", - "shasum": "" - }, - "require": { - "creof/geo-parser": "~2.0", - "creof/wkb-parser": "~2.0", - "creof/wkt-parser": "~2.0", - "doctrine/orm": ">=2.3" - }, - "require-dev": { - "phpunit/phpcov": "*", - "phpunit/phpunit": "<5.0", - "satooshi/php-coveralls": "~1.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "CrEOF\\Spatial": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Derek Lambert", - "email": "dlambert@dereklambert.com" - } - ], - "description": "Doctrine2 multi-platform support for spatial types and functions", - "keywords": [ - "database", - "dbal", - "geography", - "geometry", - "gis", - "mysql", - "opengis", - "orm", - "postgis", - "postgresql", - "spatial" - ], - "support": { - "issues": "https://github.com/creof/doctrine2-spatial/issues", - "source": "https://github.com/creof/doctrine2-spatial/tree/master" - }, - "time": "2017-07-13T16:48:25+00:00" - }, { "name": "creof/geo-parser", "version": "2.2.1", @@ -2413,6 +2352,66 @@ }, "time": "2022-10-07T11:55:32+08:00" }, + { + "name": "jankstudio/doctrine-spatial", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/jankstudio/doctrine-spatial.git", + "reference": "32b0fd126f3d81758ee74363535a44ccb3adae19" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jankstudio/doctrine-spatial/zipball/32b0fd126f3d81758ee74363535a44ccb3adae19", + "reference": "32b0fd126f3d81758ee74363535a44ccb3adae19", + "shasum": "" + }, + "require": { + "creof/geo-parser": "~2.0", + "creof/wkb-parser": "~2.0", + "creof/wkt-parser": "~2.0", + "doctrine/orm": ">=2.3" + }, + "require-dev": { + "phpunit/phpcov": "*", + "phpunit/phpunit": "<5.0", + "satooshi/php-coveralls": "~1.0" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-0": { + "CrEOF\\Spatial": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Derek Lambert", + "email": "dlambert@dereklambert.com" + } + ], + "description": "Doctrine2 multi-platform support for spatial types and functions", + "keywords": [ + "database", + "dbal", + "geography", + "geometry", + "gis", + "mysql", + "opengis", + "orm", + "postgis", + "postgresql", + "spatial" + ], + "support": { + "source": "https://github.com/jankstudio/doctrine-spatial/tree/master" + }, + "time": "2021-08-23T01:41:57+00:00" + }, { "name": "laminas/laminas-code", "version": "3.4.1", @@ -7956,7 +7955,8 @@ "stability-flags": { "jankstudio/catalyst-api-bundle": 20, "jankstudio/catalyst-auth-bundle": 20, - "jankstudio/catalyst-menu-bundle": 20 + "jankstudio/catalyst-menu-bundle": 20, + "jankstudio/doctrine-spatial": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/symfony.lock b/symfony.lock index 1853ec79..82c192d2 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1,7 +1,4 @@ { - "creof/doctrine2-spatial": { - "version": "1.2.0" - }, "creof/geo-parser": { "version": "2.1.0" }, @@ -113,6 +110,9 @@ "jankstudio/catalyst-menu-bundle": { "version": "dev-master" }, + "jankstudio/doctrine-spatial": { + "version": "dev-master" + }, "jdorn/sql-formatter": { "version": "v1.2.17" },