Valid param always when is not required - also when available values …

…are set Changed rendering in API console when available values are set
tomaj · Mar 20, 2016 · 69637a5 · 69637a5
1 parent 9a1fcc1
commit 69637a5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/Component/ApiConsoleControl.php b/src/Component/ApiConsoleControl.php
@@ -81,19 +81,23 @@ protected function createComponentConsoleForm()
                 if ($param->isMulti()) {
                     $key = $key . '___' . $i;
                 }
-
-                if ($param->getType() == InputParam::TYPE_FILE) {
+
+                if ($param->getAvailableValues() && is_array($param->getAvailableValues())) {
+                    $c = $form->addSelect($key, $this->getParamLabel($param), array_combine($param->getAvailableValues(), $param->getAvailableValues()));
+                    if (!$param->isRequired()) {
+                        $c->setPrompt('Select ' . $this->getLabel($param));
+                    }
+                } elseif ($param->getAvailableValues() && is_string($param->getAvailableValues())) {
+                    $c = $form->addText($key, $this->getParamLabel($param))->setDisabled(true);
+                    $defaults[$key] = $param->getAvailableValues();
+                } elseif ($param->getType() == InputParam::TYPE_FILE) {
                     $c = $form->addUpload($key, $this->getParamLabel($param));
                 } elseif ($param->getType() == InputParam::TYPE_POST_RAW) {
                     $c = $form->addTextArea('post_raw', $this->getParamLabel($param))
                         ->setAttribute('rows', 10);
                 } else {
                     $c = $form->addText($key, $this->getParamLabel($param));
                 }
-
-                if ($param->getAvailableValues()) {
-                    $c->setOption('description', 'available values: ' . implode(' | ', $param->getAvailableValues()));
-                }
             }
         }
 
@@ -108,9 +112,14 @@ protected function createComponentConsoleForm()
         return $form;
     }
 
+    private function getLabel(InputParam $param)
+    {
+        return ucfirst(str_replace('_', ' ', $param->getKey()));
+    }
+
     private function getParamLabel(InputParam $param)
     {
-        $title = ucfirst(str_replace('_', ' ', $param->getKey()));
+        $title = $this->getLabel($param);
         if ($param->isRequired()) {
             $title .= ' *';
         }

diff --git a/src/Params/InputParam.php b/src/Params/InputParam.php
@@ -95,6 +95,10 @@ public function isMulti()
      */
     public function isValid()
     {
+        if ($this->required == self::OPTIONAL) {
+            return true;
+        }
+
         $value = $this->getValue();
         if ($this->availableValues !== null) {
             if (is_array($this->availableValues)) {