Merge branch 'release/4.1.2'

WsdlToPhp · Feb 11, 2022 · 34e7896 · 34e7896
2 parents 5c8ee49 + 8547452
commit 34e7896
Show file tree

Hide file tree

Showing 26 changed files with 92 additions and 106 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Release
+name: Release and publish
 
 on:
   push:
@@ -68,12 +68,13 @@ jobs:
         run: |
           mkdir -p ~/.gnupg/
           chmod 0700 ~/.gnupg/
+          export GPG_TTY=$(tty)
           echo "$GPG_SIGNING_KEY" > ~/.gnupg/private.key
           gpg --import ~/.gnupg/private.key
           gpg -u wsdltophp@mikael-delsol.fr --detach-sign --output wsdltophp.phar.asc ./bin/wsdltophp.phar
         env:
           GPG_SIGNING_KEY: |
-            ${{ secrets.GPG_SIGNING_KEY_893E7553C4D525279BC8C6D9B41E3A1E3748D61F }}
+            ${{ secrets.GPG_SIGNING_KEY }}
 
       - name: Create release
         id: create_release

diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 4.1.2 - 2022-02-11
+- issue #256 - subdirectory not converted in namespaces
+
 ## 4.1.1 - 2021-07-14
 - issue #257 - choice tag is not fully handled properly
     - Improvement for choice tag handling

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 [![License](https://poser.pugx.org/wsdltophp/packagegenerator/license)](https://packagist.org/packages/wsdltophp/packagegenerator)
 [![Latest Stable Version](https://poser.pugx.org/wsdltophp/packagegenerator/version.png)](https://packagist.org/packages/wsdltophp/packagegenerator)
-[![Build Status](https://travis-ci.com/WsdlToPhp/PackageGenerator.svg)](https://travis-ci.com/github/WsdlToPhp/PackageGenerator)
+[![TeamCity build status](https://teamcity.mikael-delsol.fr/app/rest/builds/buildType:id:PackageGenerator_Build/statusIcon.svg)](https://github.com/WsdlToPhp/PackageGenerator)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/WsdlToPhp/PackageGenerator/badges/quality-score.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PackageGenerator/)
 [![Code Coverage](https://scrutinizer-ci.com/g/WsdlToPhp/PackageGenerator/badges/coverage.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PackageGenerator/)
 [![Total Downloads](https://poser.pugx.org/wsdltophp/packagegenerator/downloads)](https://packagist.org/packages/wsdltophp/packagegenerator)
@@ -157,6 +157,7 @@ Developers who helped on this project are listed in the [composer.json](composer
 - [Andreas Kintzinger](https://github.com/Phobetor)
 - [Hendrik Luup](https://github.com/hluup)
 - [Jacob Dreesen](https://github.com/jdreesen)
+- [Clifford Vickrey](https://github.com/cliffordvickrey)
 
 ## FAQ
 

diff --git a/composer.json b/composer.json
@@ -74,6 +74,11 @@
             "name": "Jacob Dreesen",
             "email": "jacob.dreesen@gmail.com",
             "role": "Contributor"
+        },
+        {
+            "name": "Clifford Vickrey",
+            "email": "clifforddavidvickrey@gmail.com",
+            "role": "Contributor"
         }
     ],
     "support" : {
@@ -87,19 +92,21 @@
         "ext-mbstring": "*",
         "ext-soap": "*",
         "composer/composer": "^2.0",
-        "symfony/console": "^4.0|^5.0",
-        "symfony/yaml": "^4.0|^5.0",
+        "symfony/console": "^4.0|^5.0|^6.0",
+        "symfony/yaml": "^4.0|^5.0|^6.0",
         "wsdltophp/packagebase": "^5.0",
         "wsdltophp/phpgenerator": "^4.0",
         "wsdltophp/wsdlhandler": "^1.0"
     },
     "scripts": {
         "test": "vendor/bin/phpunit",
         "lint": "vendor/bin/php-cs-fixer fix --ansi --diff --verbose",
-        "build": "box build --verbose"
+        "build": "box build --verbose",
+        "phpstan": "vendor/bin/phpstan analyze src --level=2"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3.0",
+        "phpstan/phpstan": "^1.3",
         "phpunit/phpunit": "^9"
     },
     "autoload": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -0,0 +1,3 @@
+parameters:
+	ignoreErrors:
+		- '#Call to an undefined method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\)#'
diff --git a/src/Container/AbstractObjectContainer.php b/src/Container/AbstractObjectContainer.php
@@ -26,37 +26,43 @@ public function offsetExists($offset): bool
         return !empty($element);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         $element = array_slice($this->objects, $offset, 1);
 
         return $this->offsetExists($offset) ? array_shift($element) : null;
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         throw new InvalidArgumentException('This method can\'t be used as object are stored with a string as array index', __LINE__);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         if ($this->offsetExists($offset)) {
             unset($this->objects[$this->getObjectKey($this->offsetGet($offset))]);
         }
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $current = array_slice($this->objects, $this->offset, 1);
 
         return array_shift($current);
     }
 
+    #[\ReturnTypeWillChange]
     public function next()
     {
         ++$this->offset;
     }
 
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->offset;
@@ -67,11 +73,13 @@ public function valid(): bool
         return 0 < count(array_slice($this->objects, $this->offset, 1));
     }
 
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->offset = 0;
     }
 
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->objects);
@@ -112,8 +120,6 @@ abstract protected function objectProperty(): string;
     /**
      * This method is called before the object has been stored.
      *
-     * @param mixed $object
-     *
      * @throws InvalidArgumentException
      */
     protected function beforeObjectIsStored(object $object): void

diff --git a/src/Container/Model/Struct.php b/src/Container/Model/Struct.php
@@ -4,7 +4,6 @@
 
 namespace WsdlToPhp\PackageGenerator\Container\Model;
 
-use InvalidArgumentException;
 use WsdlToPhp\PackageGenerator\Model\Struct as Model;
 
 final class Struct extends AbstractModel
@@ -61,10 +60,6 @@ public function addUnionStruct(string $structName, array $types): self
 
     public function getVirtual(string $value): ?Model
     {
-        if (!is_scalar($value)) {
-            throw new InvalidArgumentException(sprintf('Value "%s" can\'t be used to get an object from "%s"', is_object($value) ? get_class($value) : var_export($value, true), __CLASS__), __LINE__);
-        }
-
         $key = $this->getVirtualKey($value);
 
         return array_key_exists($key, $this->virtualObjects) ? $this->virtualObjects[$key] : null;

diff --git a/src/File/ClassMap.php b/src/File/ClassMap.php
@@ -23,6 +23,7 @@ protected function fillClassConstants(ConstantContainer $constants): void
 
     protected function getConstantAnnotationBlock(PhpConstant $constant): ?PhpAnnotationBlock
     {
+        return null;
     }
 
     protected function fillClassProperties(PropertyContainer $properties): void
@@ -31,6 +32,7 @@ protected function fillClassProperties(PropertyContainer $properties): void
 
     protected function getPropertyAnnotationBlock(PhpProperty $property): ?PhpAnnotationBlock
     {
+        return null;
     }
 
     protected function fillClassMethods(): void

diff --git a/src/File/Service.php b/src/File/Service.php
@@ -79,6 +79,7 @@ protected function fillClassConstants(ConstantContainer $constants): void
 
     protected function getConstantAnnotationBlock(PhpConstant $constant): ?PhpAnnotationBlock
     {
+        return null;
     }
 
     protected function fillClassProperties(PropertyContainer $properties): void
@@ -87,6 +88,7 @@ protected function fillClassProperties(PropertyContainer $properties): void
 
     protected function getPropertyAnnotationBlock(PhpProperty $property): ?PhpAnnotationBlock
     {
+        return null;
     }
 
     protected function defineUseStatements(): AbstractModelFile

diff --git a/src/File/Struct.php b/src/File/Struct.php
@@ -45,6 +45,7 @@ protected function fillClassConstants(ConstantContainer $constants): void
 
     protected function getConstantAnnotationBlock(PhpConstant $constant): ?PhpAnnotationBlock
     {
+        return null;
     }
 
     protected function getModelAttributes(): StructAttributeContainer
@@ -212,7 +213,7 @@ protected function addStructMethodAddToBody(PhpMethod $method, StructAttributeMo
         if ($attribute->nameIsClean()) {
             $assignment = sprintf('$this->%s[] = $item;', $attribute->getCleanName());
         } else {
-            $assignment = sprintf('$this->%s[] = $this->{\'%s\'}[] = $item;', $attribute->getCleanName(), addslashes($attribute->getName()), $attribute->getCleanName());
+            $assignment = sprintf('$this->%s[] = $this->{\'%s\'}[] = $item;', $attribute->getCleanName(), addslashes($attribute->getName()));
         }
 
         $method
@@ -601,6 +602,7 @@ protected function addStructPropertiesToAnnotationBlockParams(PhpAnnotationBlock
     protected function getStructMethodsAddToAnnotationBlock(PhpMethod $method): PhpAnnotationBlock
     {
         $methodParameters = $method->getParameters();
+        /** @var PhpFunctionParameter $firstParameter */
         $firstParameter = array_shift($methodParameters);
         $attribute = $this->getModel()->getAttribute($firstParameter->getModel()->getName());
         $annotationBlock = new PhpAnnotationBlock();

diff --git a/src/Generator/Generator.php b/src/Generator/Generator.php
@@ -29,7 +29,7 @@ class Generator implements JsonSerializable
 
     protected GeneratorContainers $containers;
 
-    protected GeneratorSoapClient $soapClient;
+    protected ?GeneratorSoapClient $soapClient = null;
 
     public function __construct(GeneratorOptions $options)
     {
@@ -985,7 +985,7 @@ public static function instanceFromSerializedJson(string $json): Generator
                 $options->setOptionValue($name, $value);
             }
             // create generator instance with options
-            $instance = new static($options);
+            $instance = new self($options);
             // load services
             foreach ($decodedJson['containers']['services'] as $service) {
                 $instance->getContainers()->getServices()->add(self::getModelInstanceFromJsonArrayEntry($instance, $service));

diff --git a/src/Generator/GeneratorSoapClient.php b/src/Generator/GeneratorSoapClient.php
@@ -60,13 +60,6 @@ public function getSoapClient(): SoapClient
 
     public function getSoapClientStreamContextOptions(): array
     {
-        $options = [];
-        $soapClient = $this->getSoapClient();
-
-        if ($soapClient instanceof SoapClient) {
-            $options = $soapClient->getStreamContextOptions();
-        }
-
-        return $options;
+        return $this->getSoapClient()->getStreamContextOptions();
     }
 }
diff --git a/src/Model/AbstractModel.php b/src/Model/AbstractModel.php
@@ -258,7 +258,7 @@ public function getNamespace(): string
         }
 
         if (!empty($this->getSubDirectory())) {
-            $namespaces[] = $this->getSubDirectory();
+            $namespaces[] = str_replace('/', '\\', $this->getSubDirectory());
         }
 
         return implode('\\', $namespaces);
@@ -310,7 +310,7 @@ public static function replacePhpReservedKeyword(string $keyword, ?string $conte
 
     public function getReservedMethodsInstance(): AbstractReservedWord
     {
-        throw new InvalidArgumentException(sprintf('The method %s should be defined in the class %s', __FUNCTION__, get_called_class(), __LINE__));
+        throw new InvalidArgumentException(sprintf('The method %s should be defined in the class %s', __FUNCTION__, get_called_class()));
     }
 
     public function replaceReservedMethod(string $methodName, ?string $context = null): string

diff --git a/src/Parser/SoapClient/Functions.php b/src/Parser/SoapClient/Functions.php
@@ -27,7 +27,7 @@ public function parse(): void
             // "Regular" SOAP Style
             if (count($infos) < 3) {
                 $returnType = $infos[0];
-                if (count($infos) < 3 && false !== mb_strpos($infos[1], '()') && array_key_exists(1, $infos)) {
+                if (false !== mb_strpos($infos[1], '()') && array_key_exists(1, $infos)) {
                     $methodName = trim(str_replace('()', '', $infos[1]));
                     $parameterType = null;
                 } else {
@@ -36,7 +36,7 @@ public function parse(): void
                 if (!empty($returnType) && !empty($methodName)) {
                     $services->addService($this->getGenerator()->getServiceName($methodName), $methodName, $parameterType, $returnType);
                 }
-            } elseif (count($infos) >= 3) {
+            } else {
                 /*
                  * RPC SOAP Style
                  * Some RPC WS defines the return type as a list of values

diff --git a/src/Parser/SoapClient/Structs.php b/src/Parser/SoapClient/Structs.php
@@ -39,7 +39,7 @@ protected function parseType(string $type): void
         $cleanType = self::cleanType($type);
         $typeDef = explode(' ', $cleanType);
 
-        if (array_key_exists(1, $typeDef) && !empty($typeDef)) {
+        if (array_key_exists(1, $typeDef)) {
             $structName = $typeDef[1];
             if (self::UNION_DECLARATION === $typeDef[0]) {
                 $this->parseUnionStruct($typeDef);

diff --git a/src/Parser/Wsdl/AbstractTagImportParser.php b/src/Parser/Wsdl/AbstractTagImportParser.php
@@ -7,7 +7,7 @@
 use WsdlToPhp\PackageGenerator\Generator\Utils;
 use WsdlToPhp\PackageGenerator\Model\Schema;
 use WsdlToPhp\PackageGenerator\Model\Wsdl;
-use WsdlToPhp\WsdlHandler\Wsdl as WsdlDocument;
+use WsdlToPhp\WsdlHandler\AbstractDocument;
 
 abstract class AbstractTagImportParser extends AbstractTagParser
 {
@@ -46,13 +46,13 @@ protected function getTagParser(): ?AbstractTagImportParser
         $tagName = null;
 
         switch ($this->parsingTag()) {
-            case WsdlDocument::TAG_IMPORT:
-                $tagName = WsdlDocument::TAG_INCLUDE;
+            case AbstractDocument::TAG_IMPORT:
+                $tagName = AbstractDocument::TAG_INCLUDE;
 
                 break;
 
-            case WsdlDocument::TAG_INCLUDE:
-                $tagName = WsdlDocument::TAG_IMPORT;
+            case AbstractDocument::TAG_INCLUDE:
+                $tagName = AbstractDocument::TAG_IMPORT;
 
                 break;
         }

diff --git a/src/Parser/Wsdl/AbstractTagInputOutputParser.php b/src/Parser/Wsdl/AbstractTagInputOutputParser.php
@@ -76,7 +76,7 @@ protected function isKnownTypeUnknown(Method $method): bool
             $isKnown = !empty($knownType) && self::UNKNOWN !== mb_strtolower($knownType);
         } elseif (is_array($knownType)) {
             foreach ($knownType as $knownValue) {
-                $isKnown &= !empty($knownType) && self::UNKNOWN !== mb_strtolower($knownValue);
+                $isKnown &= self::UNKNOWN !== mb_strtolower($knownValue);
             }
         }
 

diff --git a/tests/File/AbstractFile.php b/tests/File/AbstractFile.php
@@ -63,7 +63,7 @@ protected function assertSameFileContent(string $valid, File $file, string $file
         unlink($file->getFileName());
     }
 
-    private static function applyParsers(Generator $generator): Generator
+    private static function applyParsers(Generator $generator): void
     {
         $parsers = [
             new FunctionsParser($generator),