Merge branch '2.7' into 2.8

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

Author: nicolas-grekas

Tests/Catalogue/AbstractOperationTest.php

@@ -41,7 +41,7 @@ public function testGetMergedDomains()
 
     public function testGetMessagesFromUnknownDomain()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
         $this->createOperation(
             new MessageCatalogue('en'),
             new MessageCatalogue('en')

Tests/Loader/QtFileLoaderTest.php

@@ -62,7 +62,14 @@ public function testLoadEmptyResource()
     {
         $loader = new QtFileLoader();
         $resource = __DIR__.'/../fixtures/empty.xlf';
-        $this->setExpectedException('Symfony\Component\Translation\Exception\InvalidResourceException', sprintf('Unable to load "%s".', $resource));
+
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
+            $this->expectExceptionMessage(sprintf('Unable to load "%s".', $resource));
+        } else {
+            $this->setExpectedException('Symfony\Component\Translation\Exception\InvalidResourceException', sprintf('Unable to load "%s".', $resource));
+        }
+
         $loader->load($resource, 'en', 'domain1');
     }
 }

Tests/Loader/XliffFileLoaderTest.php

@@ -148,7 +148,14 @@ public function testParseEmptyFile()
     {
         $loader = new XliffFileLoader();
         $resource = __DIR__.'/../fixtures/empty.xlf';
-        $this->setExpectedException('Symfony\Component\Translation\Exception\InvalidResourceException', sprintf('Unable to load "%s":', $resource));
+
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
+            $this->expectExceptionMessage(sprintf('Unable to load "%s":', $resource));
+        } else {
+            $this->setExpectedException('Symfony\Component\Translation\Exception\InvalidResourceException', sprintf('Unable to load "%s":', $resource));
+        }
+
         $loader->load($resource, 'en', 'domain1');
     }