Merge pull request #8 from veewee/php82

Add PHP82 + PSL2 Support

.github/workflows/analyzers.yaml

@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.0', '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.0', '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.0', '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.19.0" installed="4.19.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

@@ -26,17 +26,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^8.0",
+        "php": "~8.1.0 || ~8.2.0",
         "ext-dom": "*",
-        "azjezz/psl": "^1.9",
+        "azjezz/psl": "^2.1",
         "league/uri": "^6.5",
         "league/uri-components": "^2.4",
-        "php-soap/xml": "^1.2",
+        "php-soap/xml": "^1.4",
         "symfony/console": "^5.4|^6.0",
-        "veewee/xml": "~1.2"
+        "veewee/xml": "~2.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "psalm/plugin-symfony": "^3.1"
+        "psalm/plugin-symfony": "^4.0"
     }
 }

psalm.xml

@@ -3,7 +3,7 @@
     errorLevel="1"
     resolveFromConfigFile="true"
     strictBinaryOperands="true"
-    phpVersion="8.0"
+    phpVersion="8.1"
     allowStringToStandInForClass="true"
     rememberPropertyAssignmentsAfterCall="false"
     skipChecksOnUnresolvableIncludes="false"

src/Console/Command/FlattenCommand.php

@@ -4,7 +4,8 @@
 namespace Soap\Wsdl\Console\Command;
 
 use Exception;
-use Psl\Filesystem;
+use Psl\File;
+use Psl\File\WriteMode;
 use Soap\Wsdl\Console\Helper\ConfiguredLoader;
 use Soap\Wsdl\Loader\CallbackLoader;
 use Soap\Wsdl\Loader\FlatteningLoader;
@@ -16,6 +17,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use function Psl\Type\non_empty_string;
 
 final class FlattenCommand extends Command
 {
@@ -45,16 +47,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $input->getOption('loader'),
             fn (WsdlLoader $loader) => $this->configureLoader($loader, $style)
         );
-        $wsdl = $input->getArgument('wsdl');
-        $output = $input->getArgument('output');
+        $wsdl = non_empty_string()->coerce($input->getArgument('wsdl'));
+        $output = non_empty_string()->coerce($input->getArgument('output'));
 
         $style->info('Flattening WSDL "'.$wsdl.'"');
         $style->warning('This can take a while...');
         $contents = $loader($wsdl);
 
         $style->info('Downloaded the WSDL. Writing it to "'.$output.'".');
 
-        Filesystem\write_file($output, $contents);
+        File\write($output, $contents, WriteMode::TRUNCATE);
 
         $style->success('Succesfully flattened your WSDL!');
 

src/Console/Helper/ConfiguredLoader.php

@@ -8,7 +8,7 @@
 use Soap\Wsdl\Loader\StreamWrapperLoader;
 use Soap\Wsdl\Loader\WsdlLoader;
 use function Psl\invariant;
-use function Psl\Type\object;
+use function Psl\Type\instance_of;
 
 final class ConfiguredLoader
 {
@@ -31,7 +31,7 @@ public static function createFromConfig(?string $file, callable $configurator =
             /** @var WsdlLoader $included */
             $included = require $file;
 
-            $loader = object(WsdlLoader::class)->assert($included);
+            $loader = instance_of(WsdlLoader::class)->assert($included);
         }
 
         return $configurator ? $configurator($loader) : $loader;

src/Xml/Configurator/FlattenXsdImports.php

@@ -16,8 +16,8 @@
 use VeeWee\Xml\Dom\Configurator\Configurator;
 use VeeWee\Xml\Dom\Document;
 use VeeWee\Xml\Exception\RuntimeException;
+use function Psl\Type\instance_of;
 use function Psl\Type\nullable;
-use function Psl\Type\object;
 use function VeeWee\Xml\Dom\Locator\Node\children;
 use function VeeWee\Xml\Dom\Manipulator\Element\copy_named_xmlns_attributes;
 use function VeeWee\Xml\Dom\Manipulator\Node\append_external_node;
@@ -183,7 +183,7 @@ private function registerSchemaInTypes(DOMElement $schema): void
         $tns = $schema->getAttribute('targetNamespace');
 
         $query = $tns ? './schema:schema[@targetNamespace=\''.$tns.'\']' : './schema:schema[not(@targetNamespace)]';
-        $existingSchema = nullable(object(DOMElement::class))
+        $existingSchema = nullable(instance_of(DOMElement::class))
             ->assert($xpath->query($query, $types)->first());
 
         // If no schema exists yet: Add the newly loaded schema as a completely new schema in the WSDL types.

src/Xml/Flattener.php

@@ -3,7 +3,6 @@
 
 namespace Soap\Wsdl\Xml;
 
-use Closure;
 use DOMDocument;
 use Soap\Wsdl\Loader\Context\FlatteningContext;
 use Soap\Wsdl\Xml\Configurator\FlattenTypes;
@@ -32,11 +31,11 @@ public function __invoke(
                 when(
                     static fn (DOMDocument $document): bool => $document->documentElement->localName === 'definitions',
                     pipe(
-                        Closure::fromCallable(new FlattenWsdlImports($location, $context)),
-                        Closure::fromCallable(new FlattenTypes()),
-                        Closure::fromCallable(new FlattenXsdImports($location, $context)),
+                        (new FlattenWsdlImports($location, $context))(...),
+                        (new FlattenTypes())(...),
+                        (new FlattenXsdImports($location, $context))(...),
                     ),
-                    Closure::fromCallable(new FlattenXsdImports($location, $context))
+                    (new FlattenXsdImports($location, $context))(...)
                 )
             )
         )->toXmlString();

tests/Unit/Console/Helper/ConfiguredLoaderTest.php

@@ -4,11 +4,12 @@
 namespace SoapTest\Wsdl\Unit\Console\Helper;
 
 use PHPUnit\Framework\TestCase;
+use Psl\File\WriteMode;
 use Soap\Wsdl\Console\Helper\ConfiguredLoader;
 use Soap\Wsdl\Loader\CallbackLoader;
 use Soap\Wsdl\Loader\StreamWrapperLoader;
+use function Psl\File\write;
 use function Psl\Filesystem\delete_file;
-use function Psl\Filesystem\write_file;
 
 final class ConfiguredLoaderTest extends TestCase
 {
@@ -60,12 +61,13 @@ static function (string $file) {
     private function withLoaderFile(callable $execute): void
     {
         $file = tempnam(sys_get_temp_dir(), 'wsdlloader');
-        write_file(
+        write(
             $file,
             <<<EOPHP
         <?php
         return new \Soap\Wsdl\Loader\CallbackLoader(static fn () => 'loaded');    
-        EOPHP
+        EOPHP,
+            WriteMode::TRUNCATE
         );
 
         try {