Merge pull request #48 from niels-nijens/form-options

Improved form options

Author: niels-nijens

Form/Type/FlexModelFormType.php

@@ -134,12 +134,13 @@ private function getFieldType(array $formFieldConfiguration, array $fieldConfigu
                 break;
             case 'VARCHAR':
                 $fieldType = TextType::class;
-                if (isset($fieldConfiguration['options'])) {
-                    $fieldType = ChoiceType::class;
-                }
                 break;
         }
 
+        if (isset($formFieldConfiguration['options']) || isset($fieldConfiguration['options'])) {
+            $fieldType = ChoiceType::class;
+        }
+
         return $fieldType;
     }
 
@@ -170,7 +171,7 @@ protected function getFieldOptions(array $formFieldConfiguration, array $fieldCo
 
         $this->addFieldPlaceholder($options, $formFieldConfiguration, $fieldConfiguration);
         $this->addFieldOptionsByDatatype($options, $fieldConfiguration);
-        $this->addFieldChoiceOptions($options, $fieldConfiguration);
+        $this->addFieldChoiceOptions($options, $formFieldConfiguration, $fieldConfiguration);
         $this->addFieldConstraintOptions($options, $formFieldConfiguration);
 
         return $options;
@@ -198,6 +199,9 @@ public function addFieldPlaceholder(array &$options, array $formFieldConfigurati
 
     /**
      * Adds field options based on the datatype of a field.
+     *
+     * @param array $options
+     * @param array $fieldConfiguration
      */
     private function addFieldOptionsByDatatype(array &$options, array $fieldConfiguration)
     {
@@ -212,10 +216,15 @@ private function addFieldOptionsByDatatype(array &$options, array $fieldConfigur
      * Adds the choices option to the field options.
      *
      * @param array $options
+     * @param array $formFieldConfiguration
      * @param array $fieldConfiguration
      */
-    private function addFieldChoiceOptions(array &$options, array $fieldConfiguration)
+    private function addFieldChoiceOptions(array &$options, array $formFieldConfiguration, array $fieldConfiguration)
     {
+        if (isset($formFieldConfiguration['options'])) {
+            $fieldConfiguration['options'] = $formFieldConfiguration['options'];
+        }
+
         if (isset($fieldConfiguration['options'])) {
             $options['choices'] = array();
             foreach ($fieldConfiguration['options'] as $option) {

composer.json

@@ -14,7 +14,7 @@
         "ext-libxml": "*",
         "ext-xsl": "*",
         "doctrine/orm": "^2.5",
-        "flexmodel/flexmodel": "^0.2.0",
+        "flexmodel/flexmodel": "^1.0",
         "ocramius/proxy-manager": "^1.0",
         "symfony/console": "^2.8 | ^3.0",
         "symfony/form": "^2.8 | ^3.0",