Compare commits

...

1 Commits
0.0.6 ... 0.0.7

Author SHA1 Message Date
Brabli
57796a6fdb Return null instead of throwing 2022-10-17 15:46:19 +01:00
2 changed files with 9 additions and 13 deletions

View File

@@ -15,17 +15,20 @@ class Geocoder
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
* @return LatLongModel
* @return null|LatLongModel
*/
public function geocodePostcode(string $postcode): LatLongModel
public function geocodePostcode(string $postcode): ?LatLongModel
{
$client = $this->createClient();
$response = $this->makeApiRequest($client, $postcode);
$data = $this->getDataFromResponse($response);
$this->throwIfDataIsEmpty($data);
if (empty($data)) {
return null;
}
return $this->createLatLongModel($data);
}
@@ -56,12 +59,6 @@ class Geocoder
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
{
$lat = $this->getLatitudeFromData($data);

View File

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