Merge branch 'master' of github.com:Benoth/cssprites

lvancrayelynghe · Dec 17, 2015 · f85ce88 · f85ce88
2 parents 359f88c + 83d912c
commit f85ce88
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/src/Commands/AbstractBaseCommand.php b/src/Commands/AbstractBaseCommand.php
@@ -10,6 +10,11 @@ abstract class AbstractBaseCommand extends Command implements ContainerAwareInte
 {
     use ContainerAwareTrait;
 
+    /**
+     * @param string $option
+     *
+     * @return string
+     */
     protected function getOptionOrAsk($option, $question, $default = null)
     {
         $value = $this->input->getOption($option);
@@ -22,6 +27,9 @@ protected function getOptionOrAsk($option, $question, $default = null)
         return $value;
     }
 
+    /**
+     * @param string $option
+     */
     protected function getOptionOrSelect($option, $question, array $choices, $default = null)
     {
         $value = $this->input->getOption($option);
@@ -39,6 +47,9 @@ protected function getOptionOrSelect($option, $question, array $choices, $defaul
         return $value;
     }
 
+    /**
+     * @param string $option
+     */
     protected function getOptionOrAskConfirmation($option, $question, $default = null)
     {
         $value = $this->input->getOption($option);
@@ -55,6 +66,11 @@ protected function getOptionOrAskConfirmation($option, $question, $default = nul
         return $value;
     }
 
+    /**
+     * @param string $option
+     *
+     * @return string
+     */
     protected function getOptionOrAskAndValidate($option, $question, \Closure $callback, $default = null)
     {
         $value = $this->input->getOption($option);

diff --git a/src/Commands/GenerateCommand.php b/src/Commands/GenerateCommand.php
@@ -265,6 +265,9 @@ protected function getDriver($option)
         return $this->getOptionOrSelect('driver', $option['question'], $option['choices'], $option['default']);
     }
 
+    /**
+     * @return string
+     */
     protected function getOutputFilename($option)
     {
         $filename = $this->getOptionOrAsk('sprite', $option['question'], $option['default']);

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -34,7 +34,7 @@ class Configuration
     /**
      * Create a new configuration and set the default values.
      *
-     * @param mixed $value The values
+     * @param mixed $values The values
      */
     public function __construct(array $values = [])
     {