Dynamic DiscriminatorMap

bolt · Apr 19, 2019 · f02cefc · f02cefc
1 parent 43b104a
commit f02cefc
Show file tree

Hide file tree

Showing 26 changed files with 279 additions and 55 deletions.
diff --git a/src/Entity/Field.php b/src/Entity/Field.php
@@ -26,33 +26,9 @@
  *  })
  * @ORM\InheritanceType("SINGLE_TABLE")
  * @ORM\DiscriminatorColumn(name="type", type="string", length=191)
- * @ORM\DiscriminatorMap({
- *     "generic" = "field",
- *     "block" = "Bolt\Entity\Field\BlockField",
- *     "checkbox" = "Bolt\Entity\Field\CheckboxField",
- *     "date" = "Bolt\Entity\Field\DateField",
- *     "embed" = "Bolt\Entity\Field\EmbedField",
- *     "file" = "Bolt\Entity\Field\FileField",
- *     "filelist" = "Bolt\Entity\Field\FilelistField",
- *     "float" = "Bolt\Entity\Field\FloatField",
- *     "geolocation" = "Bolt\Entity\Field\GeolocationField",
- *     "hidden" = "Bolt\Entity\Field\HiddenField",
- *     "html" = "Bolt\Entity\Field\HtmlField",
- *     "image" = "Bolt\Entity\Field\ImageField",
- *     "imagelist" = "Bolt\Entity\Field\ImagelistField",
- *     "integer" = "Bolt\Entity\Field\IntegerField",
- *     "markdown" = "Bolt\Entity\Field\MarkdownField",
- *     "number" = "Bolt\Entity\Field\NumberField",
- *     "repeater" = "Bolt\Entity\Field\RepeaterField",
- *     "select" = "Bolt\Entity\Field\SelectField",
- *     "slug" = "Bolt\Entity\Field\SlugField",
- *     "templateselect" = "Bolt\Entity\Field\TemplateselectField",
- *     "text" = "Bolt\Entity\Field\TextField",
- *     "textarea" = "Bolt\Entity\Field\TextareaField",
- *     "video" = "Bolt\Entity\Field\VideoField"
- * })
+ * @ORM\DiscriminatorMap({"generic" = "Field"})
  */
-class Field implements Translatable
+class Field implements Translatable, FieldInterface
 {
     /**
      * @ORM\Id()
@@ -169,11 +145,6 @@ public function setName(string $name): self
         return $this;
     }
 
-    public function getType(): ?string
-    {
-        return $this->getDefinition()->get('type');
-    }
-
     public function get($key)
     {
         return isset($this->value[$key]) ? $this->value[$key] : null;
@@ -282,4 +253,12 @@ public function setParent(?self $parent): self
 
         return $this;
     }
+
+    /**
+     * @Groups("get_field")
+     */
+    public static function getType(): string
+    {
+        return 'generic';
+    }
 }
diff --git a/src/Entity/Field/BlockField.php b/src/Entity/Field/BlockField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class BlockField extends Field
+class BlockField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'block';
+    }
 }
diff --git a/src/Entity/Field/CheckboxField.php b/src/Entity/Field/CheckboxField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class CheckboxField extends Field
+class CheckboxField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'checkbox';
+    }
 }
diff --git a/src/Entity/Field/DateField.php b/src/Entity/Field/DateField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class DateField extends Field
+class DateField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'date';
+    }
 }
diff --git a/src/Entity/Field/EmbedField.php b/src/Entity/Field/EmbedField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class EmbedField extends Field
+class EmbedField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'embed';
+    }
 }
diff --git a/src/Entity/Field/FileField.php b/src/Entity/Field/FileField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class FileField extends Field
+class FileField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'file';
+    }
 }
diff --git a/src/Entity/Field/FilelistField.php b/src/Entity/Field/FilelistField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class FilelistField extends Field
+class FilelistField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'filelist';
+    }
 }
diff --git a/src/Entity/Field/FloatField.php b/src/Entity/Field/FloatField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class FloatField extends Field
+class FloatField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'float';
+    }
 }
diff --git a/src/Entity/Field/GeolocationField.php b/src/Entity/Field/GeolocationField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class GeolocationField extends Field
+class GeolocationField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'geolocation';
+    }
 }
diff --git a/src/Entity/Field/HiddenField.php b/src/Entity/Field/HiddenField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class HiddenField extends Field
+class HiddenField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'hidden';
+    }
 }
diff --git a/src/Entity/Field/HtmlField.php b/src/Entity/Field/HtmlField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class HtmlField extends Field implements Excerptable
+class HtmlField extends Field implements Excerptable, FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'html';
+    }
 }
diff --git a/src/Entity/Field/ImageField.php b/src/Entity/Field/ImageField.php
@@ -5,14 +5,20 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 use League\Glide\Urls\UrlBuilderFactory;
 
 /**
  * @ORM\Entity
  */
-class ImageField extends Field
+class ImageField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'image';
+    }
+
     public function __toString(): string
     {
         return $this->getPath();

diff --git a/src/Entity/Field/ImagelistField.php b/src/Entity/Field/ImagelistField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class ImagelistField extends Field
+class ImagelistField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'imagelist';
+    }
 }
diff --git a/src/Entity/Field/IntegerField.php b/src/Entity/Field/IntegerField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class IntegerField extends Field
+class IntegerField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'integer';
+    }
 }
diff --git a/src/Entity/Field/MarkdownField.php b/src/Entity/Field/MarkdownField.php
@@ -5,14 +5,20 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Bolt\Utils\Markdown;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class MarkdownField extends Field implements Excerptable
+class MarkdownField extends Field implements Excerptable, FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'markdown';
+    }
+
     public function __toString(): string
     {
         $markdown = new Markdown();

diff --git a/src/Entity/Field/NumberField.php b/src/Entity/Field/NumberField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class NumberField extends Field
+class NumberField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'number';
+    }
 }
diff --git a/src/Entity/Field/RepeaterField.php b/src/Entity/Field/RepeaterField.php
@@ -5,11 +5,16 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class RepeaterField extends Field
+class RepeaterField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'repeater';
+    }
 }
diff --git a/src/Entity/Field/SelectField.php b/src/Entity/Field/SelectField.php
@@ -5,13 +5,19 @@
 namespace Bolt\Entity\Field;
 
 use Bolt\Entity\Field;
+use Bolt\Entity\FieldInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
-class SelectField extends Field
+class SelectField extends Field implements FieldInterface
 {
+    public static function getType(): string
+    {
+        return 'select';
+    }
+
     public function getValue(): ?array
     {
         if (empty($this->value)) {