Return null instead of throwing

composer.json

@@ -18,7 +18,8 @@
         "symfony/http-client": "^6.1",
         "symfony/dependency-injection": "^6.1",
         "symfony/framework-bundle": "^6.1",
-        "symfony/yaml": "^6.1"
+        "symfony/yaml": "^6.1",
+        "doctrine/orm": "^2.13"
     },
 
     "require-dev": {

src/Entity/Trait/MappableTrait.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Pcm\GeocodeBundle\Entity\Trait;
 
+use Doctrine\ORM\Mapping as ORM;
+
 /**
  * Allows an entity to be mapped via latitude and longitude coordinates
  *
@@ -13,8 +15,10 @@ namespace Pcm\GeocodeBundle\Entity\Trait;
  */
 trait MappableTrait
 {
+    #[ORM\Column(type: 'decimal', precision: 10, scale: 6, nullable: true)]
     private ?float $latitude = null;
 
+    #[ORM\Column(type: 'decimal', precision: 10, scale: 6, nullable: true)]
     private ?float $longitude = null;
 
     public function getLatitude(): ?float

src/Model/LatLongModel.php

@@ -15,11 +15,11 @@ class LatLongModel
 
     public function getLatitude(): float
     {
-        return $this->getLatitude();
+        return $this->latitude;
     }
 
     public function getLongitude(): float
     {
-        return $this->getLongitude();
+        return $this->longitude;
     }
 }

src/Service/Geocoder.php

@@ -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);

tests/Service/GeocodeTest.php

@@ -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->assertNull($this->geocoder->geocodePostcode(''));
-        $this->geocoder->geocodePostcode('aaaaaaaa');
     }
 
     public function testGeocodePostcodeReturnsLatLonModel(): void