Merge pull request #543 from FriendsOfSymfony/fix-php-http-dependency

php-http/message stopped providing php-http/message-factory
FriendsOfSymfony · May 17, 2023 · 0f3b819 · 0f3b819
2 parents 652f4f5 + 1fe8f1c
commit 0f3b819
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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: ''

diff --git 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": {

diff --git 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();
     }