From 6620aa5fd725560fea4ba2d075c785dd0c28eb55 Mon Sep 17 00:00:00 2001 From: bach Date: Fri, 18 Jul 2025 15:42:01 +0200 Subject: [PATCH] updated geofield and geocoder --- composer.lock | 238 ++++++++++++----------------- web/profiles/d8-starterkit-profile | 2 +- 2 files changed, 102 insertions(+), 138 deletions(-) diff --git a/composer.lock b/composer.lock index 08f4423..9615764 100644 --- a/composer.lock +++ b/composer.lock @@ -184,23 +184,23 @@ }, { "name": "clue/stream-filter", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/clue/stream-filter.git", - "reference": "d6169430c7731d8509da7aecd0af756a5747b78e" + "reference": "049509fef80032cb3f051595029ab75b49a3c2f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/stream-filter/zipball/d6169430c7731d8509da7aecd0af756a5747b78e", - "reference": "d6169430c7731d8509da7aecd0af756a5747b78e", + "url": "https://api.github.com/repos/clue/stream-filter/zipball/049509fef80032cb3f051595029ab75b49a3c2f7", + "reference": "049509fef80032cb3f051595029ab75b49a3c2f7", "shasum": "" }, "require": { "php": ">=5.3" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -222,7 +222,7 @@ } ], "description": "A simple and modern approach to stream filtering in PHP", - "homepage": "https://github.com/clue/php-stream-filter", + "homepage": "https://github.com/clue/stream-filter", "keywords": [ "bucket brigade", "callback", @@ -234,7 +234,7 @@ ], "support": { "issues": "https://github.com/clue/stream-filter/issues", - "source": "https://github.com/clue/stream-filter/tree/v1.6.0" + "source": "https://github.com/clue/stream-filter/tree/v1.7.0" }, "funding": [ { @@ -246,7 +246,7 @@ "type": "github" } ], - "time": "2022-02-21T13:15:14+00:00" + "time": "2023-12-20T15:40:13+00:00" }, { "name": "commerceguys/addressing", @@ -1201,28 +1201,31 @@ }, { "name": "davedevelopment/stiphle", - "version": "0.9.2", + "version": "0.9.4", "source": { "type": "git", "url": "https://github.com/davedevelopment/stiphle.git", - "reference": "76151e6474741adee258c1a4860a0460e319563b" + "reference": "5d1c244f0525d265e231a65db538b74eb5483768" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/davedevelopment/stiphle/zipball/76151e6474741adee258c1a4860a0460e319563b", - "reference": "76151e6474741adee258c1a4860a0460e319563b", + "url": "https://api.github.com/repos/davedevelopment/stiphle/zipball/5d1c244f0525d265e231a65db538b74eb5483768", + "reference": "5d1c244f0525d265e231a65db538b74eb5483768", "shasum": "" }, "require": { - "php": ">=5.3.1" + "php": "^5.6.0|^7.0|^8.0" }, "require-dev": { - "phpunit/phpunit": "^5.5", - "predis/predis": "^1.1" + "doctrine/cache": "^1.0", + "phpunit/phpunit": "^6.5|^7.5|^8.4", + "predis/predis": "^1.1", + "zendframework/zend-cache": "^2.8" }, "suggest": { "doctrine/cache": "~1.0", - "predis/predis": "~1.1" + "predis/predis": "~1.1", + "zendframework/zend-cache": "^2.8" }, "type": "library", "autoload": { @@ -1251,9 +1254,9 @@ ], "support": { "issues": "https://github.com/davedevelopment/stiphle/issues", - "source": "https://github.com/davedevelopment/stiphle/tree/0.9.2" + "source": "https://github.com/davedevelopment/stiphle/tree/0.9.4" }, - "time": "2017-08-16T07:58:18+00:00" + "time": "2022-11-25T16:30:20+00:00" }, { "name": "dekor/php-array-table", @@ -5504,64 +5507,62 @@ }, { "name": "drupal/geocoder", - "version": "3.25.0", + "version": "3.47.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/geocoder.git", - "reference": "8.x-3.25" + "reference": "8.x-3.47" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.25.zip", - "reference": "8.x-3.25", - "shasum": "959dd2df6c17eaa0550ecb3943f06bb77d1d3adc" + "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.47.zip", + "reference": "8.x-3.47", + "shasum": "841705b269361b01adb00d34c7d74a14d3973054" }, "require": { "davedevelopment/stiphle": "^0.9.2", "drupal/core": "^8.8 || ^9", - "php": ">=7.1.0", + "php": ">=7.3.0", "php-http/guzzle6-adapter": "^1.1 || ^2.0", "php-http/message": "^1.6", "willdurand/geocoder": "^4.0" }, "require-dev": { - "drupal/address": "*", - "drupal/coder": "^8.2", + "drupal/address": "^1.11 || ^2.0", "drupal/geocoder_field": "*", - "drupal/geofield": "*", + "drupal/geofield": "^1.52", + "geo6/geocoder-php-addok-provider": "^1.0", "geo6/geocoder-php-bpost-provider": "^1.3.0", "geo6/geocoder-php-geopunt-provider": "^1.0", "geo6/geocoder-php-spw-provider": "^1.0", "geocoder-php/arcgis-online-provider": "^4.0", + "geocoder-php/azure-maps-provider": "^1.2", "geocoder-php/bing-maps-provider": "^4.0", "geocoder-php/free-geoip-provider": "^4.1", "geocoder-php/geo-plugin-provider": "^4.0", - "geocoder-php/geoips-provider": "^4.1", "geocoder-php/geonames-provider": "^4.1", "geocoder-php/google-maps-provider": "^4.2", - "geocoder-php/graphhopper-provider": "^0.1.0", + "geocoder-php/graphhopper-provider": "^0.5.0", "geocoder-php/host-ip-provider": "^4.0", "geocoder-php/ip-info-db-provider": "^4.0", - "geocoder-php/mapbox-provider": "^0.1", + "geocoder-php/mapbox-provider": "^1.0", "geocoder-php/mapquest-provider": "^4.0", + "geocoder-php/maptiler-provider": "^1.0", "geocoder-php/maxmind-provider": "^4.1", "geocoder-php/nominatim-provider": "^5.0", "geocoder-php/open-cage-provider": "^4.0", "geocoder-php/openrouteservice-provider": "^1.0", "geocoder-php/pelias-provider": "^1.1", - "geocoder-php/photon-provider": "^0.1.0", + "geocoder-php/photon-provider": "^0.6", "geocoder-php/tomtom-provider": "^4.0", "geocoder-php/yandex-provider": "^4.0", - "phpro/grumphp": "^0.12.1", - "phpunit/phpunit": "^5.7|^6.5", - "sensiolabs/security-checker": "^4.1", - "squizlabs/php_codesniffer": "^2.7" + "systonic/ban-france-provider": "^1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.25", - "datestamp": "1642803151", + "version": "8.x-3.47", + "datestamp": "1707161761", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5583,44 +5584,16 @@ "homepage": "https://www.drupal.org/u/itamair", "role": "Co-maintainer" }, - { - "name": "Pol", - "homepage": "https://www.drupal.org/user/47194" - }, - { - "name": "Simon Georges", - "homepage": "https://www.drupal.org/user/172312" - }, - { - "name": "claudiu.cristea", - "homepage": "https://www.drupal.org/user/56348" - }, - { - "name": "gregseb", - "homepage": "https://www.drupal.org/user/847848" - }, - { - "name": "indytechcook", - "homepage": "https://www.drupal.org/user/245817" - }, - { - "name": "itamair", - "homepage": "https://www.drupal.org/user/1179076" - }, { "name": "michaelfavia", "homepage": "https://www.drupal.org/user/49137" }, { - "name": "phayes", - "homepage": "https://www.drupal.org/user/47098" - }, - { - "name": "vidhatanand", - "homepage": "https://www.drupal.org/user/585764" + "name": "poker10", + "homepage": "https://www.drupal.org/user/272316" } ], - "description": "A Drupal module and a services based API to perform Geocode & Reverse Geocode operations among GIS data and addresses types & formats.", + "description": "Module and services based API to perform Geocode & Reverse Geocode operations among GIS data and addresses types & formats.", "homepage": "https://drupal.org/project/geocoder", "support": { "source": "https://git.drupalcode.org/project/geocoder", @@ -5630,27 +5603,31 @@ }, { "name": "drupal/geofield", - "version": "1.56.0", + "version": "1.64.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/geofield.git", - "reference": "8.x-1.56" + "reference": "8.x-1.64" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.56.zip", - "reference": "8.x-1.56", - "shasum": "edcb25304edb860d0fe907b8aa2dc73b6fc83f39" + "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.64.zip", + "reference": "8.x-1.64", + "shasum": "300f8cf8bf4d0cf2660c5a7e81d56146d947b772" }, "require": { - "drupal/core": "^8.8 || ^9 || ^10", - "itamair/geophp": "^1.3" + "drupal/core": "^9 || ^10 || ^11", + "itamair/geophp": "^1.6" + }, + "require-dev": { + "drupal/diff": "^1.3", + "drupal/feeds": "^3.0@beta" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.56", - "datestamp": "1698017493", + "version": "8.x-1.64", + "datestamp": "1736675456", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10430,16 +10407,16 @@ }, { "name": "itamair/geophp", - "version": "1.5", + "version": "1.7", "source": { "type": "git", "url": "https://github.com/itamair/geoPHP.git", - "reference": "645f3262ebaa7443d58910207c65f386c733f614" + "reference": "c8cf587256cdd1a72a732f59138ee3bfa3372956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itamair/geoPHP/zipball/645f3262ebaa7443d58910207c65f386c733f614", - "reference": "645f3262ebaa7443d58910207c65f386c733f614", + "url": "https://api.github.com/repos/itamair/geoPHP/zipball/c8cf587256cdd1a72a732f59138ee3bfa3372956", + "reference": "c8cf587256cdd1a72a732f59138ee3bfa3372956", "shasum": "" }, "require-dev": { @@ -10470,9 +10447,9 @@ "description": "GeoPHP is a open-source native PHP library for doing geometry operations. It is written entirely in PHP and can therefore run on shared hosts. It can read and write a wide variety of formats: WKT (including EWKT), WKB (including EWKB), GeoJSON, KML, GPX, GeoRSS). It works with all Simple-Feature geometries (Point, LineString, Polygon, GeometryCollection etc.) and can be used to get centroids, bounding-boxes, area, and a wide variety of other useful information.", "homepage": "https://github.com/itamair/geoPHP", "support": { - "source": "https://github.com/itamair/geoPHP/tree/1.5" + "source": "https://github.com/itamair/geoPHP/tree/1.7" }, - "time": "2023-04-26T23:16:44+00:00" + "time": "2025-05-31T05:12:53+00:00" }, { "name": "kint-php/kint", @@ -11569,38 +11546,34 @@ "issues": "https://github.com/php-http/guzzle6-adapter/issues", "source": "https://github.com/php-http/guzzle6-adapter/tree/v2.0.2" }, + "abandoned": "guzzlehttp/guzzle or php-http/guzzle7-adapter", "time": "2021-03-02T10:52:33+00:00" }, { "name": "php-http/httplug", - "version": "2.3.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "f640739f80dfa1152533976e3c112477f69274eb" + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb", - "reference": "f640739f80dfa1152533976e3c112477f69274eb", + "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4", + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4", "shasum": "" }, "require": { "php": "^7.1 || ^8.0", "php-http/promise": "^1.1", "psr/http-client": "^1.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.1", - "phpspec/phpspec": "^5.1 || ^6.0" + "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, "autoload": { "psr-4": { "Http\\Client\\": "src/" @@ -11629,29 +11602,29 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/2.3.0" + "source": "https://github.com/php-http/httplug/tree/2.4.1" }, - "time": "2022-02-21T09:52:22+00:00" + "time": "2024-09-23T11:39:58+00:00" }, { "name": "php-http/message", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361" + "reference": "2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/7886e647a30a966a1a8d1dad1845b71ca8678361", - "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361", + "url": "https://api.github.com/repos/php-http/message/zipball/2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b", + "reference": "2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b", "shasum": "" }, "require": { "clue/stream-filter": "^1.5", "php": "^7.1 || ^8.0", "php-http/message-factory": "^1.0.2", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "provide": { "php-http/message-factory-implementation": "1.0" @@ -11671,11 +11644,6 @@ "slim/slim": "Used with Slim Framework PSR-7 implementation" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, "autoload": { "files": [ "src/filters.php" @@ -11703,32 +11671,32 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.13.0" + "source": "https://github.com/php-http/message/tree/1.14.0" }, - "time": "2022-02-11T13:41:14+00:00" + "time": "2023-04-14T14:26:18+00:00" }, { "name": "php-http/message-factory", - "version": "v1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-http/message-factory.git", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1" + "reference": "4d8778e1c7d405cbb471574821c1ff5b68cc8f57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "url": "https://api.github.com/repos/php-http/message-factory/zipball/4d8778e1c7d405cbb471574821c1ff5b68cc8f57", + "reference": "4d8778e1c7d405cbb471574821c1ff5b68cc8f57", "shasum": "" }, "require": { "php": ">=5.4", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -11757,37 +11725,33 @@ ], "support": { "issues": "https://github.com/php-http/message-factory/issues", - "source": "https://github.com/php-http/message-factory/tree/master" + "source": "https://github.com/php-http/message-factory/tree/1.1.0" }, - "time": "2015-12-19T14:08:53+00:00" + "abandoned": "psr/http-factory", + "time": "2023-04-14T14:16:17+00:00" }, { "name": "php-http/promise", - "version": "1.1.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/php-http/promise.git", - "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88" + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", - "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", + "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.3.2", - "phpspec/phpspec": "^5.1.2 || ^6.2" + "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3", + "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, "autoload": { "psr-4": { "Http\\Promise\\": "src/" @@ -11814,9 +11778,9 @@ ], "support": { "issues": "https://github.com/php-http/promise/issues", - "source": "https://github.com/php-http/promise/tree/1.1.0" + "source": "https://github.com/php-http/promise/tree/1.3.1" }, - "time": "2020-07-07T09:29:14+00:00" + "time": "2024-03-15T13:55:21+00:00" }, { "name": "phpmailer/phpmailer", @@ -15762,20 +15726,20 @@ }, { "name": "willdurand/geocoder", - "version": "4.5.0", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/geocoder-php/php-common.git", - "reference": "b9a27dfbc06d012f4ff52b890fe52789e4978769" + "reference": "be3d9ed0fddf8c698ee079d8a07ae9520b4a49a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/geocoder-php/php-common/zipball/b9a27dfbc06d012f4ff52b890fe52789e4978769", - "reference": "b9a27dfbc06d012f4ff52b890fe52789e4978769", + "url": "https://api.github.com/repos/geocoder-php/php-common/zipball/be3d9ed0fddf8c698ee079d8a07ae9520b4a49a1", + "reference": "be3d9ed0fddf8c698ee079d8a07ae9520b4a49a1", "shasum": "" }, "require": { - "php": "^7.3 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "nyholm/nsa": "^1.1", @@ -15818,9 +15782,9 @@ "geoip" ], "support": { - "source": "https://github.com/geocoder-php/php-common/tree/4.5.0" + "source": "https://github.com/geocoder-php/php-common/tree/4.6.0" }, - "time": "2022-01-07T14:44:30+00:00" + "time": "2022-07-30T11:09:43+00:00" } ], "packages-dev": [], diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 56e96bd..1ee4ada 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 56e96bd26eda48f2a9fb66e604b619314752086b +Subproject commit 1ee4ada5f3b0e57a8c665098d4db5dc7bd3db267