Merge pull request #35 from Elao/placeholder

Support nested keys + default support for placeholder
Elao · Dec 14, 2020 · 3be5ff1 · 3be5ff1
2 parents 293ca4a + 11c5f61
commit 3be5ff1
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -48,6 +48,7 @@ public function getConfigTreeBuilder()
                                 [
                                     'label' => 'label',
                                     'help' => 'help',
+                                    '[attr][placeholder]' => 'placeholder',
                                 ]
                             )
                         )
@@ -64,6 +65,7 @@ public function getConfigTreeBuilder()
                             $this->addKeysConfig(
                                 'choice',
                                 [
+                                    'placeholder' => 'placeholder',
                                     'empty_value' => 'empty_value',
                                 ]
                             )

diff --git a/Form/Extension/TreeAwareExtension.php b/Form/Extension/TreeAwareExtension.php
@@ -15,6 +15,8 @@
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
 
 /**
  * Tree Aware Extension
@@ -56,6 +58,11 @@ abstract class TreeAwareExtension extends AbstractTypeExtension
      */
     protected $defaultTranslationDomain;
 
+    /**
+     * @var PropertyAccessor
+     */
+    protected $propertyAccessor;
+
     /**
      * Enable or disable automatic generation of missing labels
      *
@@ -113,7 +120,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     {
         if ($this->treeBuilder && $this->keyBuilder) {
             foreach ($this->keys as $key => $value) {
-                if (isset($options[$key]) && $options[$key] === true) {
+                if ($this->optionEquals($options, $key, true)) {
                     $this->generateKey($view, $key, $value);
                 }
             }
@@ -133,6 +140,33 @@ protected function generateKey(FormView &$view, $key, $value)
             $view->vars['tree'] = $this->treeBuilder->getTree($view);
         }
 
-        $view->vars[$key] = $this->keyBuilder->buildKeyFromTree($view->vars['tree'], $value);
+        $this->setVar($view->vars, $key, $this->keyBuilder->buildKeyFromTree($view->vars['tree'], $value));
+    }
+
+    protected function setVar(array &$vars, string $key, $value): void
+    {
+        if ($this->getPropertyAccessor()->isWritable($vars, $key)) {
+            $this->getPropertyAccessor()->setValue($vars, $key, $value);
+        } else {
+            $vars[$key] = $value;
+        }
+    }
+
+    protected function optionEquals(array $options, string $key, $value): bool
+    {
+        if ($this->getPropertyAccessor()->isReadable($options, $key)) {
+            return $this->getPropertyAccessor()->getValue($options, $key) === $value;
+        }
+
+        return isset($options[$key]) ? $options[$key] === $value : false;
+    }
+
+    protected function getPropertyAccessor(): PropertyAccessor
+    {
+        if (!$this->propertyAccessor) {
+            $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
+        }
+
+        return $this->propertyAccessor;
     }
 }
diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
     "require": {
         "php": "^7.1.0",
         "symfony/framework-bundle": "~2.8|~3.0|~4.0|~5.0",
-        "symfony/form": "~2.8|~3.0|~4.0|~5.0"
+        "symfony/form": "~2.8|~3.0|~4.0|~5.0",
+        "symfony/property-access": "~2.8|~3.0|~4.0|~5.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^5.0",