Merge pull request #229 from tobias-93/fix-error-symfony3

Fix error in Symfony 3.0, deprecated pattern option in 2.5
a2lix · Apr 11, 2016 · a04a8db · a04a8db
2 parents 193a02d + 4bb7ad1
commit a04a8db
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/TranslationForm/TranslationForm.php b/TranslationForm/TranslationForm.php
@@ -145,18 +145,20 @@ public function guessMissingFieldOptions($guesser, $class, $property, $options)
             $options['field_type'] = $typeGuess->getType();
         }
 
-        if (!isset($options['pattern']) && ($patternGuess = $guesser->guessPattern($class, $property))) {
-            $options['pattern'] = $patternGuess->getValue();
-        }
-
         if (Kernel::VERSION_ID > '20512') {
             if (!isset($options['attr']['maxlength']) && ($maxLengthGuess = $guesser->guessMaxLength($class, $property))) {
                 $options['attr']['maxlength'] = $maxLengthGuess->getValue();
             }
+            if (!isset($options['attr']['pattern']) && ($patternGuess = $guesser->guessPattern($class, $property))) {
+                $options['attr']['pattern'] = $patternGuess->getValue();
+            }
         } else {
             if (!isset($options['max_length']) && ($maxLengthGuess = $guesser->guessMaxLength($class, $property))) {
                 $options['max_length'] = $maxLengthGuess->getValue();
             }
+            if (!isset($options['pattern']) && ($patternGuess = $guesser->guessPattern($class, $property))) {
+                $options['pattern'] = $patternGuess->getValue();
+            }
         }
 
         return $options;