Remove deprecated code (#678)

* Removed LocationFactory

* Removed `returnResults`

* Added default Location for localhost

* Removed getDefaults

* Added class comment

* cs

* Make sure to transform the country code

Author: Nyholm

Formatter/StringFormatter.php

@@ -50,14 +50,18 @@ class StringFormatter
      */
     public function format(Location $location, $format)
     {
+        if (null !== $code = $location->getCountry()->getCode()) {
+            $code = strtoupper($code);
+        }
+
         $replace = [
             self::STREET_NUMBER => $location->getStreetNumber(),
             self::STREET_NAME => $location->getStreetName(),
             self::LOCALITY => $location->getLocality(),
             self::POSTAL_CODE => $location->getPostalCode(),
             self::SUB_LOCALITY => $location->getSubLocality(),
             self::COUNTRY => $location->getCountry()->getName(),
-            self::COUNTRY_CODE => $location->getCountry()->getCode(),
+            self::COUNTRY_CODE => $code,
             self::TIMEZONE => $location->getTimezone(),
         ];
 

Model/LocationFactory.php

@@ -21,6 +21,7 @@
 
 /**
  * @author William Durand <william.durand1@gmail.com>
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
 abstract class AbstractHttpProvider extends AbstractProvider
 {

Provider/AbstractHttpProvider.php

@@ -13,74 +13,24 @@
 namespace Geocoder\Provider;
 
 use Geocoder\Geocoder;
-use Geocoder\Collection;
-use Geocoder\Model\AddressCollection;
-use Geocoder\Model\LocationFactory;
+use Geocoder\Location;
+use Geocoder\Model\Address;
 
 /**
  * @author William Durand <william.durand1@gmail.com>
  */
 abstract class AbstractProvider
 {
-    /**
-     * Returns the default results.
-     *
-     * @return array
-     *
-     * @deprecated Use LocationBuilder
-     */
-    protected function getDefaults()
-    {
-        return [
-            'latitude' => null,
-            'longitude' => null,
-            'bounds' => [
-                'south' => null,
-                'west' => null,
-                'north' => null,
-                'east' => null,
-            ],
-            'streetNumber' => null,
-            'streetName' => null,
-            'locality' => null,
-            'postalCode' => null,
-            'subLocality' => null,
-            'adminLevels' => [],
-            'country' => null,
-            'countryCode' => null,
-            'timezone' => null,
-        ];
-    }
-
     /**
      * Returns the results for the 'localhost' special case.
      *
-     * @return array
-     *
-     * @deprecated
+     * @return Location
      */
-    protected function getLocalhostDefaults()
+    protected function getLocationForLocalhost()
     {
-        return [
+        return Address::createFromArray([
             'locality' => 'localhost',
             'country' => 'localhost',
-        ];
-    }
-
-    /**
-     * @param array $data an array of data
-     *
-     * @return Collection
-     *
-     * @deprecated Use the AddressBuilder
-     */
-    protected function returnResults(array $data = [])
-    {
-        $addresses = [];
-        foreach ($data as $result) {
-            $addresses[] = LocationFactory::createLocation($result);
-        }
-
-        return new AddressCollection($addresses);
+        ]);
     }
 }

Provider/AbstractProvider.php

@@ -13,7 +13,7 @@
 namespace Geocoder\Tests\Dumper;
 
 use Geocoder\Dumper\GeoArray;
-use Geocoder\Model\LocationFactory;
+use Geocoder\Model\Address;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -33,7 +33,7 @@ protected function setUp()
 
     public function testDump()
     {
-        $address = LocationFactory::createLocation([]);
+        $address = Address::createFromArray([]);
         $expected = [
             'type' => 'Feature',
             'geometry' => [
@@ -53,7 +53,7 @@ public function testDump()
 
     public function testDumpWithData()
     {
-        $address = LocationFactory::createLocation([
+        $address = Address::createFromArray([
             'latitude' => 48.8631507,
             'longitude' => 2.3889114,
         ]);
@@ -77,7 +77,7 @@ public function testDumpWithData()
 
     public function testDumpWithBounds()
     {
-        $address = LocationFactory::createLocation([
+        $address = Address::createFromArray([
             'latitude' => 48.8631507,
             'longitude' => 2.3889114,
             'bounds' => [
@@ -113,7 +113,7 @@ public function testDumpWithBounds()
 
     public function testDumpWithProperties()
     {
-        $address = LocationFactory::createLocation([
+        $address = Address::createFromArray([
             'latitude' => 48.8631507,
             'longitude' => 2.3889114,
             'bounds' => [

Tests/Dumper/GeoArrayTest.php

@@ -13,7 +13,7 @@
 namespace Geocoder\Tests\Dumper;
 
 use Geocoder\Dumper\GeoJson;
-use Geocoder\Model\LocationFactory;
+use Geocoder\Model\Address;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -34,7 +34,7 @@ public function setUp()
 
     public function testDump()
     {
-        $address = LocationFactory::createLocation([]);
+        $address = Address::createFromArray([]);
         $expected = [
             'type' => 'Feature',
             'geometry' => [
@@ -54,7 +54,7 @@ public function testDump()
 
     public function testDumpWithData()
     {
-        $address = LocationFactory::createLocation([
+        $address = Address::createFromArray([
             'latitude' => 48.8631507,
             'longitude' => 2.3889114,
         ]);
@@ -78,7 +78,7 @@ public function testDumpWithData()
 
     public function testDumpWithBounds()
     {
-        $address = LocationFactory::createLocation([
+        $address = Address::createFromArray([
             'latitude' => 48.8631507,
             'longitude' => 2.3889114,
             'bounds' => [
@@ -114,7 +114,7 @@ public function testDumpWithBounds()
 
     public function testDumpWithProperties()
     {
-        $address = LocationFactory::createLocation([
+        $address = Address::createFromArray([
             'latitude' => 48.8631507,
             'longitude' => 2.3889114,
             'bounds' => [