Merge pull request #166 from netglue/dependencies

Add support for PHP 8.5

Author: gsteel

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "~8.2.0 || ~8.3 || ~8.4",
+        "php": "~8.2.0 || ~8.3 || ~8.4 || ~8.5",
         "ext-json": "*",
         "php-http/discovery": "^1.14.1",
         "psr/http-client": "^1.0",
@@ -24,16 +24,16 @@
     "require-dev": {
         "ext-curl": "*",
         "doctrine/coding-standard": "^14.0",
-        "infection/infection": "^0.32.0",
-        "laminas/laminas-diactoros": "^3.6.0",
-        "php-http/curl-client": "^2.3.3",
-        "phpunit/phpunit": "^11.5.42",
+        "infection/infection": "^0.32.3",
+        "laminas/laminas-diactoros": "^3.8.0",
+        "php-http/curl-client": "^2.4.0",
+        "phpunit/phpunit": "^11.5.52 || ^12",
         "psalm/plugin-phpunit": "^0.19.5",
-        "react/child-process": "^0.6.6",
+        "react/child-process": "^0.6.7",
         "react/http": "^1.11",
         "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^4.0.0",
-        "vimeo/psalm": "^6.13.1"
+        "squizlabs/php_codesniffer": "^4.0.1",
+        "vimeo/psalm": "^6.15.1"
     },
     "conflict": {
         "php-http/httplug": "<2.4.1",

composer.lock

@@ -2,13 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         displayDetailsOnIncompleteTests="true"
-         displayDetailsOnSkippedTests="true"
-         displayDetailsOnTestsThatTriggerDeprecations="true"
-         displayDetailsOnTestsThatTriggerErrors="true"
-         displayDetailsOnTestsThatTriggerNotices="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnAllIssues="true"
          failOnWarning="true"
          failOnNotice="true"
          failOnDeprecation="true"

phpunit.xml.dist

@@ -24,15 +24,15 @@ public function testPsrErrorWillHaveTheExpectedCode(): void
     {
         $error = RequestFailure::withPsrError(
             new Request('/foo'),
-            $this->createMock(ClientExceptionInterface::class),
+            $this->createStub(ClientExceptionInterface::class),
         );
 
         self::assertEquals(0, $error->getCode());
     }
 
     public function testPsrErrorWillReferencePreviousException(): void
     {
-        $exception = $this->createMock(ClientExceptionInterface::class);
+        $exception = $this->createStub(ClientExceptionInterface::class);
         $error = RequestFailure::withPsrError(
             new Request('/foo'),
             $exception,

test/Unit/Exception/RequestFailureTest.php

@@ -15,7 +15,7 @@ public function testThatTheExpectedCodeIsReported(): void
     {
         $error = UnexpectedStatusCode::withExpectedCode(
             123,
-            $this->createMock(ServerRequestInterface::class),
+            $this->createStub(ServerRequestInterface::class),
             new TextResponse('Foo', 234),
         );