Merge branch '4.3' into 4.4

* 4.3:
  Disable phpunit typehint patch on 4.3 branch
  Fix deprecation on 4.3

Author: nicolas-grekas

Tests/ConfigCacheTest.php

@@ -19,12 +19,12 @@ class ConfigCacheTest extends TestCase
 {
     private $cacheFile = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cacheFile = tempnam(sys_get_temp_dir(), 'config_');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $files = [$this->cacheFile, $this->cacheFile.'.meta'];
 

Tests/Definition/Builder/NodeDefinitionTest.php

@@ -14,26 +14,25 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;
 
 class NodeDefinitionTest extends TestCase
 {
-    public function testDefaultPathSeparatorIsDot()
-    {
-        $node = $this->getMockForAbstractClass(NodeDefinition::class, ['foo']);
-
-        $this->assertAttributeSame('.', 'pathSeparator', $node);
-    }
-
     public function testSetPathSeparatorChangesChildren()
     {
-        $node = new ArrayNodeDefinition('foo');
-        $scalar = new ScalarNodeDefinition('bar');
-        $node->append($scalar);
-
-        $node->setPathSeparator('/');
-
-        $this->assertAttributeSame('/', 'pathSeparator', $node);
-        $this->assertAttributeSame('/', 'pathSeparator', $scalar);
+        $parentNode = new ArrayNodeDefinition('name');
+        $childNode = $this->createMock(NodeDefinition::class);
+
+        $childNode
+            ->expects($this->once())
+            ->method('setPathSeparator')
+            ->with('/');
+        $childNode
+            ->expects($this->once())
+            ->method('setParent')
+            ->with($parentNode)
+            ->willReturn($childNode);
+        $parentNode->append($childNode);
+
+        $parentNode->setPathSeparator('/');
     }
 }

Tests/Resource/DirectoryResourceTest.php

@@ -18,7 +18,7 @@ class DirectoryResourceTest extends TestCase
 {
     protected $directory;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->directory = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'symfonyDirectoryIterator';
         if (!file_exists($this->directory)) {
@@ -27,7 +27,7 @@ protected function setUp()
         touch($this->directory.'/tmp.xml');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if (!is_dir($this->directory)) {
             return;

Tests/Resource/FileExistenceResourceTest.php

@@ -20,14 +20,14 @@ class FileExistenceResourceTest extends TestCase
     protected $file;
     protected $time;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';
         $this->time = time();
         $this->resource = new FileExistenceResource($this->file);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if (file_exists($this->file)) {
             unlink($this->file);

Tests/Resource/FileResourceTest.php

@@ -20,15 +20,15 @@ class FileResourceTest extends TestCase
     protected $file;
     protected $time;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->file = sys_get_temp_dir().'/tmp.xml';
         $this->time = time();
         touch($this->file, $this->time);
         $this->resource = new FileResource($this->file);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if (!file_exists($this->file)) {
             return;

Tests/Resource/GlobResourceTest.php

@@ -16,7 +16,7 @@
 
 class GlobResourceTest extends TestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $dir = \dirname(__DIR__).'/Fixtures';
         @rmdir($dir.'/TmpGlob');

Tests/ResourceCheckerConfigCacheTest.php

@@ -20,12 +20,12 @@ class ResourceCheckerConfigCacheTest extends TestCase
 {
     private $cacheFile = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cacheFile = tempnam(sys_get_temp_dir(), 'config_');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $files = [$this->cacheFile, "{$this->cacheFile}.meta"];