Merge pull request #24 from veewee/php84

veewee · web-flow · commit 6140d29c4f4c · 2024-10-25T09:02:09.000+02:00
Bump dependencies
diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
@@ -7,7 +7,8 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1', '8.2', '8.3']
+                php-versions: ['8.2', '8.3', '8.4']
+                composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
@@ -7,7 +7,8 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1', '8.2', '8.3']
+                php-versions: ['8.2', '8.3', '8.4']
+                composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -7,7 +7,8 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1', '8.2', '8.3']
+                php-versions: ['8.2', '8.3', '8.4']
+                composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
@@ -20,6 +21,6 @@ jobs:
                   tools: 'composer:v2'
                   extensions: pcov, mbstring, posix, dom, soap
             - name: Install dependencies
-              run: composer update --prefer-dist --no-progress --no-suggest
+              run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the tests
               run: ./vendor/bin/phpunit
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.13.0" installed="3.39.0" location="./tools/php-cs-fixer.phar" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.13.0" installed="3.64.0" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -53,5 +53,6 @@
         'static_lambda' => true,
         'strict_comparison' => true,
         'strict_param' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
     ])
 ;
diff --git a/composer.json b/composer.json
@@ -26,18 +26,18 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-dom": "*",
-        "azjezz/psl": "^2.1",
+        "azjezz/psl": "^3.0",
         "league/uri": "^7.0",
         "league/uri-components": "^7.0",
-        "php-soap/xml": "^1.4",
+        "php-soap/xml": "^1.8",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
-        "veewee/xml": "~2.2 || ~3.0"
+        "veewee/xml": "~3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "psalm/plugin-symfony": "^5.0",
-        "vimeo/psalm": "^5.9.0"
+        "vimeo/psalm": "^5.26.0"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,9 @@
 <phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    displayDetailsOnPhpunitDeprecations="true"
     bootstrap="./tests/bootstrap.php"
     colors="true"
-    convertDeprecationsToExceptions="false"
 >
     <testsuites>
         <testsuite name="Unit">
diff --git a/src/Console/Command/FlattenCommand.php b/src/Console/Command/FlattenCommand.php
@@ -56,7 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $style->info('Downloaded the WSDL. Writing it to "'.$output.'".');
 
-        File\write($output, $contents, WriteMode::TRUNCATE);
+        File\write($output, $contents, WriteMode::Truncate);
 
         $style->success('Succesfully flattened your WSDL!');
 
diff --git a/src/Console/Helper/ConfiguredLoader.php b/src/Console/Helper/ConfiguredLoader.php
@@ -19,7 +19,7 @@ final class ConfiguredLoader
      *
      * @psalm-suppress UnresolvableInclude - Including dynamic includes is acutally the goal :)
      */
-    public static function createFromConfig(?string $file, callable $configurator = null): WsdlLoader
+    public static function createFromConfig(?string $file, ?callable $configurator = null): WsdlLoader
     {
         $loader = new StreamWrapperLoader();
 
diff --git a/src/Exception/UnloadableWsdlException.php b/src/Exception/UnloadableWsdlException.php
@@ -9,7 +9,7 @@
 
 final class UnloadableWsdlException extends RuntimeException
 {
-    protected function __construct(string $message = "", int $code = 0, Throwable $previous = null)
+    protected function __construct(string $message = "", int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
diff --git a/tests/Unit/Console/Helper/ConfiguredLoaderTest.php b/tests/Unit/Console/Helper/ConfiguredLoaderTest.php
@@ -67,7 +67,7 @@ private function withLoaderFile(callable $execute): void
         <?php
         return new \Soap\Wsdl\Loader\CallbackLoader(static fn () => 'loaded');    
         EOPHP,
-            WriteMode::TRUNCATE
+            WriteMode::Truncate
         );
 
         try {
diff --git a/tests/Unit/Loader/FlatteningLoaderTest.php b/tests/Unit/Loader/FlatteningLoaderTest.php
@@ -22,15 +22,15 @@ protected function setUp(): void
      *
      * @dataProvider provideTestCases
      */
-    public function test_it_can_load_flattened_imports(string $wsdlUri, Document $expected): void
+    public function test_it_can_load_flattened_imports(string $wsdl, Document $expected): void
     {
-        $result = ($this->loader)($wsdlUri);
+        $result = ($this->loader)($wsdl);
         $flattened = Document::fromXmlString($result, comparable());
 
         static::assertSame($expected->toXmlString(), $flattened->toXmlString());
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         //
         // Basic test cases
diff --git a/tests/Unit/Uri/IncludePathBuilderTest.php b/tests/Unit/Uri/IncludePathBuilderTest.php
@@ -18,7 +18,7 @@ public function test_it_can_build_include_paths(string $relativePath, string $fr
         static::assertSame($expected, IncludePathBuilder::build($relativePath, $fromFile));
     }
 
-    public function provideBuildPaths()
+    public static function provideBuildPaths()
     {
         yield 'same-dir-file' => [
             'relativePath' => 'otherfile.xml',
diff --git a/tests/Unit/Xml/Configurator/FlattenTypesTest.php b/tests/Unit/Xml/Configurator/FlattenTypesTest.php
@@ -14,14 +14,14 @@ final class FlattenTypesTest extends TestCase
      *
      * @dataProvider provideTestCases
      */
-    public function test_it_can_flatten_types(string $wsdlUri, Document $expected): void
+    public function test_it_can_flatten_types(string $wsdl, Document $expected): void
     {
-        $wsdl = Document::fromXmlFile($wsdlUri, new FlattenTypes(), comparable());
+        $wsdlDoc = Document::fromXmlFile($wsdl, new FlattenTypes(), comparable());
 
-        static::assertSame($expected->toXmlString(), $wsdl->toXmlString());
+        static::assertSame($expected->toXmlString(), $wsdlDoc->toXmlString());
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         yield 'single-type' => [
             'wsdl' => FIXTURE_DIR . '/flattening/functional/empty-schema.wsdl',
diff --git a/tests/Unit/Xml/Configurator/FlattenWsdlImportsTest.php b/tests/Unit/Xml/Configurator/FlattenWsdlImportsTest.php
@@ -16,19 +16,19 @@ final class FlattenWsdlImportsTest extends TestCase
      *
      * @dataProvider provideTestCases
      */
-    public function test_it_can_flatten_wsdl_imports(string $wsdlUri, Document $expected): void
+    public function test_it_can_flatten_wsdl_imports(string $wsdl, Document $expected): void
     {
-        $wsdl = Document::fromXmlFile($wsdlUri);
+        $wsdlDoc = Document::fromXmlFile($wsdl);
         $configurator = new FlattenWsdlImports(
-            $wsdlUri,
-            FlatteningContext::forWsdl($wsdlUri, $wsdl, new StreamWrapperLoader())
+            $wsdl,
+            FlatteningContext::forWsdl($wsdl, $wsdlDoc, new StreamWrapperLoader())
         );
-        $flattened = Document::fromUnsafeDocument($wsdl->toUnsafeDocument(), $configurator, comparable());
+        $flattened = Document::fromUnsafeDocument($wsdlDoc->toUnsafeDocument(), $configurator, comparable());
 
         static::assertSame($expected->toXmlString(), $flattened->toXmlString());
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         yield 'only-import' => [
             'wsdl' => FIXTURE_DIR.'/flattening/import.wsdl',
diff --git a/tests/Unit/Xml/Configurator/FlattenXsdImportsTest.php b/tests/Unit/Xml/Configurator/FlattenXsdImportsTest.php
@@ -17,19 +17,19 @@ final class FlattenXsdImportsTest extends TestCase
      *
      * @dataProvider provideTestCases
      */
-    public function test_it_can_flatten_xsd_imports(string $wsdlUri, Document $expected, callable $xmlConfigurator): void
+    public function test_it_can_flatten_xsd_imports(string $wsdl, Document $expected, callable $xmlConfigurator): void
     {
-        $wsdl = Document::fromXmlFile($wsdlUri);
+        $wsdlDoc = Document::fromXmlFile($wsdl);
         $configurator = new FlattenXsdImports(
-            $wsdlUri,
-            FlatteningContext::forWsdl($wsdlUri, $wsdl, new StreamWrapperLoader())
+            $wsdl,
+            FlatteningContext::forWsdl($wsdl, $wsdlDoc, new StreamWrapperLoader())
         );
-        $flattened = Document::fromUnsafeDocument($wsdl->toUnsafeDocument(), $configurator, $xmlConfigurator);
+        $flattened = Document::fromUnsafeDocument($wsdlDoc->toUnsafeDocument(), $configurator, $xmlConfigurator);
 
         static::assertSame($expected->reconfigure($xmlConfigurator)->toXmlString(), $flattened->toXmlString());
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         yield 'single-xsd' => [
             'wsdl' => FIXTURE_DIR.'/flattening/single-xsd.wsdl',
diff --git a/tests/Unit/Xml/Validator/SchemaSyntaxValidatorTest.php b/tests/Unit/Xml/Validator/SchemaSyntaxValidatorTest.php
@@ -24,7 +24,7 @@ public function test_it_can_validate_errors(string $wsdl, array $errorMessages):
         }
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         yield 'no-errors' => [
             'wsdl' => FIXTURE_DIR.'/wsdl.wsdl',
diff --git a/tests/Unit/Xml/Validator/WsdlSyntaxValidatorTest.php b/tests/Unit/Xml/Validator/WsdlSyntaxValidatorTest.php
@@ -24,7 +24,7 @@ public function test_it_can_validate_errors(string $wsdl, array $errorMessages):
         }
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         yield 'no-errors' => [
             'wsdl' => FIXTURE_DIR.'/wsdl.wsdl',
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar

Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,6 @@`
`53`	`53`	`'static_lambda' => true,`
`54`	`54`	`'strict_comparison' => true,`
`55`	`55`	`'strict_param' => true,`
	`56`	`+ 'nullable_type_declaration_for_default_null_value' => true,`
`56`	`57`	`])`
`57`	`58`	`;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ final class ConfiguredLoader`
`19`	`19`	`*`
`20`	`20`	`* @psalm-suppress UnresolvableInclude - Including dynamic includes is acutally the goal :)`
`21`	`21`	`*/`
`22`		`- public static function createFromConfig(?string $file, callable $configurator = null): WsdlLoader`
	`22`	`+ public static function createFromConfig(?string $file, ?callable $configurator = null): WsdlLoader`
`23`	`23`	`{`
`24`	`24`	`$loader = new StreamWrapperLoader();`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`final class UnloadableWsdlException extends RuntimeException`
`11`	`11`	`{`
`12`		`- protected function __construct(string $message = "", int $code = 0, Throwable $previous = null)`
	`12`	`+ protected function __construct(string $message = "", int $code = 0, ?Throwable $previous = null)`
`13`	`13`	`{`
`14`	`14`	`parent::__construct($message, $code, $previous);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ protected function setUp(): void`
`22`	`22`	`*`
`23`	`23`	`* @dataProvider provideTestCases`
`24`	`24`	`*/`
`25`		`- public function test_it_can_load_flattened_imports(string $wsdlUri, Document $expected): void`
	`25`	`+ public function test_it_can_load_flattened_imports(string $wsdl, Document $expected): void`
`26`	`26`	`{`
`27`		`- $result = ($this->loader)($wsdlUri);`
	`27`	`+ $result = ($this->loader)($wsdl);`
`28`	`28`	`$flattened = Document::fromXmlString($result, comparable());`
`29`	`29`
`30`	`30`	`static::assertSame($expected->toXmlString(), $flattened->toXmlString());`
`31`	`31`	`}`
`32`	`32`
`33`		`- public function provideTestCases()`
	`33`	`+ public static function provideTestCases()`
`34`	`34`	`{`
`35`	`35`	`//`
`36`	`36`	`// Basic test cases`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function test_it_can_build_include_paths(string $relativePath, string $fr`
`18`	`18`	`static::assertSame($expected, IncludePathBuilder::build($relativePath, $fromFile));`
`19`	`19`	`}`
`20`	`20`
`21`		`- public function provideBuildPaths()`
	`21`	`+ public static function provideBuildPaths()`
`22`	`22`	`{`
`23`	`23`	`yield 'same-dir-file' => [`
`24`	`24`	`'relativePath' => 'otherfile.xml',`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ final class FlattenTypesTest extends TestCase`
`14`	`14`	`*`
`15`	`15`	`* @dataProvider provideTestCases`
`16`	`16`	`*/`
`17`		`- public function test_it_can_flatten_types(string $wsdlUri, Document $expected): void`
	`17`	`+ public function test_it_can_flatten_types(string $wsdl, Document $expected): void`
`18`	`18`	`{`
`19`		`- $wsdl = Document::fromXmlFile($wsdlUri, new FlattenTypes(), comparable());`
	`19`	`+ $wsdlDoc = Document::fromXmlFile($wsdl, new FlattenTypes(), comparable());`
`20`	`20`
`21`		`- static::assertSame($expected->toXmlString(), $wsdl->toXmlString());`
	`21`	`+ static::assertSame($expected->toXmlString(), $wsdlDoc->toXmlString());`
`22`	`22`	`}`
`23`	`23`
`24`		`- public function provideTestCases()`
	`24`	`+ public static function provideTestCases()`
`25`	`25`	`{`
`26`	`26`	`yield 'single-type' => [`
`27`	`27`	`'wsdl' => FIXTURE_DIR . '/flattening/functional/empty-schema.wsdl',`
Original file line number	Diff line number	Diff line change
`@@ -16,19 +16,19 @@ final class FlattenWsdlImportsTest extends TestCase`
`16`	`16`	`*`
`17`	`17`	`* @dataProvider provideTestCases`
`18`	`18`	`*/`
`19`		`- public function test_it_can_flatten_wsdl_imports(string $wsdlUri, Document $expected): void`
	`19`	`+ public function test_it_can_flatten_wsdl_imports(string $wsdl, Document $expected): void`
`20`	`20`	`{`
`21`		`- $wsdl = Document::fromXmlFile($wsdlUri);`
	`21`	`+ $wsdlDoc = Document::fromXmlFile($wsdl);`
`22`	`22`	`$configurator = new FlattenWsdlImports(`
`23`		`- $wsdlUri,`
`24`		`- FlatteningContext::forWsdl($wsdlUri, $wsdl, new StreamWrapperLoader())`
	`23`	`+ $wsdl,`
	`24`	`+ FlatteningContext::forWsdl($wsdl, $wsdlDoc, new StreamWrapperLoader())`
`25`	`25`	`);`
`26`		`- $flattened = Document::fromUnsafeDocument($wsdl->toUnsafeDocument(), $configurator, comparable());`
	`26`	`+ $flattened = Document::fromUnsafeDocument($wsdlDoc->toUnsafeDocument(), $configurator, comparable());`
`27`	`27`
`28`	`28`	`static::assertSame($expected->toXmlString(), $flattened->toXmlString());`
`29`	`29`	`}`
`30`	`30`
`31`		`- public function provideTestCases()`
	`31`	`+ public static function provideTestCases()`
`32`	`32`	`{`
`33`	`33`	`yield 'only-import' => [`
`34`	`34`	`'wsdl' => FIXTURE_DIR.'/flattening/import.wsdl',`
Original file line number	Diff line number	Diff line change
`@@ -17,19 +17,19 @@ final class FlattenXsdImportsTest extends TestCase`
`17`	`17`	`*`
`18`	`18`	`* @dataProvider provideTestCases`
`19`	`19`	`*/`
`20`		`- public function test_it_can_flatten_xsd_imports(string $wsdlUri, Document $expected, callable $xmlConfigurator): void`
	`20`	`+ public function test_it_can_flatten_xsd_imports(string $wsdl, Document $expected, callable $xmlConfigurator): void`
`21`	`21`	`{`
`22`		`- $wsdl = Document::fromXmlFile($wsdlUri);`
	`22`	`+ $wsdlDoc = Document::fromXmlFile($wsdl);`
`23`	`23`	`$configurator = new FlattenXsdImports(`
`24`		`- $wsdlUri,`
`25`		`- FlatteningContext::forWsdl($wsdlUri, $wsdl, new StreamWrapperLoader())`
	`24`	`+ $wsdl,`
	`25`	`+ FlatteningContext::forWsdl($wsdl, $wsdlDoc, new StreamWrapperLoader())`
`26`	`26`	`);`
`27`		`- $flattened = Document::fromUnsafeDocument($wsdl->toUnsafeDocument(), $configurator, $xmlConfigurator);`
	`27`	`+ $flattened = Document::fromUnsafeDocument($wsdlDoc->toUnsafeDocument(), $configurator, $xmlConfigurator);`
`28`	`28`
`29`	`29`	`static::assertSame($expected->reconfigure($xmlConfigurator)->toXmlString(), $flattened->toXmlString());`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function provideTestCases()`
	`32`	`+ public static function provideTestCases()`
`33`	`33`	`{`
`34`	`34`	`yield 'single-xsd' => [`
`35`	`35`	`'wsdl' => FIXTURE_DIR.'/flattening/single-xsd.wsdl',`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function test_it_can_validate_errors(string $wsdl, array $errorMessages):`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function provideTestCases()`
	`27`	`+ public static function provideTestCases()`
`28`	`28`	`{`
`29`	`29`	`yield 'no-errors' => [`
`30`	`30`	`'wsdl' => FIXTURE_DIR.'/wsdl.wsdl',`