refactored

symfony · kbond · Sep 25, 2014 · Sep 25, 2014 · Sep 25, 2014 · Sep 25, 2014
commit 72708d7a86fe733eeb63e164cd668156b9e4eaed
diff --git a/src/Symfony/Component/Console/Style/AbstractOutputStyle.php b/src/Symfony/Component/Console/Style/AbstractOutputStyle.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Style;
+
+use Symfony\Component\Console\Formatter\OutputFormatterInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Decorates output to add console style guide helper methods
+ *
+ * @author Kevin Bond <[email protected]>
+ */
+abstract class AbstractOutputStyle implements OutputInterface
+{
+    private $output;
+
+    /**
+     * @param OutputInterface $output
+     */
+    public function __construct(OutputInterface $output)
+    {
+        $this->output = $output;
+    }
+
+    /**
+     * @param FormatterInterface $formatter
+     */
+    public function format(FormatterInterface $formatter)
+    {
+        $this->writeln($formatter->format());
+    }
+
+    /**
+     * Add newline(s)
+     *
+     * @param int $count The number of newlines
+     */
+    public function ln($count = 1)
+    {
+        $this->output->write(str_repeat(PHP_EOL, $count));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
+    {
+        $this->output->write($messages, $newline, $type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function writeln($messages, $type = self::OUTPUT_NORMAL)
+    {
+        $this->output->writeln($messages, $type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setVerbosity($level)
+    {
+        $this->output->setVerbosity($level);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVerbosity()
+    {
+        return $this->output->getVerbosity();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setDecorated($decorated)
+    {
+        $this->output->setDecorated($decorated);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDecorated()
+    {
+        return $this->output->isDecorated();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setFormatter(OutputFormatterInterface $formatter)
+    {
+        $this->output->setFormatter($formatter);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormatter()
+    {
+        return $this->output->getFormatter();
+    }
+}
diff --git a/...e/Helper/Formatter/FormatterInterface.php → ...nent/Console/Style/FormatterInterface.php b/...e/Helper/Formatter/FormatterInterface.php → ...nent/Console/Style/FormatterInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Console\Helper\Formatter;
+namespace Symfony\Component\Console\Style;
 
 /**
  * @author Kevin Bond <[email protected]>

diff --git a/...nsole/Helper/Formatter/BlockFormatter.php → ...Console/Style/Standard/BlockFormatter.php b/...nsole/Helper/Formatter/BlockFormatter.php → ...Console/Style/Standard/BlockFormatter.php
@@ -9,10 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Console\Helper\Formatter;
+namespace Symfony\Component\Console\Style\Standard;
 
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Helper;
+use Symfony\Component\Console\Style\FormatterInterface;
 
 /**
  * Formats a message as a block of text.

diff --git a/...onsole/Helper/Formatter/ListFormatter.php → .../Console/Style/Standard/ListFormatter.php b/...onsole/Helper/Formatter/ListFormatter.php → .../Console/Style/Standard/ListFormatter.php
@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Console\Helper\Formatter;
+namespace Symfony\Component\Console\Style\Standard;
+
+use Symfony\Component\Console\Style\FormatterInterface;
 
 /**
  * Formats a list element

diff --git a/...ponent/Console/Output/OutputDecorator.php → ...le/Style/Standard/StandardOutputStyle.php b/...ponent/Console/Output/OutputDecorator.php → ...le/Style/Standard/StandardOutputStyle.php
@@ -9,40 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Console\Output;
+namespace Symfony\Component\Console\Style\Standard;
 
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-use Symfony\Component\Console\Helper\Formatter\BlockFormatter;
-use Symfony\Component\Console\Helper\Formatter\FormatterInterface;
-use Symfony\Component\Console\Helper\Formatter\ListFormatter;
-use Symfony\Component\Console\Helper\Formatter\TextFormatter;
-use Symfony\Component\Console\Helper\Formatter\TitleFormatter;
+use Symfony\Component\Console\Style\AbstractOutputStyle;
 
 /**
- * Decorates output to add console style guide helper methods
- *
  * @author Kevin Bond <[email protected]>
  */
-class OutputDecorator implements OutputInterface
+class StandardOutputStyle extends AbstractOutputStyle
 {
-    private $output;
-
-    /**
-     * @param OutputInterface $output
-     */
-    public function __construct(OutputInterface $output)
-    {
-        $this->output = $output;
-    }
-
-    /**
-     * @param FormatterInterface $formatter
-     */
-    public function format(FormatterInterface $formatter)
-    {
-        $this->writeln($formatter->format());
-    }
-
     /**
      * Formats a message as a block of text.
      *
@@ -145,78 +120,5 @@ public function caution($messages)
     {
         $this->format(new BlockFormatter($messages, 'CAUTION', 'fg=white;bg=red', ' ! '));
     }
-
-    /**
-     * Add newline(s)
-     *
-     * @param int $count The number of newlines
-     */
-    public function ln($count = 1)
-    {
-        $this->output->write(str_repeat(PHP_EOL, $count));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
-    {
-        $this->output->write($messages, $newline, $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function writeln($messages, $type = self::OUTPUT_NORMAL)
-    {
-        $this->output->writeln($messages, $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setVerbosity($level)
-    {
-        $this->output->setVerbosity($level);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getVerbosity()
-    {
-        return $this->output->getVerbosity();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDecorated($decorated)
-    {
-        $this->output->setDecorated($decorated);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isDecorated()
-    {
-        return $this->output->isDecorated();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(OutputFormatterInterface $formatter)
-    {
-        $this->output->setFormatter($formatter);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormatter()
-    {
-        return $this->output->getFormatter();
-    }
 }
+
diff --git a/...onsole/Helper/Formatter/TextFormatter.php → .../Console/Style/Standard/TextFormatter.php b/...onsole/Helper/Formatter/TextFormatter.php → .../Console/Style/Standard/TextFormatter.php
@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Console\Helper\Formatter;
+namespace Symfony\Component\Console\Style\Standard;
+
+use Symfony\Component\Console\Style\FormatterInterface;
 
 /**
  * Formats informational text

diff --git a/...nsole/Helper/Formatter/TitleFormatter.php → ...Console/Style/Standard/TitleFormatter.php b/...nsole/Helper/Formatter/TitleFormatter.php → ...Console/Style/Standard/TitleFormatter.php
@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Console\Helper\Formatter;
+namespace Symfony\Component\Console\Style\Standard;
+
+use Symfony\Component\Console\Style\FormatterInterface;
 
 /**
  * Formats a command title