Merge pull request webmozart#20 from sstok/feature-full-symfony-adapter

Complete the Symfony adapters for interactive and decorated

src/Adapter/ArgsInput.php

@@ -35,6 +35,11 @@ class ArgsInput implements InputInterface
      */
     private $args;
 
+    /**
+     * @var bool
+     */
+    private $interactive = true;
+
     /**
      * Creates the adapter.
      *
@@ -223,13 +228,14 @@ public function hasOption($name)
      */
     public function isInteractive()
     {
-        return true;
+        return $this->interactive;
     }
 
     /**
      * {@inheritdoc}
      */
     public function setInteractive($interactive)
     {
+        $this->interactive = $interactive;
     }
 }

src/Adapter/IOOutput.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Webmozart\Console\Api\IO\IO;
+use Webmozart\Console\Formatter\AnsiFormatter;
 
 /**
  * Adapts an {@link IO} instance to Symfony's {@link OutputInterface} API.
@@ -29,6 +30,11 @@ class IOOutput implements OutputInterface
      */
     private $io;
 
+    /**
+     * @var bool
+     */
+    private $decorated;
+
     /**
      * Creates a new composite output.
      *
@@ -37,6 +43,7 @@ class IOOutput implements OutputInterface
     public function __construct(IO $io)
     {
         $this->io = $io;
+        $this->decorated = $this->io->getFormatter() instanceof AnsiFormatter;
     }
 
     /**
@@ -162,14 +169,15 @@ public function isDebug()
      */
     public function setDecorated($decorated)
     {
+        $this->decorated = $decorated;
     }
 
     /**
      * {@inheritdoc}
      */
     public function isDecorated()
     {
-        return false;
+        return $this->decorated;
     }
 
     /**

tests/Adapter/ArgsInputTest.php

@@ -231,4 +231,15 @@ public function testHasOption()
         $this->assertFalse($inputArgs->hasOption('option3'));
         $this->assertFalse($inputNoArgs->hasOption('option1'));
     }
+
+    public function testSetInteractive()
+    {
+        $inputArgs = new ArgsInput($this->rawArgs, $this->args);
+
+        $this->assertTrue($inputArgs->isInteractive());
+
+        $inputArgs->setInteractive(false);
+
+        $this->assertFalse($inputArgs->isInteractive());
+    }
 }

tests/Adapter/IOOutputTest.php

@@ -19,6 +19,7 @@
 use Webmozart\Console\Api\IO\Input;
 use Webmozart\Console\Api\IO\IO;
 use Webmozart\Console\Api\IO\Output;
+use Webmozart\Console\Formatter\AnsiFormatter;
 use Webmozart\Console\IO\InputStream\StringInputStream;
 use Webmozart\Console\IO\OutputStream\BufferedOutputStream;
 
@@ -284,6 +285,34 @@ public function testGetVerbosityQuiet()
         $this->assertSame(OutputInterface::VERBOSITY_QUIET, $this->output->getVerbosity());
     }
 
+    public function testIsDecorated()
+    {
+        $input = new Input(new StringInputStream());
+        $output = new Output(new BufferedOutputStream(), new AnsiFormatter());
+        $nonDecoratedOutput = new Output(new BufferedOutputStream());
+        $errorOutput = new Output(new BufferedOutputStream());
+
+        // Decorated
+        $this->io = new IO($input, $output, $errorOutput);
+        $this->output = new IOOutput($this->io);
+
+        $this->assertTrue($this->output->isDecorated());
+
+        $this->output->setDecorated(false);
+
+        $this->assertFalse($this->output->isDecorated());
+
+        // Non decorated
+        $this->io = new IO($input, $nonDecoratedOutput, $errorOutput);
+        $this->output = new IOOutput($this->io);
+
+        $this->assertFalse($this->output->isDecorated());
+
+        $this->output->setDecorated(true);
+
+        $this->assertTrue($this->output->isDecorated());
+    }
+
     public function testGetFormatter()
     {
         $this->assertEquals(new FormatterAdapter($this->io), $this->output->getFormatter());