Merge branch '3.1' into 3.2

* 3.1:
  [TwigBundle] fixed usage when Templating is not installed
  [Validator] Check cascasdedGroups for being countable
  [Cache] Add changelog
  [Filesystem] Check that the directory is writable after created it in dumpFile()
  [HttpFoundation] Improved set cookie header tests
  [Serializer] int is valid when float is expected when deserializing JSON
  [Console] increased code coverage of Output classes
  Added missing headers in fixture files
  [Profiler][VarDumper] Fix minor color issue & duplicated selector

Author: fabpot

Tests/Output/ConsoleOutputTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Output;
 
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\Output;
 
@@ -22,4 +23,19 @@ public function testConstructor()
         $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');
         $this->assertSame($output->getFormatter(), $output->getErrorOutput()->getFormatter(), '__construct() takes a formatter or null as the third argument');
     }
+
+    public function testSetFormatter()
+    {
+        $output = new ConsoleOutput();
+        $outputFormatter = new OutputFormatter();
+        $output->setFormatter($outputFormatter);
+        $this->assertSame($outputFormatter, $output->getFormatter());
+    }
+
+    public function testSetVerbosity()
+    {
+        $output = new ConsoleOutput();
+        $output->setVerbosity(Output::VERBOSITY_VERBOSE);
+        $this->assertSame(Output::VERBOSITY_VERBOSE, $output->getVerbosity());
+    }
 }

Tests/Output/NullOutputTest.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Console\Tests\Output;
 
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class NullOutputTest extends \PHPUnit_Framework_TestCase
@@ -36,4 +38,50 @@ public function testVerbosity()
         $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
         $this->assertSame(OutputInterface::VERBOSITY_QUIET, $output->getVerbosity(), '->getVerbosity() always returns VERBOSITY_QUIET for NullOutput');
     }
+
+    public function testSetFormatter()
+    {
+        $output = new NullOutput();
+        $outputFormatter = new OutputFormatter();
+        $output->setFormatter($outputFormatter);
+        $this->assertNotSame($outputFormatter, $output->getFormatter());
+    }
+
+    public function testSetVerbosity()
+    {
+        $output = new NullOutput();
+        $output->setVerbosity(Output::VERBOSITY_NORMAL);
+        $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity());
+    }
+
+    public function testSetDecorated()
+    {
+        $output = new NullOutput();
+        $output->setDecorated(true);
+        $this->assertFalse($output->isDecorated());
+    }
+
+    public function testIsQuiet()
+    {
+        $output = new NullOutput();
+        $this->assertTrue($output->isQuiet());
+    }
+
+    public function testIsVerbose()
+    {
+        $output = new NullOutput();
+        $this->assertFalse($output->isVerbose());
+    }
+
+    public function testIsVeryVerbose()
+    {
+        $output = new NullOutput();
+        $this->assertFalse($output->isVeryVerbose());
+    }
+
+    public function testIsDebug()
+    {
+        $output = new NullOutput();
+        $this->assertFalse($output->isDebug());
+    }
 }