Skip to content

Commit 4d6c79d

Browse files
jbeliennorkunas
jbelien
and
norkunas
authored
Add PHPStan in CI (#1193)
* Add PHPStan * Update php.yml * Update composer.json * Fix PHPStan level 0 * Fix PHPStan level 1 * Update phpstan.neon * Fix PHPStan level 2 * Update composer.json * Fix PHPStan level 3 * Fix tests * Fix PHPStan level 4 * Update src/Common/Tests/TimedGeocoderTest.php Co-authored-by: Tomas Norkūnas <[email protected]> * Update src/Provider/Cache/Tests/ProviderCacheTest.php Co-authored-by: Tomas Norkūnas <[email protected]> * Update src/Provider/Cache/Tests/ProviderCacheTest.php Co-authored-by: Tomas Norkūnas <[email protected]> * Update src/Provider/GeoIP2/Tests/GeoIP2Test.php Co-authored-by: Tomas Norkūnas <[email protected]> * Fix PHPStan level 5 * Normalize composer.json * Rename analyse script * Update composer.json * Update IntegrationTest * Update AlgoliaPlacesTest * Update composer.json * Update RequestInterface vs. getParsedResponse() * Update src/Plugin/PluginProvider.php Co-authored-by: Tomas Norkūnas <[email protected]> * Update src/Plugin/PluginProvider.php Co-authored-by: Tomas Norkūnas <[email protected]> * Use PHPStan baseline instead of ignore See https://phpstan.org/user-guide/baseline --------- Co-authored-by: Tomas Norkūnas <[email protected]>
1 parent 98f74a5 commit 4d6c79d

File tree

3 files changed

+21
-26
lines changed

3 files changed

+21
-26
lines changed

‎Mapbox.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ final class Mapbox extends AbstractHttpProvider implements Provider
123123

124124
const DEFAULT_TYPE = self::TYPE_ADDRESS;
125125

126-
/**
127-
* @var ClientInterface
128-
*/
129-
private $client;
130-
131126
/**
132127
* @var string
133128
*/
@@ -161,7 +156,6 @@ public function __construct(
161156
throw new InvalidArgument('The Mapbox geocoding mode should be either mapbox.places or mapbox.places-permanent.');
162157
}
163158

164-
$this->client = $client;
165159
$this->accessToken = $accessToken;
166160
$this->country = $country;
167161
$this->geocodingMode = $geocodingMode;
@@ -199,7 +193,7 @@ public function geocodeQuery(GeocodeQuery $query): Collection
199193
$urlParameters['fuzzyMatch'] = $fuzzyMatch ? 'true' : 'false';
200194
}
201195

202-
if ($urlParameters) {
196+
if (count($urlParameters) > 0) {
203197
$url .= '?'.http_build_query($urlParameters);
204198
}
205199

@@ -222,7 +216,7 @@ public function reverseQuery(ReverseQuery $query): Collection
222216
$urlParameters['types'] = self::DEFAULT_TYPE;
223217
}
224218

225-
if ($urlParameters) {
219+
if (count($urlParameters) > 0) {
226220
$url .= '?'.http_build_query($urlParameters);
227221
}
228222

‎Tests/IntegrationTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@
2121
*/
2222
class IntegrationTest extends ProviderIntegrationTest
2323
{
24-
protected $testIpv4 = false;
24+
protected bool $testIpv4 = false;
2525

26-
protected $testIpv6 = false;
26+
protected bool $testIpv6 = false;
2727

2828
protected function createProvider(ClientInterface $httpClient)
2929
{
3030
return new Mapbox($httpClient, $this->getApiKey());
3131
}
3232

33-
protected function getCacheDir()
33+
protected function getCacheDir(): string
3434
{
3535
return __DIR__.'/.cached_responses';
3636
}
3737

38-
protected function getApiKey()
38+
protected function getApiKey(): string
3939
{
4040
return $_SERVER['MAPBOX_GEOCODING_KEY'];
4141
}

‎Tests/MapboxTest.php‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Geocoder\Query\GeocodeQuery;
2121
use Geocoder\Query\ReverseQuery;
2222
use Geocoder\Provider\Mapbox\Mapbox;
23+
use Geocoder\Provider\Mapbox\Model\MapboxAddress;
2324

2425
class MapboxTest extends BaseTestCase
2526
{
@@ -99,11 +100,11 @@ public function testGeocodePlaceWithNoCountryShortCode()
99100
$this->assertInstanceOf(AddressCollection::class, $results);
100101
$this->assertCount(1, $results);
101102

102-
/** @var Location $result */
103+
/** @var MapboxAddress $result */
103104
$result = $results->first();
104-
$this->assertInstanceOf(Address::class, $result);
105-
$this->assertEquals(43.73125, $result->getCoordinates()->getLatitude(), '', 0.001);
106-
$this->assertEquals(7.41974, $result->getCoordinates()->getLongitude(), '', 0.001);
105+
$this->assertInstanceOf(MapboxAddress::class, $result);
106+
$this->assertEqualsWithDelta(43.73125, $result->getCoordinates()->getLatitude(), 0.001);
107+
$this->assertEqualsWithDelta(7.41974, $result->getCoordinates()->getLongitude(), 0.001);
107108
$this->assertEquals('Principato di Monaco', $result->getStreetName());
108109
$this->assertEquals('Principato di Monaco', $result->getCountry()->getName());
109110
$this->assertEquals('place.4899176537126140', $result->getId());
@@ -128,11 +129,11 @@ public function testGeocodeWithRealAddress()
128129
$this->assertInstanceOf(AddressCollection::class, $results);
129130
$this->assertCount(5, $results);
130131

131-
/** @var Location $result */
132+
/** @var MapboxAddress $result */
132133
$result = $results->first();
133-
$this->assertInstanceOf(Address::class, $result);
134-
$this->assertEquals(37.77572, $result->getCoordinates()->getLatitude(), '', 0.001);
135-
$this->assertEquals(-122.41362, $result->getCoordinates()->getLongitude(), '', 0.001);
134+
$this->assertInstanceOf(MapboxAddress::class, $result);
135+
$this->assertEqualsWithDelta(37.77572, $result->getCoordinates()->getLatitude(), 0.001);
136+
$this->assertEqualsWithDelta(-122.41362, $result->getCoordinates()->getLongitude(), 0.001);
136137
$this->assertNull($result->getBounds());
137138
$this->assertEquals(149, $result->getStreetNumber());
138139
$this->assertEquals('9th Street', $result->getStreetName());
@@ -169,9 +170,9 @@ public function testReverseWithRealCoordinates()
169170
$this->assertInstanceOf(AddressCollection::class, $results);
170171
$this->assertCount(4, $results);
171172

172-
/** @var Location $result */
173+
/** @var MapboxAddress $result */
173174
$result = $results->first();
174-
$this->assertInstanceOf(Address::class, $result);
175+
$this->assertInstanceOf(MapboxAddress::class, $result);
175176
$this->assertEquals(8, $result->getStreetNumber());
176177
$this->assertEquals('Avenue Gambetta', $result->getStreetName());
177178
$this->assertEquals(75020, $result->getPostalCode());
@@ -204,9 +205,9 @@ public function testGeocodeWithRealValidApiKey()
204205
$this->assertInstanceOf(AddressCollection::class, $results);
205206
$this->assertCount(5, $results);
206207

207-
/** @var Location $result */
208+
/** @var MapboxAddress $result */
208209
$result = $results->first();
209-
$this->assertInstanceOf(Address::class, $result);
210+
$this->assertInstanceOf(MapboxAddress::class, $result);
210211
$this->assertEquals('116th Street', $result->getStreetName());
211212
$this->assertEquals(11356, $result->getPostalCode());
212213
$this->assertCount(2, $result->getAdminLevels());
@@ -215,8 +216,8 @@ public function testGeocodeWithRealValidApiKey()
215216
$this->assertEquals('address.2431617896783536', $result->getId());
216217
$this->assertNotNull($result->getCoordinates()->getLatitude());
217218
$this->assertNotNull($result->getCoordinates()->getLongitude());
218-
$this->assertEquals(40.786596, $result->getCoordinates()->getLatitude(), '', 0.001);
219-
$this->assertEquals(-73.851157, $result->getCoordinates()->getLongitude(), '', 0.001);
219+
$this->assertEqualsWithDelta(40.786596, $result->getCoordinates()->getLatitude(), 0.001);
220+
$this->assertEqualsWithDelta(-73.851157, $result->getCoordinates()->getLongitude(), 0.001);
220221
$this->assertEquals('New York', $result->getLocality());
221222
$this->assertCount(2, $result->getAdminLevels());
222223
$this->assertEquals('New York', $result->getAdminLevels()->get(1)->getName());

0 commit comments

Comments
 (0)