From: Raphaël Gertz <git@rapsys.eu>
Date: Sat, 28 Aug 2021 08:59:51 +0000 (+0200)
Subject: Add support for bundle named entity
X-Git-Tag: 0.2.0~8
X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/commitdiff_plain/e9e03da076b9dfb8344ac0ac1be5a5311cbb26f8?ds=sidebyside

Add support for bundle named entity
Cleanup
---

diff --git a/Form/Extension/Type/HiddenEntityType.php b/Form/Extension/Type/HiddenEntityType.php
index 2dfabf7..7521633 100644
--- a/Form/Extension/Type/HiddenEntityType.php
+++ b/Form/Extension/Type/HiddenEntityType.php
@@ -35,26 +35,26 @@ class HiddenEntityType extends HiddenType implements DataTransformerInterface {
 		$this->dm = $doctrine;
 	}
 
-    /**
+	/**
 	 * Configure options
 	 *
-     * {@inheritdoc}
-     */
-    public function configureOptions(OptionsResolver $resolver) {
+	 * {@inheritdoc}
+	 */
+	public function configureOptions(OptionsResolver $resolver) {
 		//Call parent
-        parent::configureOptions($resolver);
+		parent::configureOptions($resolver);
 
-        // Derive "data_class" option from passed "data" object
-        $class = function (Options $options) {
-            return isset($options['data']) && \is_object($options['data']) ? \get_class($options['data']) : null;
-        };
+		//Derive "data_class" option from passed "data" object
+		$class = function (Options $options) {
+			return isset($options['data']) && \is_object($options['data']) ? \get_class($options['data']) : null;
+		};
 
-        $resolver->setDefaults([
-            'class' => $class
+		$resolver->setDefaults([
+			#'data_class' => null,
+			'class' => $class
 		]);
 	}
 
-
 	/**
 	 * Build form
 	 *
@@ -64,10 +64,17 @@ class HiddenEntityType extends HiddenType implements DataTransformerInterface {
 		//Set class from options['class']
 		$this->class = $options['class'];
 
-		//Check class
+		//Without class
 		if (empty($this->class)) {
 			//Set class from namespace and field name
 			$this->class = str_replace('Form\\Extension\\Type', 'Entity\\' ,__NAMESPACE__).ucfirst($builder->getName());
+		//With bundle named entity
+		} elseif (
+			($pos = strpos($this->class, ':')) !== false &&
+			!empty($entity = substr($this->class, $pos + 1))
+		) {
+			//Set class from namespace and entity name
+			$this->class = str_replace('Form\\Extension\\Type', 'Entity\\' ,__NAMESPACE__).$entity;
 		}
 
 		//Set this as model transformer
@@ -82,7 +89,7 @@ class HiddenEntityType extends HiddenType implements DataTransformerInterface {
 	 * @return string The object id
 	 */
 	public function transform($data): string {
-		// Modified from comments to use instanceof so that base classes or interfaces can be specified
+		//Modified from comments to use instanceof so that base classes or interfaces can be specified
 		if ($data === null || !$data instanceof $this->class) {
 			return '';
 		}