Merge branch 'release/0.6.2'

c0ntax · Feb 14, 2018 · f45d742 · f45d742
2 parents 4b1665c + 84ff21d
commit f45d742
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "c0ntax/parsley-bundle",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "type": "symfony-bundle",
     "description": "A bridge between Symfony and Parsley.js",
     "license": "Apache-2.0",

diff --git a/src/Form/Extension/ParsleyTypeExtension.php b/src/Form/Extension/ParsleyTypeExtension.php
@@ -68,15 +68,19 @@ public function buildView(FormView $view, FormInterface $form, array $options):
             $this->getRemoveSymfonyConstraintsFromParsleys($parsleys)
         );
 
-        $parsleyConstraints = $this->removeFromConstraints(
-            array_merge(
-                $this->createParsleyConstraintsFromValidationConstraints($symfonyConstraints, $form),
-                $this->getDirectivesFromParsleys($parsleys)
-            ),
+        $parsleyConstraints = array_merge(
+            $this->createParsleyConstraintsFromValidationConstraints($symfonyConstraints, $form),
+            $this->getDirectivesFromParsleys($parsleys)
+        );
+
+        $parsleyDirectives = $this->addDefaultDirectives($parsleyConstraints);
+
+        $parsleyDirectives = $this->removeFromConstraints(
+            $parsleyDirectives,
             $this->getRemoveParsleyDirectivesFromParsleys($parsleys)
         );
 
-        $this->addParsleyToView($view, $parsleyConstraints);
+        $this->addParsleyToView($view, $parsleyDirectives);
     }
 
     /**
@@ -103,6 +107,29 @@ public function configureOptions(OptionsResolver $resolver): void
             ->addAllowedTypes(self::OPTION_NAME, 'array');
     }
 
+    /**
+     * @param array $parsleyDirectives
+     * @return array
+     */
+    private function addDefaultDirectives(array $parsleyDirectives): array
+    {
+        $has = [];
+        foreach ($parsleyDirectives as $parsleyDirective) {
+            $class = get_class($parsleyDirective);
+            if (array_key_exists($class, $has)) {
+                $has[$class]++;
+            } else {
+                $has[$class] = 1;
+            }
+        }
+
+        if (!array_key_exists(Trigger::class, $has) && count($parsleyDirectives) > 0 && $this->getConfig()['field']['trigger'] !== null) {
+            $parsleyDirectives[] = new Trigger($this->getConfig()['field']['trigger']);
+        }
+
+        return $parsleyDirectives;
+    }
+
     /**
      * @param ParsleyInterface[] $parsleys
      * @return DirectiveInterface[]
@@ -230,11 +257,6 @@ private function addParsleyToView(FormView $view, array $directives): void
             }
         }
 
-        if (!$hasTrigger && count($directives) > 0 && $this->getConfig()['field']['trigger'] !== null) {
-            $trigger = new Trigger($this->getConfig()['field']['trigger']);
-            $attr = array_merge($attr, $trigger->getViewAttr());
-        }
-
         if (count($attr) > 0) {
             $view->vars['attr'] = array_merge($view->vars['attr'], $attr);
         }