Skip to content

Enable PHPStan Level 6 #1194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 31, 2023
Merged

Enable PHPStan Level 6 #1194

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2973ecc
Update phpstan.neon
jbelien Jul 16, 2023
dbd1b0d
Update YandexTest.php
jbelien Jul 16, 2023
b4d7b78
Update TomTomTest.php
jbelien Jul 16, 2023
f9064fd
Update PickPointTest.php
jbelien Jul 16, 2023
92e025f
Update PickPoint.php
jbelien Jul 16, 2023
97538d9
Update PhotonTest.php
jbelien Jul 16, 2023
44bc144
Update PeliasTest.php
jbelien Jul 16, 2023
9431874
Update OpenRouteServiceTest.php
jbelien Jul 16, 2023
b006a7b
Update OpenCageTest.php
jbelien Jul 16, 2023
8ba56d1
Update OpenCage.php
jbelien Jul 16, 2023
14aefda
Update NominatimTest.php
jbelien Jul 16, 2023
064fca4
Update MaxMindBinaryTest.php
jbelien Jul 16, 2023
51b2485
Update MaxMindTest.php
jbelien Jul 16, 2023
2f46f7a
[WIP] Apply PHPStan fixes
jbelien Jul 16, 2023
a96742c
Merge branch 'master' into phpstan/level-6
jbelien Jul 21, 2023
6464ef3
Apply PHPCSFixer fixes
jbelien Jul 21, 2023
9350c16
[WIP] Apply PHPStan fixes
jbelien Jul 21, 2023
734c5c5
[WIP] Apply PHPStan fixes
jbelien Jul 21, 2023
dbe4195
Revert "[WIP] Apply PHPStan fixes"
jbelien Jul 21, 2023
a781d7e
[WIP] Apply PHPStan fixes
jbelien Jul 21, 2023
16114f7
[WIP] Apply PHPStan fixes
jbelien Jul 21, 2023
b8872d6
Update phpstan-baseline.neon
jbelien Jul 21, 2023
117837f
Merge branch 'master' into phpstan/level-6
jbelien Jul 31, 2023
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
2 changes: 1 addition & 1 deletion phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
includes:
- phpstan-baseline.neon
parameters:
level: 5
level: 6
paths:
- src
excludePaths:
Expand Down
63 changes: 31 additions & 32 deletions src/Provider/Yandex/Tests/YandexTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

use Geocoder\Collection;
use Geocoder\IntegrationTest\BaseTestCase;
use Geocoder\Location;
use Geocoder\Provider\Yandex\Model\YandexAddress;
use Geocoder\Query\GeocodeQuery;
use Geocoder\Query\ReverseQuery;
Expand All @@ -25,18 +24,18 @@
*/
class YandexTest extends BaseTestCase
{
protected function getCacheDir()
protected function getCacheDir(): string
{
return __DIR__.'/.cached_responses';
}

public function testGetName()
public function testGetName(): void
{
$provider = new Yandex($this->getMockedHttpClient());
$this->assertEquals('yandex', $provider->getName());
}

public function testGeocodeWithLocalhostIPv4()
public function testGeocodeWithLocalhostIPv4(): void
{
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
$this->expectExceptionMessage('The Yandex provider does not support IP addresses, only street addresses.');
Expand All @@ -45,7 +44,7 @@ public function testGeocodeWithLocalhostIPv4()
$provider->geocodeQuery(GeocodeQuery::create('127.0.0.1'));
}

public function testGeocodeWithLocalhostIPv6()
public function testGeocodeWithLocalhostIPv6(): void
{
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
$this->expectExceptionMessage('The Yandex provider does not support IP addresses, only street addresses.');
Expand All @@ -54,7 +53,7 @@ public function testGeocodeWithLocalhostIPv6()
$provider->geocodeQuery(GeocodeQuery::create('::1'));
}

public function testGeocodeWithEmpty()
public function testGeocodeWithEmpty(): void
{
$provider = new Yandex($this->getMockedHttpClient('{"error":{"status":"400","message":"missing geocode parameter"}}'));
$result = $provider->geocodeQuery(GeocodeQuery::create('xx'));
Expand All @@ -63,7 +62,7 @@ public function testGeocodeWithEmpty()
$this->assertEquals(0, $result->count());
}

public function testGeocodeWithFakeAddress()
public function testGeocodeWithFakeAddress(): void
{
$provider = new Yandex($this->getHttpClient());
$result = $provider->geocodeQuery(GeocodeQuery::create('foobar'));
Expand All @@ -72,15 +71,15 @@ public function testGeocodeWithFakeAddress()
$this->assertEquals(0, $result->count());
}

public function testGeocodeWithRealAddress()
public function testGeocodeWithRealAddress(): void
{
$provider = new Yandex($this->getHttpClient());
$results = $provider->geocodeQuery(GeocodeQuery::create('10 avenue Gambetta, Paris, France'));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(1, $results);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->first();
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.863277, $result->getCoordinates()->getLatitude(), 0.01);
Expand All @@ -107,15 +106,15 @@ public function testGeocodeWithRealAddress()
$this->assertNull($result->getTimezone());
}

public function testGeocodeWithRealAddressWithUALocale()
public function testGeocodeWithRealAddressWithUALocale(): void
{
$provider = new Yandex($this->getHttpClient());
$results = $provider->geocodeQuery(GeocodeQuery::create('Copenhagen, Denmark')->withLocale('uk-UA'));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(3, $results);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->first();
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(55.675676, $result->getCoordinates()->getLatitude(), 0.01);
Expand All @@ -142,28 +141,28 @@ public function testGeocodeWithRealAddressWithUALocale()
$this->assertNull($result->getAdminLevels()->get(1)->getCode());
$this->assertNull($result->getTimezone());

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->get(1);
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(55.716853, $result->getCoordinates()->getLatitude(), 0.01);
$this->assertEqualsWithDelta(12.463837, $result->getCoordinates()->getLongitude(), 0.01);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->get(2);
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(55.590338, $result->getCoordinates()->getLatitude(), 0.01);
$this->assertEqualsWithDelta(12.130041, $result->getCoordinates()->getLongitude(), 0.01);
}

public function testGeocodeWithRealAddressWithUSLocale()
public function testGeocodeWithRealAddressWithUSLocale(): void
{
$provider = new Yandex($this->getHttpClient());
$results = $provider->geocodeQuery(GeocodeQuery::create('1600 Pennsylvania Ave, Washington')->withLocale('en-US'));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(5, $results);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->first();
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(38.897695, $result->getCoordinates()->getLatitude(), 0.01);
Expand All @@ -190,15 +189,15 @@ public function testGeocodeWithRealAddressWithUSLocale()
$this->assertNull($result->getTimezone());
}

public function testGeocodeWithRealAddressWithBYLocale()
public function testGeocodeWithRealAddressWithBYLocale(): void
{
$provider = new Yandex($this->getHttpClient());
$results = $provider->geocodeQuery(GeocodeQuery::create('ул.Ленина, 19, Минск 220030, Республика Беларусь')->withLocale('be-BY'));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(1, $results);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->first();
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(53.898077, $result->getCoordinates()->getLatitude(), 0.01);
Expand All @@ -224,15 +223,15 @@ public function testGeocodeWithRealAddressWithBYLocale()
$this->assertNull($result->getTimezone());
}

public function testReverseWithRealCoordinates()
public function testReverseWithRealCoordinates(): void
{
$provider = new Yandex($this->getHttpClient());
$results = $provider->reverseQuery(ReverseQuery::fromCoordinates(48.863216489553, 2.388771995902061));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(5, $results);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->first();
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.863212, $result->getCoordinates()->getLatitude(), 0.01);
Expand All @@ -259,28 +258,28 @@ public function testReverseWithRealCoordinates()
$this->assertNull($result->getAdminLevels()->get(1)->getCode());
$this->assertNull($result->getTimezone());

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->get(1);
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.864848, $result->getCoordinates()->getLatitude(), 0.01);
$this->assertEqualsWithDelta(2.3993549, $result->getCoordinates()->getLongitude(), 0.01);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->get(2);
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.856929, $result->getCoordinates()->getLatitude(), 0.01);
$this->assertEqualsWithDelta(2.392115, $result->getCoordinates()->getLongitude(), 0.01);
}

public function testReverseWithRealCoordinatesWithUSLocaleAndStreeToponym()
public function testReverseWithRealCoordinatesWithUSLocaleAndStreeToponym(): void
{
$provider = new Yandex($this->getHttpClient(), 'street');
$results = $provider->reverseQuery(ReverseQuery::fromCoordinates(48.863216489553, 2.388771995902061)->withLocale('en-US'));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(5, $results);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->first();
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.87132, $result->getCoordinates()->getLatitude(), 0.01);
Expand All @@ -307,40 +306,40 @@ public function testReverseWithRealCoordinatesWithUSLocaleAndStreeToponym()
$this->assertNull($result->getAdminLevels()->get(1)->getCode());
$this->assertNull($result->getTimezone());

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->get(1);
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.863230, $result->getCoordinates()->getLatitude(), 0.01);
$this->assertEqualsWithDelta(2.388261, $result->getCoordinates()->getLongitude(), 0.01);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->get(2);
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.866022, $result->getCoordinates()->getLatitude(), 0.01);
$this->assertEqualsWithDelta(2.389662, $result->getCoordinates()->getLongitude(), 0.01);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->get(3);
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.863918, $result->getCoordinates()->getLatitude(), 0.01);
$this->assertEqualsWithDelta(2.387767, $result->getCoordinates()->getLongitude(), 0.01);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->get(4);
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(48.863787, $result->getCoordinates()->getLatitude(), 0.01);
$this->assertEqualsWithDelta(2.389600, $result->getCoordinates()->getLongitude(), 0.01);
}

public function testReverseWithRealCoordinatesWithUALocaleAndHouseToponym()
public function testReverseWithRealCoordinatesWithUALocaleAndHouseToponym(): void
{
$provider = new Yandex($this->getHttpClient(), 'house');
$results = $provider->reverseQuery(ReverseQuery::fromCoordinates(60.4539471768582, 22.2567842183875)->withLocale('uk-UA'));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(5, $results);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->first();
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(60.454462, $result->getCoordinates()->getLatitude(), 0.01);
Expand All @@ -367,15 +366,15 @@ public function testReverseWithRealCoordinatesWithUALocaleAndHouseToponym()
$this->assertNull($result->getTimezone());
}

public function testReverseWithRealCoordinatesWithTRLocaleAndLocalityToponym()
public function testReverseWithRealCoordinatesWithTRLocaleAndLocalityToponym(): void
{
$provider = new Yandex($this->getHttpClient(), 'locality');
$results = $provider->reverseQuery(ReverseQuery::fromCoordinates(40.900640, 29.198184)->withLocale('tr-TR'));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(5, $results);

/** @var Location $result */
/** @var YandexAddress $result */
$result = $results->first();
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
$this->assertEqualsWithDelta(41.01117, $result->getCoordinates()->getLatitude(), 0.01);
Expand Down Expand Up @@ -403,7 +402,7 @@ public function testReverseWithRealCoordinatesWithTRLocaleAndLocalityToponym()
$this->assertNull($result->getTimezone());
}

public function testReverseMetroStationToGetName()
public function testReverseMetroStationToGetName(): void
{
$provider = new Yandex($this->getHttpClient(), 'metro');
$results = $provider->reverseQuery(ReverseQuery::fromCoordinates(60.036843, 30.324285));
Expand Down