Rename Mappable stuff to Geocode stuff, change dir structure

This commit is contained in:
brabli
2024-08-05 14:25:03 +01:00
parent a6c8c4cc0c
commit 8b662ebfa3
4 changed files with 20 additions and 21 deletions

View File

@@ -2,9 +2,9 @@
declare(strict_types=1); declare(strict_types=1);
namespace Pcm\GeocodeBundle\Entity\Interface; namespace Pcm\GeocodeBundle\Interface\Entity;
interface MappableInterface interface GeocodeInterface
{ {
public function getLatitude(): ?float; public function getLatitude(): ?float;

View File

@@ -2,18 +2,16 @@
declare(strict_types=1); declare(strict_types=1);
namespace Pcm\GeocodeBundle\Entity\Trait; namespace Pcm\GeocodeBundle\Trait\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
/** /**
* Allows an entity to be mapped via latitude and longitude coordinates * Implementation of {@see Pcm\GeocodeBundle\Interface\Entity\GeocodeInterface}
*
* Use MappableInterface
* *
* @package Pcm\GeocodeBundle * @package Pcm\GeocodeBundle
*/ */
trait MappableTrait trait GeocodeTrait
{ {
#[ORM\Column(type: 'decimal', precision: 10, scale: 6, nullable: true)] #[ORM\Column(type: 'decimal', precision: 10, scale: 6, nullable: true)]
private ?float $latitude = null; private ?float $latitude = null;
@@ -55,3 +53,4 @@ trait MappableTrait
return null !== $this->getLatitude() && null !== $this->getLongitude(); return null !== $this->getLatitude() && null !== $this->getLongitude();
} }
} }

View File

@@ -4,8 +4,8 @@ declare(strict_types=1);
namespace Pcm\GeocodeBundle\Tests; namespace Pcm\GeocodeBundle\Tests;
use Pcm\GeocodeBundle\Entity\Interface\MappableInterface; use Pcm\GeocodeBundle\Interface\Entity\GeocodeInterface;
use Pcm\GeocodeBundle\Entity\Trait\MappableTrait; use Pcm\GeocodeBundle\Trait\Entity\GeocodeTrait;
use Pcm\GeocodeBundle\Exception\ApiErrorException; use Pcm\GeocodeBundle\Exception\ApiErrorException;
use Pcm\GeocodeBundle\Exception\NoResultsFoundException; use Pcm\GeocodeBundle\Exception\NoResultsFoundException;
use Pcm\GeocodeBundle\Model\GeoCoordinates; use Pcm\GeocodeBundle\Model\GeoCoordinates;
@@ -69,11 +69,11 @@ final class GeocodeTest extends KernelTestCase
$this->assertIsFloat($geoCoordinates->longitude); $this->assertIsFloat($geoCoordinates->longitude);
} }
private function getMappableEntity(): MappableInterface private function getGeocodableEntity(): GeocodeInterface
{ {
return new class implements MappableInterface return new class implements GeocodeInterface
{ {
use MappableTrait; use GeocodeTrait;
}; };
} }
} }

View File

@@ -4,15 +4,15 @@ declare(strict_types=1);
namespace Pcm\GeocodeBundle\Tests; namespace Pcm\GeocodeBundle\Tests;
use Pcm\GeocodeBundle\Entity\Interface\MappableInterface; use Pcm\GeocodeBundle\Interface\Entity\GeocodeInterface;
use Pcm\GeocodeBundle\Entity\Trait\MappableTrait; use Pcm\GeocodeBundle\Trait\Entity\GeocodeTrait;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
final class MappableTraitTest extends TestCase final class GeocodeTraitTest extends TestCase
{ {
private const float COORD = 123.456; private const float COORD = 123.456;
private MappableInterface $obj; private GeocodeInterface $obj;
protected function setUp(): void protected function setUp(): void
{ {
@@ -21,7 +21,7 @@ final class MappableTraitTest extends TestCase
public function testSetLatitude(): void public function testSetLatitude(): void
{ {
$this->assertInstanceOf(MappableInterface::class, $this->obj->setLatitude(self::COORD)); $this->assertInstanceOf(GeocodeInterface::class, $this->obj->setLatitude(self::COORD));
} }
public function testGetLatitudeReturnsNull(): void public function testGetLatitudeReturnsNull(): void
@@ -37,7 +37,7 @@ final class MappableTraitTest extends TestCase
public function testSetLongitude(): void public function testSetLongitude(): void
{ {
$this->assertInstanceOf(MappableInterface::class, $this->obj->setLongitude(self::COORD)); $this->assertInstanceOf(GeocodeInterface::class, $this->obj->setLongitude(self::COORD));
} }
public function testGetLongitudeReturnsNull(): void public function testGetLongitudeReturnsNull(): void
@@ -82,11 +82,11 @@ final class MappableTraitTest extends TestCase
$this->assertTrue($this->obj->isGeocoded()); $this->assertTrue($this->obj->isGeocoded());
} }
private function getTraitObject(): MappableInterface private function getTraitObject(): GeocodeInterface
{ {
return new class implements MappableInterface return new class implements GeocodeInterface
{ {
use MappableTrait; use GeocodeTrait;
}; };
} }
} }