Merge pull request #74 from falvarez/Symfony3Compatibility

Add compatibility with Symfony > 3.0
Leaseweb · Jun 23, 2016 · 736b09c · 736b09c
2 parents 04d6efa + b455870
commit 736b09c
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 24 deletions.
diff --git a/Command/ClearCommand.php b/Command/ClearCommand.php
@@ -68,18 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     protected function interact(InputInterface $input, OutputInterface $output)
     {
         if (!$input->getArgument('pool')) {
-            $pool = $this->getHelper('dialog')->askAndValidate(
-                $output,
-                'Please give the pool:',
-                function($pool)
-                {
-                   if (empty($pool)) {
-                       throw new \Exception('pool can not be empty');
-                   }
-
-                   return $pool;
-                }
-            );
+            $pool = (new InteractHelper())->askForPool($this, $input, $output);
             $input->setArgument('pool', $pool);
         }
     }

diff --git a/Command/InteractHelper.php b/Command/InteractHelper.php
@@ -0,0 +1,62 @@
+<?php
+
+
+namespace Lsw\MemcacheBundle\Command;
+
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\DialogHelper;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+
+class InteractHelper
+{
+    private $questionText = 'Please give the pool';
+    private $exceptionMessage = 'pool can not be empty';
+    private $defaultPool = 'default';
+
+    private function askForPoolQuestion(QuestionHelper $questionHelper, InputInterface $input, OutputInterface $output)
+    {
+        $question = new Question("$this->questionText ($this->defaultPool)", $this->defaultPool);
+        $question->setValidator(function($pool) {
+            if (empty($pool)) {
+                throw new \Exception($this->exceptionMessage);
+            }
+            return $pool;
+        });
+
+        return $questionHelper->ask(
+            $input,
+            $output,
+            $question
+        );
+    }
+
+    private function askForPoolDialog(DialogHelper $dialogHelper, $output)
+    {
+        $pool = $dialogHelper->askAndValidate(
+            $output,
+            $this->questionText,
+            function($pool)
+            {
+                if (empty($pool)) {
+                    throw new \Exception($this->exceptionMessage);
+                }
+
+                return $pool;
+            }
+        );
+        return $pool;
+    }
+
+    public function askForPool(Command $command, InputInterface $input, OutputInterface $output)
+    {
+        if ($command->getHelperSet()->has('question')) {
+            return self::askForPoolQuestion($command->getHelper('question'), $input, $output);
+        } else {
+            return self::askForPoolDialog($command->getHelper('dialog'), $output);
+        }
+    }
+}
diff --git a/Command/StatisticsCommand.php b/Command/StatisticsCommand.php
@@ -62,18 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     protected function interact(InputInterface $input, OutputInterface $output)
     {
         if (!$input->getArgument('pool')) {
-            $pool = $this->getHelper('dialog')->askAndValidate(
-                $output,
-                'Please give the pool:',
-                function($pool)
-                {
-                   if (empty($pool)) {
-                       throw new \Exception('pool can not be empty');
-                   }
-
-                   return $pool;
-                }
-            );
+            $pool = (new InteractHelper())->askForPool($this, $input, $output);
             $input->setArgument('pool', $pool);
         }
     }