From 9a4f50472af20eaa985e83b1d4130d98681174d7 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 20 Apr 2021 10:55:45 +0200
Subject: [PATCH] add point type + Address: add Point field : fix dependency
 injection of the Point type

---
 .../DependencyInjection/ChillMainExtension.php    |  8 ++++++--
 .../{Entity => Doctrine/Model}/Point.php          |  2 +-
 .../{Entity => Doctrine/Model}/PointException.php |  2 +-
 .../ChillMainBundle/Doctrine/Type/PointType.php   |  4 ++--
 src/Bundle/ChillMainBundle/Entity/Address.php     | 15 ++++++++++++++-
 5 files changed, 24 insertions(+), 7 deletions(-)
 rename src/Bundle/ChillMainBundle/{Entity => Doctrine/Model}/Point.php (97%)
 rename src/Bundle/ChillMainBundle/{Entity => Doctrine/Model}/PointException.php (93%)

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index ee9608d82..831853611 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -188,8 +188,12 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
         $container->prependExtensionConfig('doctrine', array(
            'dbal' => [
                'types' => [
-                   'dateinterval' => \Chill\MainBundle\Doctrine\Type\NativeDateIntervalType::class,
-                   'json' => \Chill\MainBundle\Doctrine\Type\PointType::class
+                   'dateinterval' => [
+                       'class' => \Chill\MainBundle\Doctrine\Type\NativeDateIntervalType::class
+                   ],
+                   'point' => [
+                       'class' => \Chill\MainBundle\Doctrine\Type\PointType::class
+                   ]
                ]
            ]
         ));
diff --git a/src/Bundle/ChillMainBundle/Entity/Point.php b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
similarity index 97%
rename from src/Bundle/ChillMainBundle/Entity/Point.php
rename to src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
index 528834e42..869c4c3a6 100644
--- a/src/Bundle/ChillMainBundle/Entity/Point.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\MainBundle\Entity;
+namespace Chill\MainBundle\Doctrine\Model;
 
 use \JsonSerializable;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/PointException.php b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
similarity index 93%
rename from src/Bundle/ChillMainBundle/Entity/PointException.php
rename to src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
index ac024eebf..64a3c4c1f 100644
--- a/src/Bundle/ChillMainBundle/Entity/PointException.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\MainBundle\Entity;
+namespace Chill\MainBundle\Doctrine\Model;
 
 use \Exception;
 
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
index ba84177ac..eab3261dd 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
@@ -2,10 +2,10 @@
 
 namespace Chill\MainBundle\Doctrine\Type;
 
-use Chill\MainBundle\Entity\Point;
+use Chill\MainBundle\Doctrine\Model\Point;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Chill\MainBundle\Entity\PointException;
+use Chill\MainBundle\Doctrine\Model\PointException;
 
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 6592c6a3d..8a8761ca5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -4,6 +4,7 @@ namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Doctrine\Model\Point;
 
 /**
  * Address
@@ -125,7 +126,7 @@ class Address
      *
      * @var Point|null
      *
-     * @ORM\Column(type="Point", nullable=true)
+     * @ORM\Column(type="point", nullable=true)
      */
     private $point;
 
@@ -474,5 +475,17 @@ class Address
         return $this;
     }
 
+    public function getPoint(): ?Point
+    {
+        return $this->point;
+    }
+
+    public function setPoint(?Point $point): self
+    {
+        $this->point = $point;
+
+        return $this;
+    }
+
 }