Merge branch '2.2'

dunglas · dunglas · commit 2f941fc3c0dc · 2018-06-28T13:52:36.000+02:00
diff --git a/composer.json b/composer.json
@@ -26,6 +26,8 @@
         "willdurand/negotiation": "^2.0.3"
     },
     "require-dev": {
+        "symfony/http-foundation": "^3.1@dev || ^4.0@dev",
+
         "behat/behat": "^3.1",
         "behat/mink": "^1.7",
         "behat/mink-browserkit-driver": "^1.3.1",
diff --git a/src/EventListener/WriteListener.php b/src/EventListener/WriteListener.php
@@ -22,7 +22,7 @@
  * @author Kévin Dunglas <dunglas@gmail.com>
  * @author Baptiste Meyer <baptiste.meyer@gmail.com>
  */
-class WriteListener
+final class WriteListener
 {
     private $dataPersister;
 
diff --git a/src/HttpCache/EventListener/AddTagsListener.php b/src/HttpCache/EventListener/AddTagsListener.php
@@ -66,6 +66,6 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        $event->getResponse()->headers->set('Cache-Tags', implode(',', $resources));
+        $response->headers->set('Cache-Tags', implode(',', $resources));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* @author Kévin Dunglas <[email protected]>`
`23`	`23`	`* @author Baptiste Meyer <[email protected]>`
`24`	`24`	`*/`
`25`		`-class WriteListener`
	`25`	`+final class WriteListener`
`26`	`26`	`{`
`27`	`27`	`private $dataPersister;`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,6 @@ public function onKernelResponse(FilterResponseEvent $event)`
`66`	`66`	`return;`
`67`	`67`	`}`
`68`	`68`
`69`		`- $event->getResponse()->headers->set('Cache-Tags', implode(',', $resources));`
	`69`	`+ $response->headers->set('Cache-Tags', implode(',', $resources));`
`70`	`70`	`}`
`71`	`71`	`}`