geocoder-php · Nyholm · May 13, 2017 · Apr 28, 2017 · May 12, 2017 · May 12, 2017
diff --git a/.styleci.yml b/.styleci.yml
@@ -10,3 +10,4 @@ enabled:
 
 disabled:
     - phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198
+    - phpdoc_summary # Currenly some issues 2017-05-13
diff --git a/.travis.yml b/.travis.yml
@@ -1,34 +1,89 @@
+language: php
 sudo: false
 
 addons:
-  apt:
-    packages:
-    - libgeoip-dev
-
-language: php
+    apt_packages:
+        - parallel
+        - libgeoip-dev
 
 env:
     global:
-        - deps=""
-
-php:
-    - 5.5
-    - 5.6
-    - 7.0
-    - 7.1
-    - hhvm
+        - MIN_PHP=5.5.9
 
 matrix:
     fast_finish: true
     include:
         - php: 5.5
           env: deps="low"
+        - php: 5.5
+        - php: 5.6
+        - php: 7.0
+        - php: 7.1
+        - php: hhvm
 
-before_script:
+before_install:
     - if [ "$TRAVIS_PHP_VERSION" != "hhvm" && "$TRAVIS_PHP_VERSION" != "7.0" ]; then pecl install geoip; fi
-    - composer self-update
-    - if [ "$deps" = "low" ]; then composer update --prefer-dist --prefer-lowest; fi
-    - if [ "$deps" = "" ]; then composer install --prefer-dist --no-interaction; fi
     - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then composer require "geoip/geoip"; fi
+    - |
+      # General configuration
+      stty cols 120
+      PHP=$TRAVIS_PHP_VERSION
+      [ -d ~/.composer ] || mkdir ~/.composer
+      export PHPUNIT=$(readlink -f ./phpunit)
+      export PHPUNIT_X="$PHPUNIT --exclude-group benchmark"
+      export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
+
+      # tfold is a helper to create folded reports
+      tfold () {
+          title=$1
+          fold=$(echo $title | sed -r 's/[^-_A-Za-z\d]+/./g')
+          shift
+          echo -e "travis_fold:start:$fold\\n\\e[1;34m$title\\e[0m"
+          bash -xc "$*" 2>&1 &&
+              echo -e "\\e[32mOK\\e[0m $title\\n\\ntravis_fold:end:$fold" ||
+              ( echo -e "\\e[41mKO\\e[0m $title\\n" && exit 1 )
+      }
+      export -f tfold
+
+      # Matrix lines for intermediate PHP versions are skipped for pull requests
+      if [[ ! $deps && ! $PHP = ${MIN_PHP%.*} && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
+          deps=skip
+          skip=1
+      else
+          COMPONENTS=$(find src -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n')
+      fi
+
+      # php.ini configuration
+      if [[ $PHP = hhvm* ]]; then
+          INI=/etc/hhvm/php.ini
+      else
+          INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+          phpenv config-rm xdebug.ini || echo "xdebug not available"
+      fi
+      echo memory_limit = -1 >> $INI
+
+install:
+  - if [[ ! $skip ]]; then $COMPOSER_UP; fi
+  - |
+    run_tests () {
+        set -e
+        if [[ $skip ]]; then
+            echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
+        elif [[ $deps = high ]]; then
+            echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
+        elif [[ $deps = low ]]; then
+            echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'" &&
+            # Test the PhpUnit bridge on PHP 5.5, using the original phpunit script
+            tfold src/Symfony/Bridge/PhpUnit \
+            "cd src/Symfony/Bridge/PhpUnit && wget https://phar.phpunit.de/phpunit-4.8.phar && phpenv global 5.3 && composer update --no-progress --ansi && php phpunit-4.8.phar"
+        elif [[ $PHP = hhvm* ]]; then
+            $PHPUNIT --exclude-group benchmark,intl-data
+        else
+            echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
+            tfold tty-group $PHPUNIT --group tty
+        fi
+    }
+
+script:
+    - (run_tests)
 
-script: ./vendor/bin/phpunit --coverage-text
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 * Introduced `GeocodeQuery` and `ReverseQuery`. 
 * `Provider` and `Geocoder` interfaces has been updated to use query objects
 * All providers are stateless and immutable. 
+* Moved **all** providers to new namespaces. Previous `Geocoder\Provider\BingMaps` is now located at `Geocoder\Provider\BingMaps\BingMaps`
 * Added: Interface for `Geocoder\Model\AddressCollection` called `Geocoder\Collection`. Public APIs are updated to type hint for `Geocoder\GeocoderResult`.
 * Added: Interface for `Geocoder\Model\Address` called `Geocoder\Location`. Public APIs are updated to type hint for `Geocoder\Location`.
 * Added: GeoArray dumper

diff --git a/composer.json b/composer.json
@@ -21,12 +21,14 @@
         "php-http/discovery": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^4.8 || ^5.4",
+        "symfony/phpunit-bridge": "^3.2",
         "geoip2/geoip2": "~2.0",
         "symfony/stopwatch": "~2.5",
         "php-http/message": "^1.0",
-        "php-http/guzzle6-adapter": "^1.0",
-        "php-http/mock-client": "^0.3.0"
+        "php-http/curl-client": "^1.7",
+        "php-http/mock-client": "^0.3.0",
+        "guzzlehttp/psr7": "^1.4"
     },
     "suggest": {
         "ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",
@@ -35,7 +37,9 @@
         "symfony/stopwatch": "If you want to use the TimedGeocoder"
     },
     "autoload": {
-        "psr-4": { "Geocoder\\": "src/" }
+        "psr-4": {
+            "Geocoder\\": ["src/Common", "src/"]
+        }
     },
     "autoload-dev": {
         "psr-4": { "Geocoder\\Tests\\": "tests/" }

diff --git a/phpunit b/phpunit
@@ -0,0 +1,9 @@
+#!/usr/bin/env php
+<?php
+
+if (!file_exists(__DIR__.'/vendor/phpunit/phpunit/phpunit')) {
+    echo "Unable to find the `PHPUnit` script in `vendor/phpunit/phpunit/`.\nPlease run `composer update` before running this command.\n";
+    exit(1);
+}
+
+require __DIR__.'/vendor/phpunit/phpunit/phpunit';
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -30,14 +30,28 @@
         <!-- <server name="MAXMIND_API_KEY" value="YOUR_API_KEY" /> -->
         <!-- <server name="IPINFODB_API_KEY" value="YOUR_API_KEY" /> -->
     </php>
+
     <testsuites>
         <testsuite name="Geocoder Test Suite">
             <directory>./tests/</directory>
+            <directory>./src/Common/Tests/</directory>
+            <directory>./src/Provider/*/Tests/</directory>
         </testsuite>
     </testsuites>
+
     <filter>
         <whitelist>
             <directory>./src/</directory>
+            <exclude>
+                <directory>./src/Common/Tests</directory>
+                <directory>./src/Provider/*/Tests</directory>
+                <directory>./src/Common/vendor</directory>
+                <directory>./src/Provider/*/vendor</directory>
+            </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+    </listeners>
 </phpunit>
diff --git a/src/Assert.php → src/Common/Assert.php b/src/Assert.php → src/Common/Assert.php
diff --git a/src/Collection.php → src/Common/Collection.php b/src/Collection.php → src/Common/Collection.php
diff --git a/src/Dumper/Dumper.php → src/Common/Dumper/Dumper.php b/src/Dumper/Dumper.php → src/Common/Dumper/Dumper.php
diff --git a/src/Dumper/GeoArray.php → src/Common/Dumper/GeoArray.php b/src/Dumper/GeoArray.php → src/Common/Dumper/GeoArray.php
diff --git a/src/Dumper/GeoJson.php → src/Common/Dumper/GeoJson.php b/src/Dumper/GeoJson.php → src/Common/Dumper/GeoJson.php
diff --git a/src/Dumper/Gpx.php → src/Common/Dumper/Gpx.php b/src/Dumper/Gpx.php → src/Common/Dumper/Gpx.php
diff --git a/src/Dumper/Kml.php → src/Common/Dumper/Kml.php b/src/Dumper/Kml.php → src/Common/Dumper/Kml.php
diff --git a/src/Dumper/Wkb.php → src/Common/Dumper/Wkb.php b/src/Dumper/Wkb.php → src/Common/Dumper/Wkb.php
diff --git a/src/Dumper/Wkt.php → src/Common/Dumper/Wkt.php b/src/Dumper/Wkt.php → src/Common/Dumper/Wkt.php
diff --git a/src/Exception/ChainZeroResults.php → src/Common/Exception/ChainZeroResults.php b/src/Exception/ChainZeroResults.php → src/Common/Exception/ChainZeroResults.php
diff --git a/src/Exception/CollectionIsEmpty.php → src/Common/Exception/CollectionIsEmpty.php b/src/Exception/CollectionIsEmpty.php → src/Common/Exception/CollectionIsEmpty.php
diff --git a/src/Exception/Exception.php → src/Common/Exception/Exception.php b/src/Exception/Exception.php → src/Common/Exception/Exception.php
diff --git a/src/Exception/ExtensionNotLoaded.php → src/Common/Exception/ExtensionNotLoaded.php b/src/Exception/ExtensionNotLoaded.php → src/Common/Exception/ExtensionNotLoaded.php
diff --git a/src/Exception/FunctionNotFound.php → src/Common/Exception/FunctionNotFound.php b/src/Exception/FunctionNotFound.php → src/Common/Exception/FunctionNotFound.php
diff --git a/src/Exception/HttpError.php → src/Common/Exception/HttpError.php b/src/Exception/HttpError.php → src/Common/Exception/HttpError.php
diff --git a/src/Exception/InvalidArgument.php → src/Common/Exception/InvalidArgument.php b/src/Exception/InvalidArgument.php → src/Common/Exception/InvalidArgument.php
diff --git a/src/Exception/InvalidCredentials.php → src/Common/Exception/InvalidCredentials.php b/src/Exception/InvalidCredentials.php → src/Common/Exception/InvalidCredentials.php
diff --git a/src/Exception/InvalidServerResponse.php → ...ommon/Exception/InvalidServerResponse.php b/src/Exception/InvalidServerResponse.php → ...ommon/Exception/InvalidServerResponse.php
diff --git a/src/Exception/ProviderNotRegistered.php → ...ommon/Exception/ProviderNotRegistered.php b/src/Exception/ProviderNotRegistered.php → ...ommon/Exception/ProviderNotRegistered.php
diff --git a/src/Exception/QuotaExceeded.php → src/Common/Exception/QuotaExceeded.php b/src/Exception/QuotaExceeded.php → src/Common/Exception/QuotaExceeded.php
diff --git a/src/Exception/UnexpectedValue.php → src/Common/Exception/UnexpectedValue.php b/src/Exception/UnexpectedValue.php → src/Common/Exception/UnexpectedValue.php
diff --git a/src/Exception/UnsupportedOperation.php → ...Common/Exception/UnsupportedOperation.php b/src/Exception/UnsupportedOperation.php → ...Common/Exception/UnsupportedOperation.php
diff --git a/src/Exception/ZeroResults.php → src/Common/Exception/ZeroResults.php b/src/Exception/ZeroResults.php → src/Common/Exception/ZeroResults.php
diff --git a/src/Formatter/StringFormatter.php → src/Common/Formatter/StringFormatter.php b/src/Formatter/StringFormatter.php → src/Common/Formatter/StringFormatter.php
diff --git a/src/Geocoder.php → src/Common/Geocoder.php b/src/Geocoder.php → src/Common/Geocoder.php
diff --git a/src/GeocoderTrait.php → src/Common/GeocoderTrait.php b/src/GeocoderTrait.php → src/Common/GeocoderTrait.php
diff --git a/src/Location.php → src/Common/Location.php b/src/Location.php → src/Common/Location.php
diff --git a/src/Model/Address.php → src/Common/Model/Address.php b/src/Model/Address.php → src/Common/Model/Address.php
diff --git a/src/Model/AddressCollection.php → src/Common/Model/AddressCollection.php b/src/Model/AddressCollection.php → src/Common/Model/AddressCollection.php
diff --git a/src/Model/AddressFactory.php → src/Common/Model/AddressFactory.php b/src/Model/AddressFactory.php → src/Common/Model/AddressFactory.php
diff --git a/src/Model/AdminLevel.php → src/Common/Model/AdminLevel.php b/src/Model/AdminLevel.php → src/Common/Model/AdminLevel.php
diff --git a/src/Model/AdminLevelCollection.php → src/Common/Model/AdminLevelCollection.php b/src/Model/AdminLevelCollection.php → src/Common/Model/AdminLevelCollection.php
diff --git a/src/Model/Bounds.php → src/Common/Model/Bounds.php b/src/Model/Bounds.php → src/Common/Model/Bounds.php
diff --git a/src/Model/Coordinates.php → src/Common/Model/Coordinates.php b/src/Model/Coordinates.php → src/Common/Model/Coordinates.php
diff --git a/src/Model/Country.php → src/Common/Model/Country.php b/src/Model/Country.php → src/Common/Model/Country.php
diff --git a/src/Model/Query/GeocodeQuery.php → src/Common/Model/Query/GeocodeQuery.php b/src/Model/Query/GeocodeQuery.php → src/Common/Model/Query/GeocodeQuery.php
diff --git a/src/Model/Query/ReverseQuery.php → src/Common/Model/Query/ReverseQuery.php b/src/Model/Query/ReverseQuery.php → src/Common/Model/Query/ReverseQuery.php
diff --git a/src/Provider/AbstractHttpProvider.php → src/Common/Provider/AbstractHttpProvider.php b/src/Provider/AbstractHttpProvider.php → src/Common/Provider/AbstractHttpProvider.php
diff --git a/src/Provider/AbstractProvider.php → src/Common/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php → src/Common/Provider/AbstractProvider.php
diff --git a/src/Provider/IpAddressGeocoder.php → src/Common/Provider/IpAddressGeocoder.php b/src/Provider/IpAddressGeocoder.php → src/Common/Provider/IpAddressGeocoder.php
diff --git a/src/Provider/LocaleAwareGeocoder.php → src/Common/Provider/LocaleAwareGeocoder.php b/src/Provider/LocaleAwareGeocoder.php → src/Common/Provider/LocaleAwareGeocoder.php
diff --git a/src/Provider/Provider.php → src/Common/Provider/Provider.php b/src/Provider/Provider.php → src/Common/Provider/Provider.php
diff --git a/src/ProviderAggregator.php → src/Common/ProviderAggregator.php b/src/ProviderAggregator.php → src/Common/ProviderAggregator.php
diff --git a/src/StatefulGeocoder.php → src/Common/StatefulGeocoder.php b/src/StatefulGeocoder.php → src/Common/StatefulGeocoder.php
diff --git a/tests/Dumper/GeoArrayTest.php → src/Common/Tests/Dumper/GeoArrayTest.php b/tests/Dumper/GeoArrayTest.php → src/Common/Tests/Dumper/GeoArrayTest.php
diff --git a/tests/Dumper/GeoJsonTest.php → src/Common/Tests/Dumper/GeoJsonTest.php b/tests/Dumper/GeoJsonTest.php → src/Common/Tests/Dumper/GeoJsonTest.php
diff --git a/tests/Dumper/GpxTest.php → src/Common/Tests/Dumper/GpxTest.php b/tests/Dumper/GpxTest.php → src/Common/Tests/Dumper/GpxTest.php
diff --git a/tests/Dumper/KmlTest.php → src/Common/Tests/Dumper/KmlTest.php b/tests/Dumper/KmlTest.php → src/Common/Tests/Dumper/KmlTest.php
diff --git a/tests/Dumper/WkbTest.php → src/Common/Tests/Dumper/WkbTest.php b/tests/Dumper/WkbTest.php → src/Common/Tests/Dumper/WkbTest.php
diff --git a/tests/Dumper/WktTest.php → src/Common/Tests/Dumper/WktTest.php b/tests/Dumper/WktTest.php → src/Common/Tests/Dumper/WktTest.php
diff --git a/tests/Formatter/StringFormatterTest.php → ...n/Tests/Formatter/StringFormatterTest.php b/tests/Formatter/StringFormatterTest.php → ...n/Tests/Formatter/StringFormatterTest.php
diff --git a/tests/Model/AddressFactoryTest.php → ...Common/Tests/Model/AddressFactoryTest.php b/tests/Model/AddressFactoryTest.php → ...Common/Tests/Model/AddressFactoryTest.php
diff --git a/tests/Model/AddressTest.php → src/Common/Tests/Model/AddressTest.php b/tests/Model/AddressTest.php → src/Common/Tests/Model/AddressTest.php
diff --git a/tests/Provider/AbstractProviderTest.php → ...n/Tests/Provider/AbstractProviderTest.php b/tests/Provider/AbstractProviderTest.php → ...n/Tests/Provider/AbstractProviderTest.php
diff --git a/tests/ProviderAggregatorTest.php → src/Common/Tests/ProviderAggregatorTest.php b/tests/ProviderAggregatorTest.php → src/Common/Tests/ProviderAggregatorTest.php
diff --git a/tests/TimedGeocoderTest.php → src/Common/Tests/TimedGeocoderTest.php b/tests/TimedGeocoderTest.php → src/Common/Tests/TimedGeocoderTest.php
@@ -34,7 +34,7 @@ class TimedGeocoderTest extends TestCase
     protected function setUp()
     {
         $this->stopwatch = new Stopwatch();
-        $this->delegate = $this->getMock(Provider::class);
+        $this->delegate = $this->getMockBuilder(Provider::class)->getMock();
         $this->geocoder = new TimedGeocoder($this->delegate, $this->stopwatch);
     }
 

diff --git a/src/TimedGeocoder.php → src/Common/TimedGeocoder.php b/src/TimedGeocoder.php → src/Common/TimedGeocoder.php
diff --git a/src/Common/composer.json b/src/Common/composer.json
@@ -0,0 +1,47 @@
+{
+    "name": "willdurand/geocoder",
+    "type": "library",
+    "description": "Common files for PHP Geocoder",
+    "keywords": ["geocoder", "geocoding", "abstraction", "geoip"],
+    "homepage": "http://geocoder-php.org",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "William Durand",
+            "email": "william.durand1@gmail.com"
+        }
+    ],
+    "require": {
+        "php": "^5.5 || ^7.0",
+        "igorw/get-in": "^1.0",
+        "psr/http-message-implementation": "^1.0",
+        "php-http/client-implementation": "^1.0",
+        "php-http/message-factory": "^1.0.2",
+        "php-http/httplug": "^1.0",
+        "php-http/discovery": "^1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8",
+        "symfony/stopwatch": "~2.5",
+        "php-http/message": "^1.0",
+        "php-http/curl-client": "^1.7",
+        "php-http/mock-client": "^0.3.0",
+        "guzzlehttp/psr7": "^1.4"
+    },
+    "suggest": {
+        "symfony/stopwatch": "If you want to use the TimedGeocoder"
+    },
+    "autoload": {
+        "psr-4": {
+            "Geocoder\\": ""
+        }
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.0-dev"
+        }
+    }
+}
diff --git a/src/Common/phpunit.xml.dist b/src/Common/phpunit.xml.dist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Geocoder Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Provider/ArcGISOnline/.gitignore b/src/Provider/ArcGISOnline/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/ArcGISOnline.php → src/Provider/ArcGISOnline/ArcGISOnline.php b/src/Provider/ArcGISOnline.php → src/Provider/ArcGISOnline/ArcGISOnline.php
@@ -8,14 +8,16 @@
  * @license    MIT License
  */
 
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\ArcGISOnline;
 
 use Geocoder\Exception\InvalidArgument;
 use Geocoder\Exception\InvalidServerResponse;
 use Geocoder\Exception\UnsupportedOperation;
 use Geocoder\Exception\ZeroResults;
 use Geocoder\Model\Query\GeocodeQuery;
 use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**

diff --git a/tests/Provider/ArcGISOnlineTest.php → ...r/ArcGISOnline/Tests/ArcGISOnlineTest.php b/tests/Provider/ArcGISOnlineTest.php → ...r/ArcGISOnline/Tests/ArcGISOnlineTest.php
@@ -8,13 +8,13 @@
  * @license    MIT License
  */
 
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\ArcGISOnlineTest\Tests;
 
 use Geocoder\Location;
 use Geocoder\Model\Query\GeocodeQuery;
 use Geocoder\Model\Query\ReverseQuery;
 use Geocoder\Tests\TestCase;
-use Geocoder\Provider\ArcGISOnline;
+use Geocoder\Provider\ArcGISOnline\ArcGISOnline;
 
 class ArcGISOnlineTest extends TestCase
 {

diff --git a/src/Provider/ArcGISOnline/composer.json b/src/Provider/ArcGISOnline/composer.json
@@ -0,0 +1,37 @@
+{
+    "name": "geocoder-php/arcgis-online-provider",
+    "type": "library",
+    "description": "Geocoder ArcGIS Online adapter",
+    "keywords": [],
+    "homepage": "http://geocoder-php.org/Geocoder/",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "William Durand",
+            "email": "william.durand1@gmail.com"
+        }
+    ],
+    "require": {
+        "php": "^5.5 || ^7.0",
+        "willdurand/geocoder": "^4.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8",
+        "php-http/message": "^1.0",
+        "php-http/curl-client": "^1.7",
+        "symfony/phpunit-bridge": "^3.2",
+        "guzzlehttp/psr7": "^1.4"
+    },
+    "autoload": {
+        "psr-4": { "Geocoder\\Provider\\ArcGISOnine\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.0-dev"
+        }
+    }
+}
diff --git a/src/Provider/ArcGISOnline/phpunit.xml.dist b/src/Provider/ArcGISOnline/phpunit.xml.dist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Geocoder Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Provider/BingMaps/.gitignore b/src/Provider/BingMaps/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml