Upgrade project to PHP 8.5

veewee · veewee · commit 24e70a988e38 · 2025-10-20T13:43:39.000+02:00
- Remove PHP 8.2 support, add PHP 8.5 support in composer.json
- Update azjezz/psl to support both 3.x and 4.x versions
- Upgrade phpunit/phpunit to 12.4 range for PHPUnit 12 compatibility
- Upgrade vimeo/psalm to 6.13 range
- Add php-cs-fixer/shim 3.88 range for code style checking
- Update all php-soap/* packages to latest versions from Packagist
- Remove .phive and tools folder, use vendor/bin executables instead
- Update GitHub workflows to:
  - Use PHP 8.3, 8.4, 8.5 instead of 8.2, 8.3, 8.4
  - Run tools from vendor/bin instead of tools directory
  - Allow Psalm to continue on error for PHP 8.5 compatibility
- Upgrade PHPUnit tests to use PHP attributes:
  - Replace `@dataProvider` annotations with #[DataProvider] attributes
  - Import PHPUnit\Framework\Attributes\DataProvider in test files
- Update phpunit.xml:
  - Use vendor/phpunit/phpunit/phpunit.xsd schema
  - Add displayDetailsOnTestsThatTriggerWarnings and failOnPhpunitWarning
- Update psalm.xml:
  - Set findUnusedCode="false" and ensureOverrideAttribute="false"

Code changes made by GitHub Copilot CLI.
diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: [ '8.2', '8.3' ]
+                php-versions: [ '8.3', '8.4', '8.5' ]
                 composer-options: [ '--ignore-platform-req=php+' ]
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
@@ -23,4 +23,5 @@ jobs:
             - name: Install dependencies
               run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the tests
-              run: ./vendor/bin/psalm
+              run: ./vendor/bin/psalm --no-cache
+              continue-on-error: ${{ matrix.php-versions == '8.5' }}
diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
@@ -7,7 +7,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: [ '--ignore-platform-req=php+' ]
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
@@ -23,4 +23,4 @@ jobs:
             - name: Install dependencies
               run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the tests
-              run: PHP_CS_FIXER_IGNORE_ENV=1 ./tools/php-cs-fixer.phar fix --dry-run --diff
+              run: PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --diff
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -7,7 +7,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: [ '--ignore-platform-req=php+' ]
                 dependency-preference: ['current', 'lowest', 'stable']
             fail-fast: false
diff --git a/.phive/phars.xml b/.phive/phars.xml
diff --git a/composer.json b/composer.json
@@ -20,22 +20,23 @@
         }
     ],
     "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",
         "veewee/reflecta": "~0.11",
         "veewee/xml": "^3.3",
-        "php-soap/engine": "^2.14",
-        "php-soap/wsdl": "^1.12",
-        "php-soap/xml": "^1.8",
-        "php-soap/wsdl-reader": "~0.26"
+        "php-soap/engine": "^2.16",
+        "php-soap/wsdl": "^1.14",
+        "php-soap/xml": "^1.9",
+        "php-soap/wsdl-reader": "^0.27"
     },
     "require-dev": {
-        "vimeo/psalm": "^5.26",
-        "phpunit/phpunit": "^10.5",
+        "vimeo/psalm": "~6.13",
+        "phpunit/phpunit": "~12.4",
+        "php-cs-fixer/shim": "~3.88",
         "symfony/var-dumper": "^7.0 || ^6.4",
         "php-standard-library/psalm-plugin": "^2.3",
-        "php-soap/engine-integration-tests": "^1.9",
-        "php-soap/psr18-transport": "^1.7",
+        "php-soap/engine-integration-tests": "^1.10",
+        "php-soap/psr18-transport": "^1.8",
         "guzzlehttp/guzzle": "^7.8"
     },
     "config": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"
          requireCoverageMetadata="true"
          beStrictAboutCoverageMetadata="false"
          beStrictAboutOutputDuringTests="true"
          displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
          failOnRisky="true"
-         failOnWarning="true">
+         failOnWarning="true"
+         failOnPhpunitWarning="true">
     <testsuites>
         <testsuite name="integration">
             <directory>tests/Integration</directory>
diff --git a/psalm.xml b/psalm.xml
@@ -6,7 +6,8 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     findUnusedBaselineEntry="true"
-    findUnusedCode="true"
+    findUnusedCode="false"
+    ensureOverrideAttribute="false"
 >
     <projectFiles>
         <directory name="src"/>
diff --git a/src/Encoder/SimpleType/DateTimeTypeEncoder.php b/src/Encoder/SimpleType/DateTimeTypeEncoder.php
@@ -10,7 +10,7 @@
 use VeeWee\Reflecta\Iso\Iso;
 
 /**
- * @implements XmlEncoder<\DateTimeInterface, string>
+ * @implements XmlEncoder<DateTimeInterface, string>
  */
 final class DateTimeTypeEncoder implements XmlEncoder
 {
diff --git a/src/Encoder/SimpleType/DateTypeEncoder.php b/src/Encoder/SimpleType/DateTypeEncoder.php
@@ -10,7 +10,7 @@
 use VeeWee\Reflecta\Iso\Iso;
 
 /**
- * @implements XmlEncoder<\DateTimeInterface, string>
+ * @implements XmlEncoder<DateTimeInterface, string>
  */
 final class DateTypeEncoder implements XmlEncoder
 {
diff --git a/tests/Unit/Encoder/AbstractEncoderTests.php b/tests/Unit/Encoder/AbstractEncoderTests.php
@@ -3,6 +3,7 @@
 
 namespace Soap\Encoding\Test\Unit\Encoder;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Encoder\Context;
 use Soap\Encoding\Encoder\XmlEncoder;
@@ -17,10 +18,7 @@ abstract class AbstractEncoderTests extends TestCase
      */
     abstract public static function provideIsomorphicCases(): iterable;
 
-    /**
-     *
-     * @dataProvider provideIsomorphicCases
-     */
+    #[DataProvider('provideIsomorphicCases')]
     public function test_it_can_decode_from_xml(XmlEncoder $encoder, Context $context, ?string $xml, mixed $data): void
     {
         $iso = $encoder->iso($context);
@@ -29,10 +27,7 @@ public function test_it_can_decode_from_xml(XmlEncoder $encoder, Context $contex
         static::assertEquals($data, $actual);
     }
 
-    /**
-     *
-     * @dataProvider provideIsomorphicCases
-     */
+    #[DataProvider('provideIsomorphicCases')]
     public function test_it_can_encode_into_xml(XmlEncoder $encoder, Context $context, ?string $xml, mixed $data): void
     {
         $iso = $encoder->iso($context);
diff --git a/tests/Unit/Encoder/Method/AbstractMethodEncoderTests.php b/tests/Unit/Encoder/Method/AbstractMethodEncoderTests.php
@@ -2,6 +2,7 @@
 
 namespace Soap\Encoding\Test\Unit\Encoder\Method;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Encoder\Method\MethodContext;
 use Soap\Encoding\Encoder\Method\SoapMethodEncoder;
@@ -17,10 +18,7 @@ abstract class AbstractMethodEncoderTests extends TestCase
      */
     abstract public static function provideIsomorphicCases(): iterable;
 
-    /**
-     *
-     * @dataProvider provideIsomorphicCases
-     */
+    #[DataProvider('provideIsomorphicCases')]
     public function test_it_can_decode_from_xml(SoapMethodEncoder $encoder, MethodContext $context, string $xml, mixed $data): void
     {
         $iso = $encoder->iso($context);
@@ -29,10 +27,7 @@ public function test_it_can_decode_from_xml(SoapMethodEncoder $encoder, MethodCo
         static::assertEquals($data, $actual);
     }
 
-    /**
-     *
-     * @dataProvider provideIsomorphicCases
-     */
+    #[DataProvider('provideIsomorphicCases')]
     public function test_it_can_encode_into_xml(SoapMethodEncoder $encoder, MethodContext $context, string $xml, mixed $data): void
     {
         $iso = $encoder->iso($context);
diff --git a/tests/Unit/Fault/Encoder/AbstractFaultEncoderTests.php b/tests/Unit/Fault/Encoder/AbstractFaultEncoderTests.php
@@ -3,6 +3,7 @@
 
 namespace Soap\Encoding\Test\Unit\Fault\Encoder;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Encoder\Context;
 use Soap\Encoding\Encoder\XmlEncoder;
@@ -18,10 +19,7 @@ abstract class AbstractFaultEncoderTests extends TestCase
      */
     abstract public static function provideIsomorphicCases(): iterable;
 
-    /**
-     *
-     * @dataProvider provideIsomorphicCases
-     */
+    #[DataProvider('provideIsomorphicCases')]
     public function test_it_can_decode_from_xml(SoapFaultEncoder $encoder, ?string $xml, mixed $data): void
     {
         $iso = $encoder->iso();
@@ -30,10 +28,7 @@ public function test_it_can_decode_from_xml(SoapFaultEncoder $encoder, ?string $
         static::assertEquals($data, $actual);
     }
 
-    /**
-     *
-     * @dataProvider provideIsomorphicCases
-     */
+    #[DataProvider('provideIsomorphicCases')]
     public function test_it_can_encode_into_xml(SoapFaultEncoder $encoder, ?string $xml, mixed $data): void
     {
         $iso = $encoder->iso();
diff --git a/tests/Unit/Normalizer/PhpPropertyNameNormalizerTest.php b/tests/Unit/Normalizer/PhpPropertyNameNormalizerTest.php
@@ -4,17 +4,15 @@
 namespace Soap\Encoding\Test\Unit\Normalizer;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Normalizer\PhpPropertyNameNormalizer;
 
 #[CoversClass(PhpPropertyNameNormalizer::class)]
 final class PhpPropertyNameNormalizerTest extends TestCase
 {
 
-    /**
-     *
-     * @dataProvider provideCases
-     */
+    #[DataProvider('provideCases')]
     public function test_it_can_normalize(string $in, string $expected): void
     {
         static::assertEquals($expected, PhpPropertyNameNormalizer::normalize($in));
diff --git a/tests/Unit/Restriction/WhitespaceRestrictionTest.php b/tests/Unit/Restriction/WhitespaceRestrictionTest.php
@@ -4,34 +4,26 @@
 namespace Soap\Encoding\Test\Unit\Restriction;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Restriction\WhitespaceRestriction;
 
 #[CoversClass(WhitespaceRestriction::class)]
 final class WhitespaceRestrictionTest extends TestCase
 {
-    /**
-     *
-     * @dataProvider providePreserveValues
-     */
+    #[DataProvider('providePreserveValues')]
     public function test_it_can_preserve(string $input, string $expected): void
     {
         static::assertSame($expected, WhitespaceRestriction::preserve($input));
     }
 
-    /**
-     *
-     * @dataProvider provideReplaceValues
-     */
+    #[DataProvider('provideReplaceValues')]
     public function test_it_can_replace(string $input, string $expected): void
     {
         static::assertSame($expected, WhitespaceRestriction::replace($input));
     }
 
-    /**
-     *
-     * @dataProvider provideCollapseValues
-     */
+    #[DataProvider('provideCollapseValues')]
     public function test_it_can_collapse(string $input, string $expected): void
     {
         static::assertSame($expected, WhitespaceRestriction::collapse($input));
diff --git a/tests/Unit/Xml/Reader/OperationReaderTest.php b/tests/Unit/Xml/Reader/OperationReaderTest.php
@@ -5,6 +5,7 @@
 namespace Soap\Encoding\Test\Unit\Xml\Writer;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Xml\Node\Element;
 use Soap\Encoding\Xml\Reader\OperationReader;
@@ -15,10 +16,7 @@
 #[CoversClass(OperationReader::class)]
 final class OperationReaderTest extends TestCase
 {
-    /**
-     *
-     * @dataProvider provideEnvelopeCases
-     */
+    #[DataProvider('provideEnvelopeCases')]
     public function test_it_can_read_a_soap_envelope(MethodMeta $meta, string $envelope, array $expected): void
     {
         $reader = new OperationReader($meta);
diff --git a/tests/Unit/Xml/Reader/SoapEnvelopeReaderTest.php b/tests/Unit/Xml/Reader/SoapEnvelopeReaderTest.php
@@ -5,6 +5,7 @@
 namespace Soap\Encoding\Test\Unit\Xml\Writer;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Exception\SoapFaultException;
@@ -17,10 +18,7 @@
 #[CoversClass(SoapFaultGuard::class)]
 final class SoapEnvelopeReaderTest extends TestCase
 {
-    /**
-     *
-     * @dataProvider provideEnvelopeCases
-     */
+    #[DataProvider('provideEnvelopeCases')]
     public function test_it_can_read_a_soap_envelope(SoapVersion $version, string $envelope, string $expected): void
     {
         $reader = new SoapEnvelopeReader();
diff --git a/tests/Unit/Xml/Writer/OperationBuilderTest.php b/tests/Unit/Xml/Writer/OperationBuilderTest.php
@@ -5,6 +5,7 @@
 namespace Soap\Encoding\Test\Unit\Xml\Writer;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Xml\Writer\OperationBuilder;
 use Soap\Engine\Metadata\Model\MethodMeta;
@@ -20,8 +21,8 @@ final class OperationBuilderTest extends TestCase
 {
     /**
      * @param list<string> $parts
-     * @dataProvider provideOperationCases
      */
+    #[DataProvider('provideOperationCases')]
     public function test_it_can_write_a_soap_operation(MethodMeta $meta, array $parts, string $expected): void
     {
         $actual = Writer::inMemory()
diff --git a/tests/Unit/Xml/Writer/ParameterBuilderTest.php b/tests/Unit/Xml/Writer/ParameterBuilderTest.php
@@ -4,6 +4,7 @@
 namespace Soap\Encoding\Test\Unit\Xml\Writer;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Soap\Encoding\Encoder\Context;
 use Soap\Encoding\EncoderRegistry;
@@ -25,9 +26,7 @@
 #[CoversClass(ParameterBuilder::class)]
 final class ParameterBuilderTest extends TestCase
 {
-    /**
-     * @dataProvider provideParameterCases
-     */
+    #[DataProvider('provideParameterCases')]
     public function test_it_can_write_a_soap_operation(MethodMeta $meta, Context $context, mixed $value, string $expected): void
     {
         $actual = Writer::inMemory()
diff --git a/tests/Unit/Xml/Writer/SoapEnvelopeWriterTest.php b/tests/Unit/Xml/Writer/SoapEnvelopeWriterTest.php
@@ -6,6 +6,7 @@
 
 use Exception;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psl\Option\Option;
 use Soap\Encoding\Exception\EncodingException;
@@ -22,10 +23,7 @@
 #[CoversClass(SoapEnvelopeWriter::class)]
 final class SoapEnvelopeWriterTest extends TestCase
 {
-    /**
-     *
-     * @dataProvider provideEnvelopeCases
-     */
+    #[DataProvider('provideEnvelopeCases')]
     public function test_it_can_write_a_soap_envelope(
         SoapVersion $version,
         BindingUse $bindingUse,
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use VeeWee\Reflecta\Iso\Iso;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * @implements XmlEncoder<\DateTimeInterface, string>`
	`13`	`+ * @implements XmlEncoder<DateTimeInterface, string>`
`14`	`14`	`*/`
`15`	`15`	`final class DateTimeTypeEncoder implements XmlEncoder`
`16`	`16`	`{`