Merge pull request #554 from veewee/v3-php84

Bump dependencies v3
phpro · Oct 25, 2024 · 6b22f20 · 6b22f20
2 parents 66eb962 + 14fb439
commit 6b22f20
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/grumphp.yml b/.github/workflows/grumphp.yml
@@ -8,7 +8,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: ['windows-latest', 'ubuntu-latest']
-                php-versions: ['8.1', '8.2', '8.3']
+                php-versions: [ '8.2', '8.3', '8.4' ]
                 composer-options: ['', '--prefer-lowest']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} with ${{ matrix.composer-options }}

diff --git a/composer.json b/composer.json
@@ -12,13 +12,13 @@
         }
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
-        "azjezz/psl": "^2.1",
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+        "azjezz/psl": "^3.0",
         "laminas/laminas-code": "^4.8.0",
-        "php-soap/engine": "^2.7",
-        "php-soap/ext-soap-engine": "^1.4",
-        "php-soap/psr18-transport": "^1.3",
-        "php-soap/wsdl-reader": "~0.6",
+        "php-soap/engine": "^2.13",
+        "php-soap/ext-soap-engine": "^1.7",
+        "php-soap/psr18-transport": "^1.7",
+        "php-soap/wsdl-reader": "~0.18",
         "psr/event-dispatcher": "^1.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "symfony/console": "~5.4 || ~6.0 || ~7.0",
@@ -31,11 +31,11 @@
         "nyholm/psr7": "^1.5",
         "php-http/vcr-plugin": "^1.2",
         "php-parallel-lint/php-parallel-lint": "^1.3",
-        "phpro/grumphp-shim": "^2.3",
+        "phpro/grumphp-shim": "^2.9",
         "phpspec/phpspec": "~7.2",
         "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpstan/phpstan": "^1.10.15",
-        "phpunit/phpunit": "~9.5",
+        "phpstan/phpstan": "^1.12.7",
+        "phpunit/phpunit": "~10.5",
         "squizlabs/php_codesniffer": "^3.7.1"
     },
     "config": {

diff --git a/src/Phpro/SoapClient/CodeGenerator/Assembler/ConstructorAssembler.php b/src/Phpro/SoapClient/CodeGenerator/Assembler/ConstructorAssembler.php
@@ -26,7 +26,7 @@ class ConstructorAssembler implements AssemblerInterface
      *
      * @param ConstructorAssemblerOptions|null $options
      */
-    public function __construct(ConstructorAssemblerOptions $options = null)
+    public function __construct(?ConstructorAssemblerOptions $options = null)
     {
         $this->options = $options ?? new ConstructorAssemblerOptions();
     }

diff --git a/src/Phpro/SoapClient/CodeGenerator/Assembler/FluentSetterAssembler.php b/src/Phpro/SoapClient/CodeGenerator/Assembler/FluentSetterAssembler.php
@@ -27,7 +27,7 @@ class FluentSetterAssembler implements AssemblerInterface
      *
      * @param FluentSetterAssemblerOptions|null $options
      */
-    public function __construct(FluentSetterAssemblerOptions $options = null)
+    public function __construct(?FluentSetterAssemblerOptions $options = null)
     {
         $this->options = $options ?? new FluentSetterAssemblerOptions();
     }

diff --git a/src/Phpro/SoapClient/CodeGenerator/Assembler/GetterAssembler.php b/src/Phpro/SoapClient/CodeGenerator/Assembler/GetterAssembler.php
@@ -28,7 +28,7 @@ class GetterAssembler implements AssemblerInterface
      *
      * @param GetterAssemblerOptions|null $options
      */
-    public function __construct(GetterAssemblerOptions $options = null)
+    public function __construct(?GetterAssemblerOptions $options = null)
     {
         $this->options = $options ?? new GetterAssemblerOptions();
     }

diff --git a/src/Phpro/SoapClient/CodeGenerator/Assembler/ImmutableSetterAssembler.php b/src/Phpro/SoapClient/CodeGenerator/Assembler/ImmutableSetterAssembler.php
@@ -27,7 +27,7 @@ class ImmutableSetterAssembler implements AssemblerInterface
      *
      * @param ImmutableSetterAssemblerOptions|null $options
      */
-    public function __construct(ImmutableSetterAssemblerOptions $options = null)
+    public function __construct(?ImmutableSetterAssemblerOptions $options = null)
     {
         $this->options = $options ?? new ImmutableSetterAssemblerOptions();
     }

diff --git a/src/Phpro/SoapClient/CodeGenerator/Assembler/ResultProviderAssembler.php b/src/Phpro/SoapClient/CodeGenerator/Assembler/ResultProviderAssembler.php
@@ -30,7 +30,7 @@ class ResultProviderAssembler implements AssemblerInterface
      *
      * @param non-empty-string $wrapperClass
      */
-    public function __construct(string $wrapperClass = null)
+    public function __construct(?string $wrapperClass = null)
     {
         $wrapperClass = ($wrapperClass !== null) ? ltrim($wrapperClass, '\\') : null;
 

diff --git a/src/Phpro/SoapClient/CodeGenerator/Assembler/SetterAssembler.php b/src/Phpro/SoapClient/CodeGenerator/Assembler/SetterAssembler.php
@@ -26,7 +26,7 @@ class SetterAssembler implements AssemblerInterface
      *
      * @param SetterAssemblerOptions|null $options
      */
-    public function __construct(SetterAssemblerOptions $options = null)
+    public function __construct(?SetterAssemblerOptions $options = null)
     {
         $this->options = $options ?? new SetterAssemblerOptions();
     }

diff --git a/src/Phpro/SoapClient/CodeGenerator/Assembler/UseAssembler.php b/src/Phpro/SoapClient/CodeGenerator/Assembler/UseAssembler.php
@@ -31,7 +31,7 @@ class UseAssembler implements AssemblerInterface
      * @param non-empty-string $useName
      * @param non-empty-string|null $useAlias
      */
-    public function __construct(string $useName, string $useAlias = null)
+    public function __construct(string $useName, ?string $useAlias = null)
     {
         $this->useName = $useName;
         $this->useAlias = $useAlias;

diff --git a/src/Phpro/SoapClient/CodeGenerator/Util/Normalizer.php b/src/Phpro/SoapClient/CodeGenerator/Util/Normalizer.php
@@ -256,7 +256,7 @@ public static function getClassNameFromFQN(string $name): string
      *
      * @return non-empty-string
      */
-    public static function getCompleteUseStatement(string $useName, string $useAlias = null): string
+    public static function getCompleteUseStatement(string $useName, ?string $useAlias = null): string
     {
         $use = $useName;
         if (null !== $useAlias && $useAlias !== '') {