pcm-libraries/pcm-geocode-bundle
2
0
Fork 0
Code Issues 2 Releases Activity

Return null instead of throwing

Browse Source
This commit is contained in:
Brabli
2022-10-17 15:46:19 +01:00
parent 31d29f2460
commit 57796a6fdb
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Service/Geocoder.php
View File

@@ -15,17 +15,20 @@ class Geocoder
public function __construct(private HttpClientInterface $client) {} public function __construct(private HttpClientInterface $client) {}
/** /**
* Convert a postcode into latitude and longitude * Convert a postcode into latitude and longitude. Returns null if conversion failed.
* *
* @param string $postcode * @param string $postcode
* @return LatLongModel * @return null|LatLongModel
*/ */
public function geocodePostcode(string $postcode): LatLongModel public function geocodePostcode(string $postcode): ?LatLongModel
{ {
$client = $this->createClient(); $client = $this->createClient();
$response = $this->makeApiRequest($client, $postcode); $response = $this->makeApiRequest($client, $postcode);
$data = $this->getDataFromResponse($response); $data = $this->getDataFromResponse($response);
$this->throwIfDataIsEmpty($data);
if (empty($data)) {
return null;
}
return $this->createLatLongModel($data); return $this->createLatLongModel($data);
} }
@@ -56,12 +59,6 @@ class Geocoder
return $response->toArray(false); return $response->toArray(false);
} }
private function throwIfDataIsEmpty(array $data): void
{
if (empty($data))
throw new \Exception("No data was received from API response! Were the arguments valid?");
}
private function createLatLongModel(array $data): LatLongModel private function createLatLongModel(array $data): LatLongModel
{ {
$lat = $this->getLatitudeFromData($data); $lat = $this->getLatitudeFromData($data);

5
tests/Service/GeocodeTest.php
View File

@@ -33,11 +33,10 @@ class GeocodeTest extends KernelTestCase
$this->assertInstanceOf(Geocoder::class, $this->geocoder); $this->assertInstanceOf(Geocoder::class, $this->geocoder);
} }
public function testGeocodePostcodeThrowsOnInvalidInput(): void public function testGeocodePostcodeReturnsNullOnInvalidInput(): void
{ {
sleep(1); sleep(1);
$this->expectException(\Exception::class); $this->assertNull($this->geocoder->geocodePostcode(''));
$this->geocoder->geocodePostcode('aaaaaaaa');
} }
public function testGeocodePostcodeReturnsLatLonModel(): void public function testGeocodePostcodeReturnsLatLonModel(): void