Merge pull request #589 from veewee/php-85-upgrade

Upgrade to PHP 8.5 support

Author: veewee

.github/workflows/grumphp.yml

@@ -8,7 +8,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: ['ubuntu-latest']
-                php-versions: ['8.2', '8.3', '8.4']
+                php-versions: ['8.3', '8.4', '8.5']
                 composer-options: ['', '--prefer-lowest']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} with ${{ matrix.composer-options }}

composer.json

@@ -12,8 +12,8 @@
         }
     ],
     "require": {
-        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
-        "azjezz/psl": "^3.0",
+        "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
+        "azjezz/psl": "^3.0 || ^4.0",
         "laminas/laminas-code": "^4.14.0",
         "php-soap/cached-engine": "~0.3",
         "php-soap/engine": "^2.14.0",
@@ -32,12 +32,12 @@
         "nyholm/psr7": "^1.5",
         "php-http/vcr-plugin": "^1.2",
         "php-parallel-lint/php-parallel-lint": "^1.3",
-        "phpro/grumphp-shim": "^2.9",
+        "phpro/grumphp-shim": "^2.17",
         "phpspec/phpspec": "~7.2",
         "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpstan/phpstan": "^1.12.7",
-        "phpunit/phpunit": "~10.5.37",
-        "squizlabs/php_codesniffer": "^3.7.1",
+        "phpstan/phpstan": "^2.1",
+        "phpunit/phpunit": "~12.4",
+        "squizlabs/php_codesniffer": "^4.0",
         "symfony/cache": "^6.4 || ^7.0"
     },
     "config": {

phpstan.neon

@@ -1,5 +1,8 @@
 parameters:
     level: max
+    treatPhpDocTypesAsCertain: false
+    paths:
+        - src
     ignoreErrors:
         # This is something we hope to fix in PHP 7.4
         # https://wiki.php.net/rfc/covariant-returns-and-contravariant-parameters

phpunit.xml

@@ -2,6 +2,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     displayDetailsOnPhpunitDeprecations="true"
+    displayDetailsOnTestsThatTriggerWarnings="true"
+    failOnWarning="true"
+    failOnPhpunitWarning="true"
     bootstrap="./test/bootstrap.php"
     colors="true"
 >

src/Phpro/SoapClient/CodeGenerator/ClientGenerator.php

@@ -43,7 +43,6 @@ public function __construct(RuleSetInterface $ruleSet)
     public function generate(FileGenerator $file, $client): string
     {
         try {
-            // @phpstan-ignore-next-line
             $class = $file->getClass() ?: new ClassGenerator();
         } catch (ClassNotFoundException $exception) {
             $class = new ClassGenerator();

src/Phpro/SoapClient/CodeGenerator/Config/Config.php

@@ -44,9 +44,9 @@ final class Config
     protected $clientNamespace = '';
 
     /**
-     * @var Engine
+     * @var Engine|null
      */
-    protected $engine;
+    protected $engine = null;
 
     /**
      * @var string

src/Phpro/SoapClient/CodeGenerator/TypeGenerator.php

@@ -40,7 +40,6 @@ public function __construct(RuleSetInterface $ruleSet)
     public function generate(FileGenerator $file, $type): string
     {
         try {
-            // @phpstan-ignore-next-line
             $class = $file->getClass() ?: new ClassGenerator();
         } catch (ClassNotFoundException $exception) {
             $class = new ClassGenerator();

test/PhproTest/SoapClient/Functional/Client/ClientTest.php

@@ -16,6 +16,7 @@
 use Phpro\SoapClient\Type\MixedResult;
 use Phpro\SoapClient\Type\MultiArgumentRequest;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 use Soap\Psr18Transport\Psr18Transport;
 
 class ClientTest extends TestCase
@@ -56,7 +57,7 @@ public function add(MultiArgumentRequest $request): MixedResult
         };
     }
 
-    /** @test */
+    #[Test]
     public function it_can_request_soap_endpoint(): void
     {
         $response = $this->client->add(new MultiArgumentRequest([

test/PhproTest/SoapClient/Unit/Caller/EngineCallerTest.php

@@ -11,6 +11,7 @@
 use Phpro\SoapClient\Type\ResultInterface;
 use Phpro\SoapClient\Type\ResultProviderInterface;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Soap\Engine\Engine;
@@ -32,7 +33,7 @@ protected function setUp(): void
         $this->caller = new EngineCaller($this->engine->reveal());
     }
 
-    /** @test */
+    #[Test]
     public function it_can_handle_simple_request_and_response(): void
     {
         $request = $this->prophesize(RequestInterface::class)->reveal();
@@ -44,7 +45,7 @@ public function it_can_handle_simple_request_and_response(): void
         self::assertSame($response, $result);
     }
 
-    /** @test */
+    #[Test]
     public function it_can_handle_multi_argument_request(): void
     {
         $request = new MultiArgumentRequest($args = [1, 2, 3]);
@@ -56,7 +57,7 @@ public function it_can_handle_multi_argument_request(): void
         self::assertSame($response, $result);
     }
 
-    /** @test */
+    #[Test]
     public function it_can_handle_result_providers(): void
     {
         $request = $this->prophesize(RequestInterface::class)->reveal();
@@ -70,7 +71,7 @@ public function it_can_handle_result_providers(): void
         self::assertSame($response, $result);
     }
 
-    /** @test */
+    #[Test]
     public function it_can_handle_mixed_results(): void
     {
         $request = $this->prophesize(RequestInterface::class)->reveal();
@@ -82,7 +83,7 @@ public function it_can_handle_mixed_results(): void
         self::assertSame(132, $result->getResult());
     }
 
-    /** @test */
+    #[Test]
     public function it_can_handle_exceptions(): void
     {
         $request = $this->prophesize(RequestInterface::class)->reveal();

test/PhproTest/SoapClient/Unit/Caller/EventDispatchingCallerTest.php

@@ -12,6 +12,7 @@
 use Phpro\SoapClient\Type\RequestInterface;
 use Phpro\SoapClient\Type\ResultInterface;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -32,7 +33,7 @@ protected function setUp(): void
     }
 
 
-    /** @test */
+    #[Test]
     public function it_triggers_events_for_successfull_requests(): void
     {
         $request = $this->prophesize(RequestInterface::class)->reveal();
@@ -53,7 +54,7 @@ public function it_triggers_events_for_successfull_requests(): void
         self::assertSame($result, $actual);
     }
 
-    /** @test */
+    #[Test]
     public function it_triggers_events_for_failing_requests(): void
     {
         $request = $this->prophesize(RequestInterface::class)->reveal();