From 848e2a3f85352a78c861c44c1f0210974ea2c46d Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Wed, 17 May 2023 10:32:01 +0200
Subject: [PATCH 1/3] php-http/message stopped providing
 php-http/message-factory

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 92e08650..e57e4410 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
         "php-http/client-implementation": "^1.0 || ^2.0",
         "php-http/client-common": "^1.1.0 || ^2.0",
         "php-http/message": "^1.0 || ^2.0",
+        "php-http/message-factory": "^1.0",
         "php-http/discovery": "^1.12"
     },
     "require-dev": {

From 75fbaf591a4b5a6c3dd77e101888561829b2cb53 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Wed, 17 May 2023 10:47:47 +0200
Subject: [PATCH 2/3] compatibility with phpunit 10

---
 tests/Functional/Varnish/UserContextFailureTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Functional/Varnish/UserContextFailureTest.php b/tests/Functional/Varnish/UserContextFailureTest.php
index f60af320..cc256ddf 100644
--- a/tests/Functional/Varnish/UserContextFailureTest.php
+++ b/tests/Functional/Varnish/UserContextFailureTest.php
@@ -31,7 +31,9 @@ class UserContextFailureTest extends VarnishTestCase
     public function setUp(): void
     {
         // needs to be decided before doing the setup
-        $this->mode = 'testHashRequestFailure' === $this->getName() ? 'failure' : 'cache';
+        // phpunit 9 calls the method getName(), phpunit 10 name()
+        $name = method_exists($this, 'name') ? $this->name() : $this->getName(); /* @phpstan-ignore-line */
+        $this->mode = 'testHashRequestFailure' === $name ? 'failure' : 'cache';
 
         parent::setUp();
     }

From 1fe8f1cdc2d49bdf7bddb7f0244699dcae6c339c Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Wed, 17 May 2023 10:56:31 +0200
Subject: [PATCH 3/3] ubuntu 18.04 has been stopped by github

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ae2ec76..8c215338 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
 
   legacyPHP:
     name: PHP 7.2 Varnish 6
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       VARNISH_VERSION: '6.6'
       VARNISH_MODULES_VERSION: '0.18.0'
@@ -169,7 +169,7 @@ jobs:
 
   lowest:
     name: PHP ${{ matrix.php }} Lowest, Varnish 3
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       VARNISH_VERSION: '3.0'
       VARNISH_MODULES_VERSION: ''