From 4e66d22109afe324f17fc2d4a5bcd2031bd7faaf Mon Sep 17 00:00:00 2001
From: jeroendedauw <jeroendedauw@gmail.com>
Date: Tue, 13 Sep 2016 14:40:21 +0200
Subject: [PATCH] Corrected name of geocoding adapter

Since it most certainly is not a decorator...
---
 includes/Geocoders.php                                    | 4 ++--
 ..._DecoratedGeocoder.php => Maps_OldGeocoderAdapter.php} | 5 ++++-
 ...tedGeocoderTest.php => MapsOldGeocoderAdapterTest.php} | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)
 rename includes/geocoders/{Maps_DecoratedGeocoder.php => Maps_OldGeocoderAdapter.php} (81%)
 rename tests/phpunit/geocoders/{DecoratedGeocoderTest.php => MapsOldGeocoderAdapterTest.php} (82%)

diff --git a/includes/Geocoders.php b/includes/Geocoders.php
index b3c9ea32a..af4f9b503 100644
--- a/includes/Geocoders.php
+++ b/includes/Geocoders.php
@@ -5,7 +5,7 @@
 use DataValues\Geo\Formatters\GeoCoordinateFormatter;
 use DataValues\Geo\Parsers\GeoCoordinateParser;
 use DataValues\Geo\Values\LatLongValue;
-use MapsDecoratedGeocoder;
+use MapsOldGeocoderAdapter;
 use MWException;
 use ValueParsers\ParseException;
 
@@ -351,7 +351,7 @@ protected static function getGeocoderInstance( $geocoderIdentifier ) {
 					$geocoder = new self::$registeredGeocoders[$geocoderIdentifier]( $geocoderIdentifier );
 				}
 				elseif ( self::$registeredGeocoders[$geocoderIdentifier] instanceof \Maps\Geocoders\Geocoder ) {
-					$geocoder = new MapsDecoratedGeocoder(
+					$geocoder = new MapsOldGeocoderAdapter(
 						self::$registeredGeocoders[$geocoderIdentifier],
 						$geocoderIdentifier
 					);
diff --git a/includes/geocoders/Maps_DecoratedGeocoder.php b/includes/geocoders/Maps_OldGeocoderAdapter.php
similarity index 81%
rename from includes/geocoders/Maps_DecoratedGeocoder.php
rename to includes/geocoders/Maps_OldGeocoderAdapter.php
index 8f248f9db..1b29ffa74 100644
--- a/includes/geocoders/Maps_DecoratedGeocoder.php
+++ b/includes/geocoders/Maps_OldGeocoderAdapter.php
@@ -3,12 +3,15 @@
 use Maps\Geocoders\Geocoder;
 
 /**
+ * Adapts the new Maps\Geocoders\Geocoder interface to the legacy
+ * Maps\Geocoder class hierarchy.
+ *
  * @since 3.8
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-final class MapsDecoratedGeocoder extends \Maps\Geocoder {
+final class MapsOldGeocoderAdapter extends \Maps\Geocoder {
 
 	private $geocoder;
 
diff --git a/tests/phpunit/geocoders/DecoratedGeocoderTest.php b/tests/phpunit/geocoders/MapsOldGeocoderAdapterTest.php
similarity index 82%
rename from tests/phpunit/geocoders/DecoratedGeocoderTest.php
rename to tests/phpunit/geocoders/MapsOldGeocoderAdapterTest.php
index 3fedbfb72..777d15d4d 100644
--- a/tests/phpunit/geocoders/DecoratedGeocoderTest.php
+++ b/tests/phpunit/geocoders/MapsOldGeocoderAdapterTest.php
@@ -8,21 +8,21 @@
 use Maps\Geocoders\NominatimGeocoder;
 
 /**
- * @covers MapsDecoratedGeocoder
+ * @covers MapsOldGeocoderAdapter
  *
  * @group Maps
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-class DecoratedGeocoderTest extends \PHPUnit_Framework_TestCase {
+class MapsOldGeocoderAdapterTest extends \PHPUnit_Framework_TestCase {
 
 	public function testWhenInnerGeocoderHasResult_itGetsReturnedInArrayForm() {
 		$geocoder = new InMemoryGeocoder( [
 			'New York' => new LatLongValue( 40.7642499, -73.9545249 )
 		] );
 
-		$decoratedGeocoder = new \MapsDecoratedGeocoder( $geocoder, 'maw' );
+		$decoratedGeocoder = new \MapsOldGeocoderAdapter( $geocoder, 'maw' );
 
 		$this->assertSame(
 			[
@@ -38,7 +38,7 @@ public function testWhenInnerGeocoderHasNoResult_falseIsReturned() {
 			'New York' => new LatLongValue( 40.7642499, -73.9545249 )
 		] );
 
-		$decoratedGeocoder = new \MapsDecoratedGeocoder( $geocoder, 'maw' );
+		$decoratedGeocoder = new \MapsOldGeocoderAdapter( $geocoder, 'maw' );
 
 		$this->assertFalse( $decoratedGeocoder->geocode( 'durkadurkastan' ) );
 	}