Fixed some code smell (#709)

* Fixed type issues

* Fixed code smell

Author: Nyholm

src/Common/Model/Address.php

@@ -244,11 +244,7 @@ public static function createFromArray(array $data)
                 continue;
             }
 
-            $adminLevels[] = new AdminLevel(
-                $adminLevel['level'],
-                $name,
-                $adminLevel['code'] ?? null
-            );
+            $adminLevels[] = new AdminLevel($adminLevel['level'], $name, $adminLevel['code'] ?? null);
         }
 
         return new static(

src/Common/Provider/AbstractProvider.php

@@ -12,7 +12,6 @@
 
 namespace Geocoder\Provider;
 
-use Geocoder\Geocoder;
 use Geocoder\Location;
 use Geocoder\Model\Address;
 

src/Common/StatefulGeocoder.php

@@ -103,7 +103,7 @@ public function geocodeQuery(GeocodeQuery $query): Collection
             $query = $query->withBounds($this->bounds);
         }
 
-        $this->provider->geocodeQuery($query);
+        return $this->provider->geocodeQuery($query);
     }
 
     /**
@@ -116,7 +116,7 @@ public function reverseQuery(ReverseQuery $query): Collection
             $query->withLocale($this->locale);
         }
 
-        $this->provider->reverseQuery($query);
+        return $this->provider->reverseQuery($query);
     }
 
     /**

src/Common/Tests/TimedGeocoderTest.php

@@ -26,7 +26,7 @@ class TimedGeocoderTest extends TestCase
     private $stopwatch;
 
     /**
-     * @var Provider
+     * @var Provider|\PHPUnit_Framework_MockObject_MockObject
      */
     private $delegate;
 

src/Provider/FreeGeoIp/FreeGeoIp.php

@@ -50,8 +50,8 @@ public function geocodeQuery(GeocodeQuery $query): Collection
         $data = json_decode($content, true);
         $builder = new AddressBuilder($this->getName());
 
-        if (!empty($data['region_name']) || !empty($data['region_code'])) {
-            $builder->addAdminLevel(1, $data['region_name'] ?? null, $data['region_code'] ?? null);
+        if (!empty($data['region_name'])) {
+            $builder->addAdminLevel(1, $data['region_name'], $data['region_code'] ?? null);
         }
 
         if ($data['latitude'] !== 0 || $data['longitude'] !== 0) {

src/Provider/GeoIP2/Tests/GeoIP2AdapterTest.php

@@ -14,11 +14,12 @@
 
 use Geocoder\Provider\GeoIP2\GeoIP2Adapter;
 use RuntimeException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Jens Wiese <jens@howtrueisfalse.de>
  */
-class GeoIP2AdapterTest extends \PHPUnit\Framework\TestCase
+class GeoIP2AdapterTest extends TestCase
 {
     /**
      * @var GeoIP2Adapter

src/Provider/Geonames/Geonames.php

@@ -139,8 +139,8 @@ private function executeQuery(string $url, string $locale = null): AddressCollec
             for ($level = 1; $level <= AdminLevelCollection::MAX_LEVEL_DEPTH; ++$level) {
                 $adminNameProp = 'adminName'.$level;
                 $adminCodeProp = 'adminCode'.$level;
-                if (!empty($item->$adminNameProp) || !empty($item->$adminCodeProp)) {
-                    $builder->addAdminLevel($level, $item->$adminNameProp ?? null, $item->$adminCodeProp ?? null);
+                if (!empty($item->$adminNameProp)) {
+                    $builder->addAdminLevel($level, $item->$adminNameProp, $item->$adminCodeProp ?? null);
                 }
             }
 

src/Provider/GoogleMaps/Tests/GoogleMapsTest.php

@@ -15,6 +15,7 @@
 use Geocoder\Exception\InvalidServerResponse;
 use Geocoder\IntegrationTest\BaseTestCase;
 use Geocoder\Location;
+use Geocoder\Provider\GoogleMaps\Model\GoogleAddress;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
@@ -304,7 +305,7 @@ public function testGeocodeWithSupremise()
         $this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
         $this->assertCount(1, $results);
 
-        /** @var Location $result */
+        /** @var GoogleAddress $result */
         $result = $results->first();
         $this->assertInstanceOf('\Geocoder\Model\Address', $result);
         $this->assertEquals('61', $result->getSubpremise());

src/Provider/Nominatim/Nominatim.php

@@ -127,7 +127,6 @@ public function reverseQuery(ReverseQuery $query): Collection
     private function xmlResultToArray(\DOMElement $resultNode, \DOMElement $addressNode): Location
     {
         $builder = new AddressBuilder($this->getName());
-        $adminLevels = [];
 
         foreach (['state', 'county'] as $i => $tagName) {
             if (null !== ($adminLevel = $this->getNodeValue($addressNode->getElementsByTagName($tagName)))) {

src/Provider/TomTom/Tests/TomTomTest.php

@@ -124,7 +124,7 @@ public function testGeocodeWithIPv6()
      */
     public function testWithoutApiKey()
     {
-        $provider = new TomTom($this->getMockedHttpClient(), '');
+        new TomTom($this->getMockedHttpClient(), '');
     }
 
     /**