Merge branch '3.4' into 4.2

* 3.4:
  [Serializer] Respect ignored attributes in cache key of normalizer
  fix resetting the COLUMN environment variable
  Fix TestRunner compatibility to PhpUnit 8
  prevent mixup of the object to populate

Author: xabbuh

Tests/ApplicationTest.php

@@ -48,6 +48,14 @@ protected function setUp()
         $this->colSize = getenv('COLUMNS');
     }
 
+    protected function tearDown()
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+        putenv('SHELL_VERBOSITY');
+        unset($_ENV['SHELL_VERBOSITY']);
+        unset($_SERVER['SHELL_VERBOSITY']);
+    }
+
     public static function setUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/Fixtures/');
@@ -1749,14 +1757,6 @@ public function testThrowingErrorListener()
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'foo']);
     }
-
-    protected function tearDown()
-    {
-        putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
-        putenv('SHELL_VERBOSITY');
-        unset($_ENV['SHELL_VERBOSITY']);
-        unset($_SERVER['SHELL_VERBOSITY']);
-    }
 }
 
 class CustomApplication extends Application

Tests/Helper/ProgressBarTest.php

@@ -33,7 +33,7 @@ protected function setUp()
 
     protected function tearDown()
     {
-        putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
     }
 
     public function testMultipleStart()

Tests/Style/SymfonyStyleTest.php

@@ -38,7 +38,7 @@ protected function setUp()
 
     protected function tearDown()
     {
-        putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
         $this->command = null;
         $this->tester = null;
     }

Tests/TerminalTest.php

@@ -25,6 +25,12 @@ protected function setUp()
         $this->lineSize = getenv('LINES');
     }
 
+    protected function tearDown()
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+        putenv($this->lineSize ? 'LINES' : 'LINES='.$this->lineSize);
+    }
+
     public function test()
     {
         putenv('COLUMNS=100');
@@ -40,12 +46,6 @@ public function test()
         $this->assertSame(60, $terminal->getHeight());
     }
 
-    protected function tearDown()
-    {
-        putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
-        putenv($this->lineSize ? 'LINES' : 'LINES='.$this->lineSize);
-    }
-
     public function test_zero_values()
     {
         putenv('COLUMNS=0');