Don't replace existing link

dunglas · dunglas · commit 16b078f6a117 · 2017-02-03T08:59:04.000+01:00
diff --git a/src/Symfony/Component/Asset/EventListener/PreloadListener.php b/src/Symfony/Component/Asset/EventListener/PreloadListener.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Asset\EventListener;
 
 use Symfony\Component\Asset\Preload\PreloadManager;
+use Symfony\Component\Asset\Preload\PreloadManagerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -25,7 +26,7 @@ class PreloadListener implements EventSubscriberInterface
 {
     private $preloadManager;
 
-    public function __construct(PreloadManager $preloadManager)
+    public function __construct(PreloadManagerInterface $preloadManager)
     {
         $this->preloadManager = $preloadManager;
     }
@@ -37,7 +38,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         }
 
         if ($value = $this->preloadManager->buildLinkValue()) {
-            $event->getResponse()->headers->set('Link', $value);
+            $event->getResponse()->headers->set('Link', $value, false);
 
             // Free memory
             $this->preloadManager->clear();
diff --git a/src/Symfony/Component/Asset/Tests/EventListener/PreloadListenerTest.php b/src/Symfony/Component/Asset/Tests/EventListener/PreloadListenerTest.php
@@ -29,7 +29,7 @@ public function testOnKernelResponse()
         $manager->addResource('/foo');
 
         $subscriber = new PreloadListener($manager);
-        $response = new Response();
+        $response = new Response('', 200, array('Link' => '<https://demo.api-platform.com/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"'));
 
         $event = $this->getMockBuilder(FilterResponseEvent::class)->disableOriginalConstructor()->getMock();
         $event->method('isMasterRequest')->willReturn(true);
@@ -38,7 +38,13 @@ public function testOnKernelResponse()
         $subscriber->onKernelResponse($event);
 
         $this->assertInstanceOf(EventSubscriberInterface::class, $subscriber);
-        $this->assertEquals('</foo>; rel=preload', $response->headers->get('Link'));
+
+        $expected = array(
+            '<https://demo.api-platform.com/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"',
+            '</foo>; rel=preload',
+        );
+
+        $this->assertEquals($expected, $response->headers->get('Link', null, false));
         $this->assertNull($manager->buildLinkValue());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Asset\EventListener;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Asset\Preload\PreloadManager;`
	`15`	`+use Symfony\Component\Asset\Preload\PreloadManagerInterface;`
`15`	`16`	`use Symfony\Component\EventDispatcher\EventSubscriberInterface;`
`16`	`17`	`use Symfony\Component\HttpKernel\Event\FilterResponseEvent;`
`17`	`18`	`use Symfony\Component\HttpKernel\KernelEvents;`
`@@ -25,7 +26,7 @@ class PreloadListener implements EventSubscriberInterface`
`25`	`26`	`{`
`26`	`27`	`private $preloadManager;`
`27`	`28`
`28`		`- public function __construct(PreloadManager $preloadManager)`
	`29`	`+ public function __construct(PreloadManagerInterface $preloadManager)`
`29`	`30`	`{`
`30`	`31`	`$this->preloadManager = $preloadManager;`
`31`	`32`	`}`
`@@ -37,7 +38,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`if ($value = $this->preloadManager->buildLinkValue()) {`
`40`		`- $event->getResponse()->headers->set('Link', $value);`
	`41`	`+ $event->getResponse()->headers->set('Link', $value, false);`
`41`	`42`
`42`	`43`	`// Free memory`
`43`	`44`	`$this->preloadManager->clear();`