Merge pull request #8 from veewee/PHP82

Add PHP82 + PSL2 Support

Author: veewee

.github/workflows/analyzers.yaml

@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1']
+                php-versions: ['8.1', '8.2']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

.github/workflows/code-style.yaml

@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1']
+                php-versions: ['8.1', '8.2']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

.github/workflows/tests.yaml

@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1']
+                php-versions: ['8.1', '8.2']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="psalm" version="^4.13.1" installed="4.22.0" location="./tools/psalm.phar" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.3.2" installed="3.3.2" location="./tools/php-cs-fixer.phar" copy="true"/>
+  <phar name="psalm" version="^4.30.0" installed="4.30.0" location="./tools/psalm.phar" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.13.0" installed="3.13.0" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>

composer.json

@@ -19,21 +19,21 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "~8.1.0 || ~8.2.0",
         "ext-dom": "*",
         "ext-openssl": "*",
-        "azjezz/psl": "^1.9",
+        "azjezz/psl": "^2.1",
         "paragonie/hidden-string": "^2.0",
-        "php-soap/psr18-transport": "^1.2.1",
-        "php-soap/engine": "^1.0",
-        "php-soap/xml": "^1.3.1",
+        "php-soap/psr18-transport": "^1.3",
+        "php-soap/engine": "^1.3",
+        "php-soap/xml": "^1.4",
         "php-http/client-common": "^2.3",
         "robrichards/wse-php": "^2.0",
-        "veewee/xml": "^1.5"
+        "veewee/xml": "^2.2"
     },
     "require-dev": {
-        "nyholm/psr7": "^1.3",
-        "php-http/mock-client": "^1.4",
+        "nyholm/psr7": "^1.5",
+        "php-http/mock-client": "^1.5",
         "symfony/http-client": "^6.1",
         "phpunit/phpunit": "^9.5",
         "cweagans/composer-patches": "^1.7"

src/WSSecurity/KeyStore/Certificate.php

@@ -4,7 +4,7 @@
 namespace Soap\Psr18WsseMiddleware\WSSecurity\KeyStore;
 
 use ParagonIE\HiddenString\HiddenString;
-use function Psl\Filesystem\read_file;
+use function Psl\File\read;
 
 final class Certificate implements KeyInterface
 {
@@ -17,9 +17,12 @@ public function __construct(string $key)
         $this->passphrase = new HiddenString('');
     }
 
+    /**
+     * @param non-empty-string $file
+     */
     public static function fromFile(string $file): self
     {
-        return new self(read_file($file));
+        return new self(read($file));
     }
 
     public function withPassphrase(string $passphrase): self

src/WSSecurity/KeyStore/Key.php

@@ -4,7 +4,7 @@
 namespace Soap\Psr18WsseMiddleware\WSSecurity\KeyStore;
 
 use ParagonIE\HiddenString\HiddenString;
-use function Psl\Filesystem\read_file;
+use function Psl\File\read;
 
 final class Key implements KeyInterface
 {
@@ -17,9 +17,12 @@ public function __construct(string $key)
         $this->passphrase = new HiddenString('');
     }
 
+    /**
+     * @param non-empty-string $file
+     */
     public static function fromFile(string $file): self
     {
-        return new self(read_file($file));
+        return new self(read($file));
     }
 
     public function withPassphrase(string $passphrase): self