Merge branch '2.1'

Author: dunglas

src/Bridge/Symfony/Routing/Router.php

@@ -75,6 +75,7 @@ public function match($pathInfo)
         $context = (new RequestContext())->fromRequest($request);
         $context->setPathInfo($pathInfo);
         $context->setScheme($baseContext->getScheme());
+        $context->setHost($baseContext->getHost());
 
         try {
             $this->router->setContext($context);

tests/EventListener/AddFormatListenerTest.php

@@ -32,10 +32,10 @@ public function testNoResourceClass()
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
         $event = $eventProphecy->reveal();
 
-        $listener = new AddFormatListener(new Negotiator(), ['jsonld' => 'application/ld+json']);
+        $listener = new AddFormatListener(new Negotiator(), ['notexist' => 'application/vnd.notexist']);
         $listener->onKernelRequest($event);
 
-        $this->assertNull($request->getFormat('application/ld+json'));
+        $this->assertNull($request->getFormat('application/vnd.notexist'));
     }
 
     public function testSupportedRequestFormat()