Merge pull request #44 from devonzara/master

Update for Symfony 3 components

Author: Shawn McCool

src/AutoComplete.php

@@ -1,7 +1,11 @@
 <?php namespace BackupManager\Laravel;
 
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+
 /**
  * Class AutoComplete
+ *
  * @package BackupManager\Laravel
  */
 trait AutoComplete {
@@ -21,7 +25,40 @@ public function autocomplete($dialog, array $list, $default = null) {
             }
             return $item;
         };
+
+        try {
+            return $this->useSymfontDialog($dialog, $list, $default, $validation);
+        } catch (InvalidArgumentException $error) {
+            //
+        } finally {
+            return $this->useSymfonyQuestion($dialog, $default, $validation);
+        }
+    }
+
+    /**
+     * @param $dialog
+     * @param array $list
+     * @param null $default
+     * @return mixed
+     */
+    protected function useSymfontDialog($dialog, array $list, $default = null, $validation) {
         $helper = $this->getHelperSet()->get('dialog');
-        return $helper->askAndValidate($this->output, "<question>{$dialog}</question>", $validation, false, $default, $list);
+
+        return $helper->askAndValidate(
+            $this->output, "<question>{$dialog}</question>", $validation, false, $default, $list
+        );
+    }
+
+    /**
+     * @param $dialog
+     * @param null $default
+     * @return mixed
+     */
+    protected function useSymfonyQuestion($dialog, $default = null, $validation) {
+        $question = new Question($dialog . ' ', $default);
+        $question->setValidator($validation);
+        $helper = $this->getHelper('question');
+
+        return $helper->ask($this->input, $this->output, $question);
     }
 }

src/Laravel4Compatibility.php

@@ -1,5 +1,8 @@
 <?php namespace BackupManager\Laravel;
 
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+
 /**
  * Class Laravel4Compatibility
  * @package BackupManager\Laravel
@@ -12,7 +15,14 @@ trait Laravel4Compatibility {
      * @return void
      */
     public function table(array $headers, array $rows, $style = 'default') {
-        $table = $this->getHelperSet()->get('table');
+        try {
+            $table = $this->getHelperSet()->get('table');
+        } catch (InvalidArgumentException $error) {
+            //
+        } finally {
+            $table = new Table($this->output);
+        }
+
         $table->setHeaders($headers);
         $table->setRows($rows);
         $table->render($this->output);

src/Laravel50Compatibility.php

@@ -1,5 +1,8 @@
 <?php namespace BackupManager\Laravel;
 
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+
 /**
  * Class Laravel5Compatibility
  * @package BackupManager\Laravel
@@ -12,7 +15,14 @@ trait Laravel50Compatibility {
      * @return void
      */
     public function table($headers, $rows, $style = 'default') {
-        $table = $this->getHelperSet()->get('table');
+        try {
+            $table = $this->getHelperSet()->get('table');
+        } catch (InvalidArgumentException $error) {
+            //
+        } finally {
+            $table = new Table($this->output);
+        }
+
         $table->setHeaders($headers);
         $table->setRows($rows);
         $table->render($this->output);

src/Laravel51Compatibility.php

@@ -1,5 +1,8 @@
 <?php namespace BackupManager\Laravel;
 
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+
 /**
  * Class Laravel5Compatibility
  * @package BackupManager\Laravel
@@ -12,7 +15,14 @@ trait Laravel51Compatibility {
      * @return void
      */
     public function table(array $headers, $rows, $style = 'default') {
-        $table = $this->getHelperSet()->get('table');
+        try {
+            $table = $this->getHelperSet()->get('table');
+        } catch (InvalidArgumentException $error) {
+            //
+        } finally {
+            $table = new Table($this->output);
+        }
+
         $table->setHeaders($headers);
         $table->setRows($rows);
         $table->render($this->output);