diff --git a/composer.json b/composer.json index c0d7525..85752a5 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ ], "require": { "composer/installers": "^1.9", + "drupal/address": "^1.10", "drupal/administerusersbyrole": "^3.0", "drupal/config_pages": "2.x-dev@dev", "drupal/core-composer-scaffold": "^9.2", @@ -23,6 +24,8 @@ "drupal/core-recommended": "^9.2", "drupal/entity_type_clone": "^1.7", "drupal/formatter_suite": "^1.3", + "drupal/geocoder": "^3.25", + "drupal/geofield": "^1.36", "drupal/image_delta_formatter": "^1.1", "drupal/image_field_caption": "^1.1", "drupal/linked_field": "^1.3", @@ -33,6 +36,7 @@ "drupal/role_delegation": "^1.1", "drupal/structure_sync": "^2.0", "drupal/webform": "^6.1", + "geocoder-php/mapquest-provider": "^4.2", "wikimedia/composer-merge-plugin": "^2.0" }, "conflict": { diff --git a/composer.lock b/composer.lock index 8e7ff86..87efe9e 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": "69ad8823b8e93748b2cb40b057fea347", + "content-hash": "471faaf421c9f203532a12c58d4c62b9", "packages": [ { "name": "alchemy/zippy", @@ -182,6 +182,72 @@ }, "time": "2020-12-05T05:59:11+00:00" }, + { + "name": "clue/stream-filter", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/clue/stream-filter.git", + "reference": "d6169430c7731d8509da7aecd0af756a5747b78e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/clue/stream-filter/zipball/d6169430c7731d8509da7aecd0af756a5747b78e", + "reference": "d6169430c7731d8509da7aecd0af756a5747b78e", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "Clue\\StreamFilter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering" + } + ], + "description": "A simple and modern approach to stream filtering in PHP", + "homepage": "https://github.com/clue/php-stream-filter", + "keywords": [ + "bucket brigade", + "callback", + "filter", + "php_user_filter", + "stream", + "stream_filter_append", + "stream_filter_register" + ], + "support": { + "issues": "https://github.com/clue/stream-filter/issues", + "source": "https://github.com/clue/stream-filter/tree/v1.6.0" + }, + "funding": [ + { + "url": "https://clue.engineering/support", + "type": "custom" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-02-21T13:15:14+00:00" + }, { "name": "commerceguys/addressing", "version": "v1.2.2", @@ -1134,6 +1200,62 @@ }, "type": "drupal-library" }, + { + "name": "davedevelopment/stiphle", + "version": "0.9.2", + "source": { + "type": "git", + "url": "https://github.com/davedevelopment/stiphle.git", + "reference": "76151e6474741adee258c1a4860a0460e319563b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/davedevelopment/stiphle/zipball/76151e6474741adee258c1a4860a0460e319563b", + "reference": "76151e6474741adee258c1a4860a0460e319563b", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "^5.5", + "predis/predis": "^1.1" + }, + "suggest": { + "doctrine/cache": "~1.0", + "predis/predis": "~1.1" + }, + "type": "library", + "autoload": { + "psr-0": { + "Stiphle": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dave Marshall", + "email": "dave.marshall@atstsolutions.co.uk", + "homepage": "http://davedevelopment.co.uk" + } + ], + "description": "Simple rate limiting/throttling for php", + "homepage": "http://github.com/davedevelopment/stiphle", + "keywords": [ + "rate limit", + "rate limiting", + "throttle", + "throttling" + ], + "support": { + "issues": "https://github.com/davedevelopment/stiphle/issues", + "source": "https://github.com/davedevelopment/stiphle/tree/0.9.2" + }, + "time": "2017-08-16T07:58:18+00:00" + }, { "name": "dflydev/dot-access-configuration", "version": "v1.0.3", @@ -5439,6 +5561,198 @@ "issues": "http://drupal.org/project/issues/formatter_suite" } }, + { + "name": "drupal/geocoder", + "version": "3.25.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/geocoder.git", + "reference": "8.x-3.25" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.25.zip", + "reference": "8.x-3.25", + "shasum": "959dd2df6c17eaa0550ecb3943f06bb77d1d3adc" + }, + "require": { + "davedevelopment/stiphle": "^0.9.2", + "drupal/core": "^8.8 || ^9", + "php": ">=7.1.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/geocoder_field": "*", + "drupal/geofield": "*", + "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/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/host-ip-provider": "^4.0", + "geocoder-php/ip-info-db-provider": "^4.0", + "geocoder-php/mapbox-provider": "^0.1", + "geocoder-php/mapquest-provider": "^4.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/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" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-3.25", + "datestamp": "1642803151", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Pol Dellaiera (@drupol)", + "homepage": "https://www.drupal.org/u/pol", + "role": "Maintainer" + }, + { + "name": "Italo Mairo (@itamair)", + "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" + } + ], + "description": "A Drupal module and a 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", + "issues": "https://drupal.org/project/issues/geocoder", + "irc": "irc://irc.freenode.org/drupal-geo" + } + }, + { + "name": "drupal/geofield", + "version": "1.36.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/geofield.git", + "reference": "8.x-1.36" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.36.zip", + "reference": "8.x-1.36", + "shasum": "4aa5f6b6f60f33506a7044f11d7ed68bd4e75009" + }, + "require": { + "drupal/core": "^8.8 || ^9", + "phayes/geophp": "^1.2" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.36", + "datestamp": "1641134825", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Brandon Morrison", + "homepage": "https://www.drupal.org/u/brandonian", + "role": "Maintainer" + }, + { + "name": "Pablo López", + "homepage": "https://www.drupal.org/u/plopesc", + "role": "Maintainer" + }, + { + "name": "Italo Mairo", + "homepage": "https://www.drupal.org/u/itamair", + "role": "Maintainer" + }, + { + "name": "phayes", + "homepage": "https://www.drupal.org/user/47098" + }, + { + "name": "plopesc", + "homepage": "https://www.drupal.org/user/282415" + } + ], + "description": "Stores geographic and location data (points, lines, and polygons).", + "homepage": "https://www.drupal.org/project/geofield", + "support": { + "source": "https://git.drupalcode.org/project/geofield", + "issues": "https://www.drupal.org/project/issues/geofield", + "irc": "irc://irc.freenode.org/drupal-contribute" + } + }, { "name": "drupal/honeypot", "version": "2.0.2", @@ -9102,6 +9416,130 @@ }, "time": "2021-11-22T13:10:38+00:00" }, + { + "name": "geocoder-php/common-http", + "version": "4.4.0", + "source": { + "type": "git", + "url": "https://github.com/geocoder-php/php-common-http.git", + "reference": "9f44a006d4b45d01dd31ea9b38ee7fb5724cd73e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/geocoder-php/php-common-http/zipball/9f44a006d4b45d01dd31ea9b38ee7fb5724cd73e", + "reference": "9f44a006d4b45d01dd31ea9b38ee7fb5724cd73e", + "shasum": "" + }, + "require": { + "php": "^7.3 || ^8.0", + "php-http/client-implementation": "^1.0", + "php-http/discovery": "^1.6", + "php-http/httplug": "^1.0 || ^2.0", + "php-http/message-factory": "^1.0.2", + "psr/http-message": "^1.0", + "psr/http-message-implementation": "^1.0", + "willdurand/geocoder": "^4.0" + }, + "require-dev": { + "nyholm/psr7": "^1.0", + "php-http/message": "^1.0", + "php-http/mock-client": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/stopwatch": "~2.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Geocoder\\Http\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" + } + ], + "description": "Common files for HTTP based Geocoders", + "homepage": "http://geocoder-php.org", + "keywords": [ + "http geocoder" + ], + "support": { + "source": "https://github.com/geocoder-php/php-common-http/tree/4.4.0" + }, + "time": "2020-12-21T09:30:01+00:00" + }, + { + "name": "geocoder-php/mapquest-provider", + "version": "4.2.0", + "source": { + "type": "git", + "url": "https://github.com/geocoder-php/mapquest-provider.git", + "reference": "8c7b4b415bb606d6dbb7e6c61233be25f4bfe10b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/geocoder-php/mapquest-provider/zipball/8c7b4b415bb606d6dbb7e6c61233be25f4bfe10b", + "reference": "8c7b4b415bb606d6dbb7e6c61233be25f4bfe10b", + "shasum": "" + }, + "require": { + "geocoder-php/common-http": "^4.0", + "php": "^7.3 || ^8.0", + "willdurand/geocoder": "^4.0" + }, + "provide": { + "geocoder-php/provider-implementation": "1.0" + }, + "require-dev": { + "geocoder-php/provider-integration-tests": "^1.1", + "php-http/curl-client": "^2.2", + "php-http/message": "^1.0", + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Geocoder\\Provider\\MapQuest\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William Durand", + "email": "william.durand1@gmail.com" + } + ], + "description": "Geocoder MapQuest adapter", + "homepage": "http://geocoder-php.org/Geocoder/", + "support": { + "source": "https://github.com/geocoder-php/mapquest-provider/tree/4.2.0" + }, + "time": "2020-12-21T16:41:18+00:00" + }, { "name": "grasmash/expander", "version": "1.0.0", @@ -10343,6 +10781,46 @@ }, "time": "2021-03-21T15:43:46+00:00" }, + { + "name": "phayes/geophp", + "version": "1.2", + "source": { + "type": "git", + "url": "https://github.com/phayes/geoPHP.git", + "reference": "015404e85b602e0df1f91441f8db0f9e98f7e567" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phayes/geoPHP/zipball/015404e85b602e0df1f91441f8db0f9e98f7e567", + "reference": "015404e85b602e0df1f91441f8db0f9e98f7e567", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "4.1.*" + }, + "type": "library", + "autoload": { + "classmap": [ + "geoPHP.inc" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2 or New-BSD" + ], + "authors": [ + { + "name": "Patrick Hayes" + } + ], + "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/phayes/geoPHP", + "support": { + "issues": "https://github.com/phayes/geoPHP/issues", + "source": "https://github.com/phayes/geoPHP/tree/master" + }, + "time": "2014-12-02T06:11:22+00:00" + }, { "name": "phenx/php-font-lib", "version": "0.5.4", @@ -10387,6 +10865,388 @@ }, "time": "2021-12-17T19:44:54+00:00" }, + { + "name": "php-http/discovery", + "version": "1.14.1", + "source": { + "type": "git", + "url": "https://github.com/php-http/discovery.git", + "reference": "de90ab2b41d7d61609f504e031339776bc8c7223" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/discovery/zipball/de90ab2b41d7d61609f504e031339776bc8c7223", + "reference": "de90ab2b41d7d61609f504e031339776bc8c7223", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "nyholm/psr7": "<1.0" + }, + "require-dev": { + "graham-campbell/phpspec-skip-example-extension": "^5.0", + "php-http/httplug": "^1.0 || ^2.0", + "php-http/message-factory": "^1.0", + "phpspec/phpspec": "^5.1 || ^6.1", + "puli/composer-plugin": "1.0.0-beta10" + }, + "suggest": { + "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Discovery\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Finds installed HTTPlug implementations and PSR-7 message factories", + "homepage": "http://php-http.org", + "keywords": [ + "adapter", + "client", + "discovery", + "factory", + "http", + "message", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/discovery/issues", + "source": "https://github.com/php-http/discovery/tree/1.14.1" + }, + "time": "2021-09-18T07:57:46+00:00" + }, + { + "name": "php-http/guzzle6-adapter", + "version": "v2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-http/guzzle6-adapter.git", + "reference": "9d1a45eb1c59f12574552e81fb295e9e53430a56" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/9d1a45eb1c59f12574552e81fb295e9e53430a56", + "reference": "9d1a45eb1c59f12574552e81fb295e9e53430a56", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^6.0", + "php": "^7.1 || ^8.0", + "php-http/httplug": "^2.0", + "psr/http-client": "^1.0" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "ext-curl": "*", + "php-http/client-integration-tests": "^2.0 || ^3.0", + "phpunit/phpunit": "^7.4 || ^8.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Adapter\\Guzzle6\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Guzzle 6 HTTP Adapter", + "homepage": "http://httplug.io", + "keywords": [ + "Guzzle", + "http" + ], + "support": { + "issues": "https://github.com/php-http/guzzle6-adapter/issues", + "source": "https://github.com/php-http/guzzle6-adapter/tree/v2.0.2" + }, + "time": "2021-03-02T10:52:33+00:00" + }, + { + "name": "php-http/httplug", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/httplug.git", + "reference": "f640739f80dfa1152533976e3c112477f69274eb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb", + "reference": "f640739f80dfa1152533976e3c112477f69274eb", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/promise": "^1.1", + "psr/http-client": "^1.0", + "psr/http-message": "^1.0" + }, + "require-dev": { + "friends-of-phpspec/phpspec-code-coverage": "^4.1", + "phpspec/phpspec": "^5.1 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eric GELOEN", + "email": "geloen.eric@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" + } + ], + "description": "HTTPlug, the HTTP client abstraction for PHP", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http" + ], + "support": { + "issues": "https://github.com/php-http/httplug/issues", + "source": "https://github.com/php-http/httplug/tree/2.3.0" + }, + "time": "2022-02-21T09:52:22+00:00" + }, + { + "name": "php-http/message", + "version": "1.13.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/message.git", + "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/message/zipball/7886e647a30a966a1a8d1dad1845b71ca8678361", + "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361", + "shasum": "" + }, + "require": { + "clue/stream-filter": "^1.5", + "php": "^7.1 || ^8.0", + "php-http/message-factory": "^1.0.2", + "psr/http-message": "^1.0" + }, + "provide": { + "php-http/message-factory-implementation": "1.0" + }, + "require-dev": { + "ergebnis/composer-normalize": "^2.6", + "ext-zlib": "*", + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "slim/slim": "^3.0" + }, + "suggest": { + "ext-zlib": "Used with compressor/decompressor streams", + "guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories", + "laminas/laminas-diactoros": "Used with Diactoros Factories", + "slim/slim": "Used with Slim Framework PSR-7 implementation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, + "autoload": { + "files": [ + "src/filters.php" + ], + "psr-4": { + "Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "HTTP Message related tools", + "homepage": "http://php-http.org", + "keywords": [ + "http", + "message", + "psr-7" + ], + "support": { + "issues": "https://github.com/php-http/message/issues", + "source": "https://github.com/php-http/message/tree/1.13.0" + }, + "time": "2022-02-11T13:41:14+00:00" + }, + { + "name": "php-http/message-factory", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-http/message-factory.git", + "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Factory interfaces for PSR-7 HTTP Message", + "homepage": "http://php-http.org", + "keywords": [ + "factory", + "http", + "message", + "stream", + "uri" + ], + "support": { + "issues": "https://github.com/php-http/message-factory/issues", + "source": "https://github.com/php-http/message-factory/tree/master" + }, + "time": "2015-12-19T14:08:53+00:00" + }, + { + "name": "php-http/promise", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/promise.git", + "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", + "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Joel Wurtz", + "email": "joel.wurtz@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Promise used for asynchronous HTTP requests", + "homepage": "http://httplug.io", + "keywords": [ + "promise" + ], + "support": { + "issues": "https://github.com/php-http/promise/issues", + "source": "https://github.com/php-http/promise/tree/1.1.0" + }, + "time": "2020-07-07T09:29:14+00:00" + }, { "name": "phpmailer/phpmailer", "version": "v6.5.4", @@ -10562,6 +11422,58 @@ }, "time": "2021-03-05T17:36:06+00:00" }, + { + "name": "psr/http-client", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client/tree/master" + }, + "time": "2020-06-29T06:28:15+00:00" + }, { "name": "psr/http-factory", "version": "1.0.1", @@ -14139,6 +15051,68 @@ "source": "https://github.com/wikimedia/composer-merge-plugin/tree/v2.0.1" }, "time": "2021-02-24T05:28:06+00:00" + }, + { + "name": "willdurand/geocoder", + "version": "4.5.0", + "source": { + "type": "git", + "url": "https://github.com/geocoder-php/php-common.git", + "reference": "b9a27dfbc06d012f4ff52b890fe52789e4978769" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/geocoder-php/php-common/zipball/b9a27dfbc06d012f4ff52b890fe52789e4978769", + "reference": "b9a27dfbc06d012f4ff52b890fe52789e4978769", + "shasum": "" + }, + "require": { + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "nyholm/nsa": "^1.1", + "phpunit/phpunit": "^9.5", + "symfony/stopwatch": "~2.5" + }, + "suggest": { + "symfony/stopwatch": "If you want to use the TimedGeocoder" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" + } + }, + "autoload": { + "psr-4": { + "Geocoder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William Durand", + "email": "william.durand1@gmail.com" + } + ], + "description": "Common files for PHP Geocoder", + "homepage": "http://geocoder-php.org", + "keywords": [ + "abstraction", + "geocoder", + "geocoding", + "geoip" + ], + "support": { + "source": "https://github.com/geocoder-php/php-common/tree/4.5.0" + }, + "time": "2022-01-07T14:44:30+00:00" } ], "packages-dev": [], diff --git a/config/sync/core.entity_form_display.node.projet.default.yml b/config/sync/core.entity_form_display.node.projet.default.yml index bfe6d7c..32846a6 100644 --- a/config/sync/core.entity_form_display.node.projet.default.yml +++ b/config/sync/core.entity_form_display.node.projet.default.yml @@ -4,8 +4,10 @@ status: true dependencies: config: - field.field.node.projet.body + - field.field.node.projet.field_adresse - field.field.node.projet.field_encours_fini - field.field.node.projet.field_fichiers + - field.field.node.projet.field_geofield - field.field.node.projet.field_incube - field.field.node.projet.field_liens - field.field.node.projet.field_neuf_rehabilitation @@ -16,8 +18,10 @@ dependencies: - image.style.thumbnail - node.type.projet module: + - address - field_group - file + - geofield - image - link - paragraphs @@ -28,6 +32,7 @@ third_party_settings: - group_principal - group_liens - group_media + - group_carte label: Tabs region: content parent_name: '' @@ -108,11 +113,33 @@ third_party_settings: formatter: closed description: '' required_fields: true + group_carte: + children: + - field_adresse + - field_geofield + label: Carte + region: content + parent_name: group_tabs + weight: 19 + format_type: tab + format_settings: + classes: '' + show_empty_fields: false + id: '' + formatter: closed + description: '' + required_fields: true id: node.projet.default targetEntityType: node bundle: projet mode: default content: + field_adresse: + type: address_default + weight: 28 + region: content + settings: { } + third_party_settings: { } field_encours_fini: type: options_select weight: 3 @@ -126,6 +153,13 @@ content: settings: progress_indicator: throbber third_party_settings: { } + field_geofield: + type: geofield_latlon + weight: 29 + region: content + settings: + html5_geolocation: false + third_party_settings: { } field_incube: type: boolean_checkbox weight: 1 @@ -135,7 +169,7 @@ content: third_party_settings: { } field_liens: type: link_default - weight: 5 + weight: 6 region: content settings: placeholder_url: '' diff --git a/config/sync/core.entity_view_display.node.projet.default.yml b/config/sync/core.entity_view_display.node.projet.default.yml index 432dcc6..5b11b91 100644 --- a/config/sync/core.entity_view_display.node.projet.default.yml +++ b/config/sync/core.entity_view_display.node.projet.default.yml @@ -4,8 +4,10 @@ status: true dependencies: config: - field.field.node.projet.body + - field.field.node.projet.field_adresse - field.field.node.projet.field_encours_fini - field.field.node.projet.field_fichiers + - field.field.node.projet.field_geofield - field.field.node.projet.field_incube - field.field.node.projet.field_liens - field.field.node.projet.field_neuf_rehabilitation @@ -15,8 +17,10 @@ dependencies: - field.field.node.projet.field_textes - node.type.projet module: + - address - entity_reference_revisions - file + - geofield - image - link - manage_display @@ -34,6 +38,13 @@ content: third_party_settings: { } weight: 101 region: content + field_adresse: + type: address_default + label: above + settings: { } + third_party_settings: { } + weight: 111 + region: content field_encours_fini: type: list_default label: above @@ -49,6 +60,15 @@ content: third_party_settings: { } weight: 107 region: content + field_geofield: + type: geofield_default + label: above + settings: + output_format: wkt + output_escape: true + third_party_settings: { } + weight: 112 + region: content field_incube: type: boolean label: above diff --git a/config/sync/core.entity_view_display.node.projet.teaser.yml b/config/sync/core.entity_view_display.node.projet.teaser.yml index 6d80ca1..e511f91 100644 --- a/config/sync/core.entity_view_display.node.projet.teaser.yml +++ b/config/sync/core.entity_view_display.node.projet.teaser.yml @@ -5,8 +5,10 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.projet.body + - field.field.node.projet.field_adresse - field.field.node.projet.field_encours_fini - field.field.node.projet.field_fichiers + - field.field.node.projet.field_geofield - field.field.node.projet.field_incube - field.field.node.projet.field_liens - field.field.node.projet.field_neuf_rehabilitation @@ -55,8 +57,10 @@ content: hidden: body: true created: true + field_adresse: true field_encours_fini: true field_fichiers: true + field_geofield: true field_liens: true field_neuf_rehabilitation: true field_partenaires: true diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 6e1d278..381be9f 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -3,6 +3,7 @@ _core: langcode: fr module: actions_permissions: 0 + address: 0 admin_toolbar: 0 admin_toolbar_links_access_filter: 0 administerusersbyrole: 0 @@ -55,6 +56,11 @@ module: filter: 0 filter_perms: 0 formatter_suite: 0 + geocoder: 0 + geocoder_address: 0 + geocoder_field: 0 + geocoder_geofield: 0 + geofield: 0 help: 0 honeypot: 0 image: 0 diff --git a/config/sync/field.field.node.projet.field_adresse.yml b/config/sync/field.field.node.projet.field_adresse.yml new file mode 100644 index 0000000..c454a60 --- /dev/null +++ b/config/sync/field.field.node.projet.field_adresse.yml @@ -0,0 +1,61 @@ +uuid: 0d64a639-2638-4bc8-8261-3d71a0d5c2c8 +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_adresse + - node.type.projet + module: + - address +id: node.projet.field_adresse +field_name: field_adresse +entity_type: node +bundle: projet +label: Adresse +description: '' +required: false +translatable: false +default_value: + - + langcode: null + country_code: FR + administrative_area: null + locality: '' + dependent_locality: null + postal_code: null + sorting_code: null + address_line1: null + address_line2: null + organization: null + given_name: null + additional_name: null + family_name: null +default_value_callback: '' +settings: + available_countries: { } + langcode_override: '' + field_overrides: + givenName: + override: hidden + additionalName: + override: hidden + familyName: + override: hidden + organization: + override: hidden + addressLine1: + override: hidden + addressLine2: + override: hidden + postalCode: + override: hidden + sortingCode: + override: hidden + dependentLocality: + override: hidden + locality: + override: optional + administrativeArea: + override: hidden + fields: { } +field_type: address diff --git a/config/sync/field.field.node.projet.field_geofield.yml b/config/sync/field.field.node.projet.field_geofield.yml new file mode 100644 index 0000000..e605b8e --- /dev/null +++ b/config/sync/field.field.node.projet.field_geofield.yml @@ -0,0 +1,38 @@ +uuid: 8438e670-29f9-4cf7-8a49-66b0d63ef5f4 +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_geofield + - node.type.projet + module: + - geocoder_field + - geofield +third_party_settings: + geocoder_field: + method: geocode + weight: 0 + field: field_adresse + skip_not_empty_value: false + disabled: true + hidden: false + providers: + - mapquest + dumper: wkt + delta_handling: default + failure: + handling: preserve + status_message: true + log: true +id: node.projet.field_geofield +field_name: field_geofield +entity_type: node +bundle: projet +label: geofield +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: geofield diff --git a/config/sync/field.storage.node.field_adresse.yml b/config/sync/field.storage.node.field_adresse.yml new file mode 100644 index 0000000..a82d283 --- /dev/null +++ b/config/sync/field.storage.node.field_adresse.yml @@ -0,0 +1,19 @@ +uuid: 67d8d124-62a3-40da-86cc-c87765ad9716 +langcode: fr +status: true +dependencies: + module: + - address + - node +id: node.field_adresse +field_name: field_adresse +entity_type: node +type: address +settings: { } +module: address +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_geofield.yml b/config/sync/field.storage.node.field_geofield.yml new file mode 100644 index 0000000..c449fe5 --- /dev/null +++ b/config/sync/field.storage.node.field_geofield.yml @@ -0,0 +1,20 @@ +uuid: ee49589c-d1cc-4d41-9fe4-49578a94d009 +langcode: fr +status: true +dependencies: + module: + - geofield + - node +id: node.field_geofield +field_name: field_geofield +entity_type: node +type: geofield +settings: + backend: geofield_backend_default +module: geofield +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/geocoder.geocoder_provider.mapquest.yml b/config/sync/geocoder.geocoder_provider.mapquest.yml new file mode 100644 index 0000000..48e8d43 --- /dev/null +++ b/config/sync/geocoder.geocoder_provider.mapquest.yml @@ -0,0 +1,13 @@ +uuid: 98ae0755-fbef-43d3-af7b-9e3fe0250362 +langcode: fr +status: true +dependencies: { } +id: mapquest +label: MapQuest +plugin: mapquest +configuration: + throttle: + period: null + limit: null + apiKey: BfGpTmi8PmaGkWNCAwlH6qW5jILApFGb + licensed: false diff --git a/config/sync/geocoder.settings.yml b/config/sync/geocoder.settings.yml new file mode 100644 index 0000000..4817487 --- /dev/null +++ b/config/sync/geocoder.settings.yml @@ -0,0 +1,5 @@ +_core: + default_config_hash: 5P0QjCOMc-OzCEJUXsMfJWVEj_K97A4OFOhGqnb5Seg +langcode: fr +geocoder_presave_disabled: false +cache: true diff --git a/config/sync/node.type.static.yml b/config/sync/node.type.static.yml index 284570c..e7e9348 100644 --- a/config/sync/node.type.static.yml +++ b/config/sync/node.type.static.yml @@ -10,7 +10,7 @@ third_party_settings: parent: '' _core: default_config_hash: Gbpk2gnakDOKmsOEikWuVfLDOZ8rtrlW-UoZFjqWCF0 -name: Static +name: Statique type: static description: 'Static Page' help: '' diff --git a/web/sites/default/default.services.yml b/web/sites/default/default.services.yml index d57cf0e..d21a5c7 100644 --- a/web/sites/default/default.services.yml +++ b/web/sites/default/default.services.yml @@ -11,10 +11,11 @@ parameters: # @default 100 gc_divisor: 100 # - # Set session lifetime (in seconds), i.e. the time from the user's last - # visit to the active session may be deleted by the session garbage - # collector. When a session is deleted, authenticated users are logged out, - # and the contents of the user's $_SESSION variable is discarded. + # Set session lifetime (in seconds), i.e. the grace period for session + # data. Sessions are deleted by the session garbage collector after one + # session lifetime has elapsed since the user's last visit. When a session + # is deleted, authenticated users are logged out, and the contents of the + # user's session is discarded. # @default 200000 gc_maxlifetime: 200000 # diff --git a/web/sites/default/default.settings.php b/web/sites/default/default.settings.php index 64c749d..7188902 100644 --- a/web/sites/default/default.settings.php +++ b/web/sites/default/default.settings.php @@ -138,50 +138,17 @@ $databases = []; * request as needed. The fourth line creates a new database with a name of * "extra". * - * You can optionally set prefixes for some or all database table names - * by using the 'prefix' setting. If a prefix is specified, the table - * name will be prepended with its value. Be sure to use valid database - * characters only, usually alphanumeric and underscore. If no prefixes - * are desired, leave it as an empty string ''. + * You can optionally set a prefix for all database table names by using the + * 'prefix' setting. If a prefix is specified, the table name will be prepended + * with its value. Be sure to use valid database characters only, usually + * alphanumeric and underscore. If no prefix is desired, do not set the 'prefix' + * key or set its value to an empty string ''. * - * To have all database names prefixed, set 'prefix' as a string: + * For example, to have all database table prefixed with 'main_', set: * @code * 'prefix' => 'main_', * @endcode * - * Per-table prefixes are deprecated as of Drupal 8.2, and will be removed in - * Drupal 9.0. After that, only a single prefix for all tables will be - * supported. - * - * To provide prefixes for specific tables, set 'prefix' as an array. - * The array's keys are the table names and the values are the prefixes. - * The 'default' element is mandatory and holds the prefix for any tables - * not specified elsewhere in the array. Example: - * @code - * 'prefix' => [ - * 'default' => 'main_', - * 'users' => 'shared_', - * 'sessions' => 'shared_', - * 'role' => 'shared_', - * 'authmap' => 'shared_', - * ], - * @endcode - * You can also use a reference to a schema/database as a prefix. This may be - * useful if your Drupal installation exists in a schema that is not the default - * or you want to access several databases from the same code base at the same - * time. - * Example: - * @code - * 'prefix' => [ - * 'default' => 'main.', - * 'users' => 'shared.', - * 'sessions' => 'shared.', - * 'role' => 'shared.', - * 'authmap' => 'shared.', - * ]; - * @endcode - * NOTE: MySQL and SQLite's definition of a schema is a database. - * * Advanced users can add or override initial commands to execute when * connecting to the database server, as well as PDO connection settings. For * example, to enable MySQL SELECT queries to exceed the max_join_size system