Move helper functions over to wsdl-reader

phpro · Sep 29, 2023 · 2185309 · 2185309
1 parent c324c96
commit 2185309
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 148 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "php-soap/engine": "^2.4",
         "php-soap/ext-soap-engine": "^1.4",
         "php-soap/psr18-transport": "^1.3",
-        "php-soap/wsdl-reader": "~0.5",
+        "php-soap/wsdl-reader": "~0.6",
         "psr/event-dispatcher": "^1.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "symfony/console": "~5.4 || ~6.0",

diff --git a/src/Phpro/SoapClient/CodeGenerator/Assembler/ClassMapAssembler.php b/src/Phpro/SoapClient/CodeGenerator/Assembler/ClassMapAssembler.php
@@ -5,12 +5,12 @@
 use Phpro\SoapClient\CodeGenerator\Context\ClassMapContext;
 use Phpro\SoapClient\CodeGenerator\Context\ContextInterface;
 use Phpro\SoapClient\CodeGenerator\Model\TypeMap;
-use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Predicate\IsConsideredScalarType;
 use Phpro\SoapClient\Exception\AssemblerException;
 use Laminas\Code\Generator\ClassGenerator;
 use Laminas\Code\Generator\MethodGenerator;
 use Soap\ExtSoapEngine\Configuration\ClassMap\ClassMap;
 use Soap\ExtSoapEngine\Configuration\ClassMap\ClassMapCollection;
+use Soap\WsdlReader\Metadata\Predicate\IsConsideredScalarType;
 
 /**
  * Class ClassMapAssembler

diff --git a/src/Phpro/SoapClient/CodeGenerator/Model/ClientMethod.php b/src/Phpro/SoapClient/CodeGenerator/Model/ClientMethod.php
@@ -2,11 +2,10 @@
 
 namespace Phpro\SoapClient\CodeGenerator\Model;
 
-use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Predicate\IsConsideredScalarType;
-use Phpro\SoapClient\CodeGenerator\Util\Normalizer;
 use Soap\Engine\Metadata\Model\Method as MetadataMethod;
 use Soap\Engine\Metadata\Model\MethodMeta;
 use Soap\Engine\Metadata\Model\Parameter as MetadataParameter;
+use Soap\WsdlReader\Metadata\Predicate\IsConsideredScalarType;
 use function Psl\Type\non_empty_string;
 
 /**

diff --git a/src/Phpro/SoapClient/CodeGenerator/Model/ReturnType.php b/src/Phpro/SoapClient/CodeGenerator/Model/ReturnType.php
@@ -4,10 +4,10 @@
 namespace Phpro\SoapClient\CodeGenerator\Model;
 
 use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Calculator\TypeNameCalculator;
-use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Predicate\IsConsideredScalarType;
 use Phpro\SoapClient\CodeGenerator\Util\Normalizer;
 use Soap\Engine\Metadata\Model\TypeMeta;
 use Soap\Engine\Metadata\Model\XsdType;
+use Soap\WsdlReader\Metadata\Predicate\IsConsideredScalarType;
 use function Psl\Type\non_empty_string;
 
 final class ReturnType

diff --git a/src/Phpro/SoapClient/CodeGenerator/TypeEnhancer/MetaTypeEnhancer.php b/src/Phpro/SoapClient/CodeGenerator/TypeEnhancer/MetaTypeEnhancer.php
@@ -6,8 +6,8 @@
 use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Calculator\ArrayBoundsCalculator;
 use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Calculator\EnumValuesCalculator;
 use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Calculator\UnionTypesCalculator;
-use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Predicate\IsConsideredNullableType;
 use Soap\Engine\Metadata\Model\TypeMeta;
+use Soap\WsdlReader\Metadata\Predicate\IsConsideredNullableType;
 
 final class MetaTypeEnhancer implements TypeEnhancer
 {

diff --git a/src/Phpro/SoapClient/CodeGenerator/TypeEnhancer/Predicate/IsConsideredNullableType.php b/src/Phpro/SoapClient/CodeGenerator/TypeEnhancer/Predicate/IsConsideredNullableType.php
diff --git a/src/Phpro/SoapClient/CodeGenerator/TypeEnhancer/Predicate/IsConsideredScalarType.php b/src/Phpro/SoapClient/CodeGenerator/TypeEnhancer/Predicate/IsConsideredScalarType.php
diff --git a/src/Phpro/SoapClient/Console/Command/GenerateTypesCommand.php b/src/Phpro/SoapClient/Console/Command/GenerateTypesCommand.php
@@ -4,16 +4,15 @@
 
 use Phpro\SoapClient\CodeGenerator\Model\Type;
 use Phpro\SoapClient\CodeGenerator\Model\TypeMap;
-use Phpro\SoapClient\CodeGenerator\TypeEnhancer\Predicate\IsConsideredScalarType;
 use Phpro\SoapClient\CodeGenerator\TypeGenerator;
 use Phpro\SoapClient\Console\Helper\ConfigHelper;
 use Phpro\SoapClient\Util\Filesystem;
+use Soap\WsdlReader\Metadata\Predicate\IsConsideredScalarType;
 use SplFileInfo;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Laminas\Code\Generator\FileGenerator;
 use function Psl\Type\instance_of;

diff --git a/...est/SoapClient/Unit/CodeGenerator/TypeEnhancer/Predicate/IsConsideredNullableTypeTest.php b/...est/SoapClient/Unit/CodeGenerator/TypeEnhancer/Predicate/IsConsideredNullableTypeTest.php
diff --git a/...oTest/SoapClient/Unit/CodeGenerator/TypeEnhancer/Predicate/IsConsideredScalarTypeTest.php b/...oTest/SoapClient/Unit/CodeGenerator/TypeEnhancer/Predicate/IsConsideredScalarTypeTest.php