Merge branch '3.4' into 4.3

* 3.4:
  Use `::class` constants instead of `__NAMESPACE__` when possible

Author: nicolas-grekas

Definition/Builder/NodeBuilder.php

@@ -24,13 +24,13 @@ class NodeBuilder implements NodeParentInterface
     public function __construct()
     {
         $this->nodeMapping = [
-            'variable' => __NAMESPACE__.'\\VariableNodeDefinition',
-            'scalar' => __NAMESPACE__.'\\ScalarNodeDefinition',
-            'boolean' => __NAMESPACE__.'\\BooleanNodeDefinition',
-            'integer' => __NAMESPACE__.'\\IntegerNodeDefinition',
-            'float' => __NAMESPACE__.'\\FloatNodeDefinition',
-            'array' => __NAMESPACE__.'\\ArrayNodeDefinition',
-            'enum' => __NAMESPACE__.'\\EnumNodeDefinition',
+            'variable' => VariableNodeDefinition::class,
+            'scalar' => ScalarNodeDefinition::class,
+            'boolean' => BooleanNodeDefinition::class,
+            'integer' => IntegerNodeDefinition::class,
+            'float' => FloatNodeDefinition::class,
+            'array' => ArrayNodeDefinition::class,
+            'enum' => EnumNodeDefinition::class,
         ];
     }
 

Tests/Definition/Builder/NodeBuilderTest.php

@@ -35,7 +35,7 @@ public function testThrowsAnExceptionWhenTheNodeClassIsNotFound()
 
     public function testAddingANewNodeType()
     {
-        $class = __NAMESPACE__.'\\SomeNodeDefinition';
+        $class = SomeNodeDefinition::class;
 
         $builder = new BaseNodeBuilder();
         $node = $builder
@@ -47,7 +47,7 @@ public function testAddingANewNodeType()
 
     public function testOverridingAnExistingNodeType()
     {
-        $class = __NAMESPACE__.'\\SomeNodeDefinition';
+        $class = SomeNodeDefinition::class;
 
         $builder = new BaseNodeBuilder();
         $node = $builder
@@ -66,7 +66,7 @@ public function testNodeTypesAreNotCaseSensitive()
 
         $this->assertInstanceOf(\get_class($node1), $node2);
 
-        $builder->setNodeClass('CuStOm', __NAMESPACE__.'\\SomeNodeDefinition');
+        $builder->setNodeClass('CuStOm', SomeNodeDefinition::class);
 
         $node1 = $builder->node('', 'CUSTOM');
         $node2 = $builder->node('', 'custom');

Tests/Util/XmlUtilsTest.php

@@ -48,7 +48,7 @@ public function testLoadFile()
             $this->assertStringContainsString('XSD file or callable', $e->getMessage());
         }
 
-        $mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
+        $mock = $this->getMockBuilder(Validator::class)->getMock();
         $mock->expects($this->exactly(2))->method('validate')->will($this->onConsecutiveCalls(false, true));
 
         try {
@@ -68,7 +68,7 @@ public function testParseWithInvalidValidatorCallable()
         $this->expectExceptionMessage('The XML is not valid');
         $fixtures = __DIR__.'/../Fixtures/Util/';
 
-        $mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
+        $mock = $this->getMockBuilder(Validator::class)->getMock();
         $mock->expects($this->once())->method('validate')->willReturn(false);
 
         XmlUtils::parse(file_get_contents($fixtures.'valid.xml'), [$mock, 'validate']);