Merge pull request #231 from JeroenDeDauw/rename

Corrected name of geocoding adapter
ProfessionalWiki · Sep 13, 2016 · 7567178 · 7567178
2 parents 632d955 + 4e66d22
commit 7567178
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git 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/...udes/geocoders/Maps_DecoratedGeocoder.php → ...des/geocoders/Maps_OldGeocoderAdapter.php b/...udes/geocoders/Maps_DecoratedGeocoder.php → ...des/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/...punit/geocoders/DecoratedGeocoderTest.php → .../geocoders/MapsOldGeocoderAdapterTest.php b/...punit/geocoders/DecoratedGeocoderTest.php → .../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' ) );
 	}