Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/Common/Model/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion src/Common/Provider/AbstractProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

namespace Geocoder\Provider;

use Geocoder\Geocoder;
use Geocoder\Location;
use Geocoder\Model\Address;

Expand Down
4 changes: 2 additions & 2 deletions src/Common/StatefulGeocoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function geocodeQuery(GeocodeQuery $query): Collection
$query = $query->withBounds($this->bounds);
}

$this->provider->geocodeQuery($query);
return $this->provider->geocodeQuery($query);
}

/**
Expand All @@ -116,7 +116,7 @@ public function reverseQuery(ReverseQuery $query): Collection
$query->withLocale($this->locale);
}

$this->provider->reverseQuery($query);
return $this->provider->reverseQuery($query);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Tests/TimedGeocoderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class TimedGeocoderTest extends TestCase
private $stopwatch;

/**
* @var Provider
* @var Provider|\PHPUnit_Framework_MockObject_MockObject
*/
private $delegate;

Expand Down
4 changes: 2 additions & 2 deletions src/Provider/FreeGeoIp/FreeGeoIp.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion src/Provider/GeoIP2/Tests/GeoIP2AdapterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Provider/Geonames/Geonames.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/Provider/GoogleMaps/Tests/GoogleMapsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
1 change: 0 additions & 1 deletion src/Provider/Nominatim/Nominatim.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)))) {
Expand Down
2 changes: 1 addition & 1 deletion src/Provider/TomTom/Tests/TomTomTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public function testGeocodeWithIPv6()
*/
public function testWithoutApiKey()
{
$provider = new TomTom($this->getMockedHttpClient(), '');
new TomTom($this->getMockedHttpClient(), '');
}

/**
Expand Down