Merge branch '2.7' into 2.8

* 2.7:
  Further refactorings to PHPUnit namespaces
  resolve parameters in definition classes

Author: nicolas-grekas

Tests/Definition/ScalarNodeTest.php

@@ -63,7 +63,12 @@ public function testNormalizeThrowsExceptionWithoutHint()
     {
         $node = new ScalarNode('test');
 
-        $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', 'Invalid type for path "test". Expected scalar, but got array.');
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+            $this->expectExceptionMessage('Invalid type for path "test". Expected scalar, but got array.');
+        } else {
+            $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', 'Invalid type for path "test". Expected scalar, but got array.');
+        }
 
         $node->normalize(array());
     }
@@ -73,7 +78,12 @@ public function testNormalizeThrowsExceptionWithErrorMessage()
         $node = new ScalarNode('test');
         $node->setInfo('"the test value"');
 
-        $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', "Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+            $this->expectExceptionMessage("Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
+        } else {
+            $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', "Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
+        }
 
         $node->normalize(array());
     }

Tests/Util/XmlUtilsTest.php

@@ -151,7 +151,14 @@ public function getDataForPhpize()
     public function testLoadEmptyXmlFile()
     {
         $file = __DIR__.'/../Fixtures/foo.xml';
-        $this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));
+
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('InvalidArgumentException');
+            $this->expectExceptionMessage(sprintf('File %s does not contain valid XML, it is empty.', $file));
+        } else {
+            $this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));
+        }
+
         XmlUtils::loadFile($file);
     }