Merge branch '2.7' into 2.8

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

Author: nicolas-grekas

Tests/Config/FileLocatorTest.php

@@ -30,7 +30,7 @@ public function testLocate()
         $kernel
             ->expects($this->never())
             ->method('locateResource');
-        $this->setExpectedException('LogicException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('LogicException');
         $locator->locate('/some/path');
     }
 

Tests/DependencyInjection/ContainerAwareHttpKernelTest.php

@@ -104,6 +104,8 @@ public function testHandleRestoresThePreviousRequestOnException($type)
         try {
             $kernel->handle($request, $type);
             $this->fail('->handle() suppresses the controller exception');
+        } catch (\PHPUnit\Framework\Exception $e) {
+            throw $e;
         } catch (\PHPUnit_Framework_Exception $e) {
             throw $e;
         } catch (\Exception $e) {