Merge branch '2.2' into 2.7

# Conflicts:
#	tests/Test/AccessibleObjectTest.php

tests/Cache/FileHandlerTest.php

@@ -28,6 +28,8 @@ final class FileHandlerTest extends TestCase
 {
     protected function tearDown()
     {
+        parent::tearDown();
+
         $file = $this->getFile();
 
         if (file_exists($file)) {

tests/Console/Command/DescribeCommandTest.php

@@ -39,6 +39,8 @@ final class DescribeCommandTest extends TestCase
 
     protected function setUp()
     {
+        parent::setUp();
+
         $this->application = new Application();
     }
 

tests/Console/Command/FixCommandTest.php

@@ -32,6 +32,8 @@ final class FixCommandTest extends TestCase
 
     protected function setUp()
     {
+        parent::setUp();
+
         $this->application = new Application();
     }
 

tests/Console/ConfigurationResolverTest.php

@@ -36,11 +36,15 @@ final class ConfigurationResolverTest extends TestCase
 
     protected function setUp()
     {
+        parent::setUp();
+
         $this->config = new Config();
     }
 
     protected function tearDown()
     {
+        parent::tearDown();
+
         unset($this->config);
     }
 

tests/Report/AbstractReporterTestCase.php

@@ -30,6 +30,8 @@ abstract class AbstractReporterTestCase extends TestCase
 
     protected function setUp()
     {
+        parent::setUp();
+
         $this->reporter = $this->createReporter();
     }
 

tests/Test/AbstractFixerTestCase.php

@@ -51,6 +51,8 @@ abstract class AbstractFixerTestCase extends TestCase
 
     protected function setUp()
     {
+        parent::setUp();
+
         $this->linter = $this->getLinter();
         $this->fixer = $this->createFixer();
 
@@ -62,6 +64,8 @@ abstract class AbstractFixerTestCase extends TestCase
 
     protected function tearDown()
     {
+        parent::tearDown();
+
         // @todo remove at 3.0
         Tokens::setLegacyMode(false);
     }

tests/Test/AbstractIntegrationTestCase.php

@@ -75,6 +75,8 @@ abstract class AbstractIntegrationTestCase extends TestCase
 
     public static function setUpBeforeClass()
     {
+        parent::setUpBeforeClass();
+
         $tmpFile = static::getTempFile();
         self::$fileRemoval = new FileRemoval();
         self::$fileRemoval->observe($tmpFile);
@@ -91,6 +93,8 @@ abstract class AbstractIntegrationTestCase extends TestCase
 
     public static function tearDownAfterClass()
     {
+        parent::tearDownAfterClass();
+
         $tmpFile = static::getTempFile();
 
         self::$fileRemoval->delete($tmpFile);
@@ -98,6 +102,8 @@ abstract class AbstractIntegrationTestCase extends TestCase
 
     protected function setUp()
     {
+        parent::setUp();
+
         $this->linter = $this->getLinter();
 
         // @todo remove at 3.0 together with env var itself
@@ -108,6 +114,8 @@ abstract class AbstractIntegrationTestCase extends TestCase
 
     protected function tearDown()
     {
+        parent::tearDown();
+
         // @todo remove at 3.0
         Tokens::setLegacyMode(false);
     }

tests/Test/AbstractTransformerTestCase.php

@@ -25,6 +25,8 @@ abstract class AbstractTransformerTestCase extends TestCase
 {
     protected function setUp()
     {
+        parent::setUp();
+
         // @todo remove at 3.0 together with env var itself
         if (getenv('PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER')) {
             Tokens::setLegacyMode(true);
@@ -33,6 +35,8 @@ abstract class AbstractTransformerTestCase extends TestCase
 
     protected function tearDown()
     {
+        parent::tearDown();
+
         // @todo remove at 3.0
         Tokens::setLegacyMode(false);
     }