Skip to content

Commit b36a169

Browse files
committed
fix regression in unit tests
our fragile mocking of HttpCache broke.
1 parent c91dbdf commit b36a169

4 files changed

Lines changed: 10 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ Changelog
33

44
See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpCache/releases).
55

6+
2.15.2
7+
------
8+
9+
* Declare incompatibility with Symfony 7 because it removes `RequestMatcher`.
10+
611
2.15.1
712
------
813

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
"symfony/phpunit-bridge": "^5.0 || ^6.0"
4141
},
4242
"conflict": {
43-
"toflar/psr6-symfony-http-cache-store": "<2.2.1"
43+
"toflar/psr6-symfony-http-cache-store": "<2.2.1",
44+
"symfony/http-foundation": ">=7"
4445
},
4546
"suggest": {
4647
"friendsofsymfony/http-cache-bundle": "For integration with the Symfony framework",

src/SymfonyCache/EventDispatchingHttpCache.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ class_exists(CacheEvent::class);
102102
* {@inheritdoc}
103103
*
104104
* Trigger event to alter response before storing it in the cache.
105+
*
106+
* @return void
105107
*/
106108
protected function store(Request $request, Response $response)
107109
{

src/Test/EventDispatchingHttpCacheTestCase.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ protected function getHttpCachePartialMock(array $mockedMethods = null)
5959
'debug' => false,
6060
'default_ttl' => 0,
6161
'private_headers' => ['Authorization', 'Cookie'],
62+
'skip_response_headers' => ['Set-Cookie'],
6263
'allow_reload' => false,
6364
'allow_revalidate' => false,
6465
'stale_while_revalidate' => 2,

0 commit comments

Comments
 (0)