Commit 6fb3aa40 authored by Italo Mairo's avatar Italo Mairo Committed by Italo Mairo
Browse files

Issue #3283651 by claudiu.cristea, itamair: Changing php-http/guzzle6-adapter... 

Issue #3283651 by claudiu.cristea, itamair: Changing php-http/guzzle6-adapter dependency into guzzlehttp/guzzle
parent b961729f

README.md

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ Throughout geocoder submodules **the following fields types are supported** 


####Using Geocoder operations behind Proxy



geocoder.http_adapter service is based on the Drupal 8 Guzzle implementation,

"geocoder.http_adapter" service is based on Guzzle implementation,

that is using settings array namespaced under $settings['http_client_config'].

Geocoding behind a proxy will be correctly set by (@see default.settings.php):

composer.json

+2 −2
Original line number Diff line number Diff line 
{

    "name": "drupal/geocoder",

    "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.",

    "type": "drupal-module",

    "license": "GPL-2.0-or-later",

    "minimum-stability": "dev",
@@ -25,7 +25,7 @@ 
    },

    "require": {

        "php": ">=7.1.0",

        "php-http/guzzle6-adapter": "^1.1 || ^2.0",

        "guzzlehttp/guzzle": "^6.5.2 || ^7.4.1",

        "php-http/message": "^1.6",

        "willdurand/geocoder": "^4.0",

        "davedevelopment/stiphle": "^0.9.2"

geocoder.services.yml

+1 −2
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ services: 
    arguments: ['@config.factory','@plugin.manager.geocoder.provider', '@module_handler']



  geocoder.http_adapter:

    class: Http\Adapter\Guzzle6\Client

    arguments: ['@http_client']

    class: GuzzleHttp\Client



  plugin.manager.geocoder.provider:

    class: Drupal\geocoder\ProviderPluginManager