Merge pull request #550 from FriendsOfSymfony/fix-build

fix regression in unit tests
FriendsOfSymfony · Nov 30, 2023 · 6fe87e9 · 6fe87e9
2 parents c91dbdf + 2dc5521
commit 6fe87e9
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
 
   varnish5:
     name: PHP ${{ matrix.php }} Legacy Varnish 5
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       VARNISH_VERSION: '5.1'
       VARNISH_MODULES_VERSION: '0.14.0'
@@ -132,7 +132,7 @@ jobs:
 
   varnish4:
     name: PHP ${{ matrix.php }} Legacy Varnish 4
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       VARNISH_VERSION: '4.1'
       VARNISH_MODULES_VERSION: '' # varnish modules compilation fails, not sure why

diff --git a/.github/workflows/setup-varnish-legacy.sh b/.github/workflows/setup-varnish-legacy.sh
@@ -2,6 +2,8 @@
 
 set -e
 echo "### Installing Legacy Varnish $VARNISH_VERSION ###"
+curl -A "FOS Github" -o /tmp/libjemalloc1_3.6.0-11_amd64.deb -D - -L -s http://ftp.osuosl.org/pub/ubuntu/pool/universe/j/jemalloc/libjemalloc1_3.6.0-11_amd64.deb
+sudo dpkg -i /tmp/libjemalloc1_3.6.0-11_amd64.deb
 sudo apt-get update
 sudo apt-get install debian-archive-keyring curl gnupg apt-transport-https
 VARNISH_VERSION=$VARNISH_VERSION bash -c 'curl -s -L https://packagecloud.io/varnishcache/varnish${VARNISH_VERSION//./}/gpgkey' | sudo apt-key add -

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ Changelog
 
 See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpCache/releases).
 
+2.15.2
+------
+
+* Declare incompatibility with Symfony 7 because it removes `RequestMatcher`.
+
 2.15.1
 ------
 

diff --git a/composer.json b/composer.json
@@ -40,7 +40,8 @@
         "symfony/phpunit-bridge": "^5.0 || ^6.0"
     },
     "conflict": {
-        "toflar/psr6-symfony-http-cache-store": "<2.2.1"
+        "toflar/psr6-symfony-http-cache-store": "<2.2.1",
+        "symfony/http-foundation": ">=7"
     },
     "suggest": {
         "friendsofsymfony/http-cache-bundle": "For integration with the Symfony framework",

diff --git a/src/SymfonyCache/EventDispatchingHttpCache.php b/src/SymfonyCache/EventDispatchingHttpCache.php
@@ -102,6 +102,8 @@ class_exists(CacheEvent::class);
      * {@inheritdoc}
      *
      * Trigger event to alter response before storing it in the cache.
+     *
+     * @return void
      */
     protected function store(Request $request, Response $response)
     {

diff --git a/src/Test/EventDispatchingHttpCacheTestCase.php b/src/Test/EventDispatchingHttpCacheTestCase.php
@@ -59,6 +59,7 @@ protected function getHttpCachePartialMock(array $mockedMethods = null)
             'debug' => false,
             'default_ttl' => 0,
             'private_headers' => ['Authorization', 'Cookie'],
+            'skip_response_headers' => ['Set-Cookie'],
             'allow_reload' => false,
             'allow_revalidate' => false,
             'stale_while_revalidate' => 2,