Merge branch '2.7' into 2.8

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

Author: nicolas-grekas

Tests/ContainerBuilderTest.php

@@ -659,7 +659,7 @@ public function testExtension()
         $container->registerExtension($extension = new \ProjectExtension());
         $this->assertTrue($container->getExtension('project') === $extension, '->registerExtension() registers an extension');
 
-        $this->setExpectedException('LogicException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('LogicException');
         $container->getExtension('no_registered');
     }
 

Tests/DefinitionTest.php

@@ -67,7 +67,14 @@ public function testSetGetDecoratedService()
         $this->assertNull($def->getDecoratedService());
 
         $def = new Definition('stdClass');
-        $this->setExpectedException('InvalidArgumentException', 'The decorated service inner name for "foo" must be different than the service name itself.');
+
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('InvalidArgumentException');
+            $this->expectExceptionMessage('The decorated service inner name for "foo" must be different than the service name itself.');
+        } else {
+            $this->setExpectedException('InvalidArgumentException', 'The decorated service inner name for "foo" must be different than the service name itself.');
+        }
+
         $def->setDecoratedService('foo', 'foo');
     }