Mark client generated services as public

Add minOccurs annotation support on complexType

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 composer.phar
 phpunit.xml
 .idea
+.php_cs.cache

composer.json

@@ -26,7 +26,7 @@
         "ass/xmlsecurity": "~1.0",
         "symfony/framework-bundle": "~3.4|~4.0",
         "symfony/twig-bundle": "~3.4|~4.0",
-        "zendframework/zend-mime": "2.1.*"
+        "laminas/laminas-mime": "~2.1"
     },
     "replace": {
         "besimple/soap-bundle": "self.version",
@@ -47,7 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "master-dev"
+            "dev-master": "5.2.0-dev"
         }
     }
 }

src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php

@@ -19,7 +19,6 @@ use BeSimple\SoapBundle\WebServiceContext;
 use BeSimple\SoapServer\SoapServerBuilder;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Debug\Exception\FlattenException;
@@ -59,7 +58,7 @@ class SoapWebServiceController implements ContainerAwareInterface
     /**
      * @var array
      */
-    private $headers = array();
+    private $headers = [];
 
     /**
      * @return \BeSimple\SoapBundle\Soap\SoapResponse
@@ -96,14 +95,14 @@ class SoapWebServiceController implements ContainerAwareInterface
     {
         $routeName = $webservice.'_webservice_call';
         $result = $this->container->get('router')->getRouteCollection()->get($routeName);
-        if ($result === null) {
+        if (null === $result) {
             $routeName = '_webservice_call';
         }
 
         $response = new Response($this->getWebServiceContext($webservice)->getWsdlFileContent(
             $this->container->get('router')->generate(
                 $routeName,
-                array('webservice' => $webservice),
+                ['webservice' => $webservice],
                 UrlGeneratorInterface::ABSOLUTE_URL
             )
         ));
@@ -137,12 +136,12 @@ class SoapWebServiceController implements ContainerAwareInterface
 
         $view = '@Twig/Exception/'.($this->container->get('kernel')->isDebug() ? 'exception' : 'error').'.txt.twig';
         $code = $exception->getStatusCode();
-        $details = $this->container->get('twig')->render($view, array(
+        $details = $this->container->get('twig')->render($view, [
             'status_code' => $code,
             'status_text' => isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '',
             'exception' => $exception,
             'logger' => $logger,
-        ));
+        ]);
 
         $handler = new ExceptionHandler($exception, $details);
         if ($soapFault = $request->query->get('_besimple_soap_fault')) {
@@ -234,7 +233,7 @@ class SoapWebServiceController implements ContainerAwareInterface
     }
 
     /**
-     * Set the SoapResponse
+     * Set the SoapResponse.
      *
      * @param Response $response A response to check and set
      *

src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php

@@ -152,11 +152,12 @@ class BeSimpleSoapExtension extends Extension
         $definition = new ChildDefinition('besimple.soap.client');
         $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
 
-        if (3 === Kernel::MAJOR_VERSION) {
+        if (Kernel::MAJOR_VERSION >= 3) {
             $definition->setFactory(array(
                 new Reference(sprintf('besimple.soap.client.builder.%s', $client)),
                 'build'
             ));
+            $definition->setPublic(true);
         } else {
             $definition->setFactoryService(sprintf('besimple.soap.client.builder.%s', $client));
         }

src/BeSimple/SoapBundle/DependencyInjection/Configuration.php

@@ -96,8 +96,12 @@ class Configuration
                                     ->info('proxy configuration')
                                     ->addDefaultsIfNotSet()
                                     ->beforeNormalization()
-                                        ->ifTrue(function ($v) { return !is_array($v); })
+                                        ->ifTrue(function ($v) {
-                                        ->then(function ($v) { return array('host' => null === $v ? false : $v); })
+                                            return !is_array($v);
+                                        })
+                                        ->then(function ($v) {
+                                            return array('host' => null === $v ? false : $v);
+                                        })
                                     ->end()
                                     ->children()
                                         ->scalarNode('host')->defaultFalse()->end()

src/BeSimple/SoapBundle/Resources/config/client.xml

@@ -19,7 +19,9 @@
             <argument type="service" id="besimple.soap.cache" /> <!-- hack to load besimple cache configuration -->
         </service>
 
-        <service id="besimple.soap.client" factory-service="besimple.soap.client.builder" factory-method="build" class="%besimple.soap.client.builder.class%" abstract="true" />
+        <service id="besimple.soap.client" class="%besimple.soap.client.builder.class%" abstract="true">
+            <factory service="besimple.soap.client.builder" method="build" />
+        </service>
 
         <service id="besimple.soap.classmap" class="%besimple.soap.classmap.class%" abstract="true" />
     </services>

src/BeSimple/SoapBundle/ServiceBinding/MessageBinderInterface.php

@@ -24,5 +24,5 @@ interface MessageBinderInterface
      *
      * @return mixed
      */
-    function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository);
+    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository);
 }

src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestMessageBinder.php

@@ -55,8 +55,7 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
             $isArray = true;
             $array = array();
 
-            $phpType = substr($type->getPhpType(), 0, strlen($type->getPhpType()) - 2);
+            $type = $this->typeRepository->getType($type->get('item')->getType());
-            $type = $this->typeRepository->getType($phpType);
         }
 
         // @TODO Fix array reference
@@ -79,21 +78,6 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
                         $array = $assocArray;
                     }
                 }
-                if (is_array($message)) {
-                    foreach ($message as $complexType) {
-                        $array[] = $this->checkComplexType($phpType, $complexType);
-                    }
-
-                    // See https://github.com/BeSimple/BeSimpleSoapBundle/issues/29
-                    if (in_array('BeSimple\SoapCommon\Type\AbstractKeyValue', class_parents($phpType))) {
-                        $assocArray = array();
-                        foreach ($array as $keyValue) {
-                            $assocArray[$keyValue->getKey()] = $keyValue->getValue();
-                        }
-
-                        $array = $assocArray;
-                    }
-                }
 
                 $message = $array;
             } else {

src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php

@@ -44,7 +44,8 @@ class ServiceBinder
      * @param MessageBinderInterface $requestMessageBinder
      * @param MessageBinderInterface $responseMessageBinder
      */
-    public function __construct(Definition $definition, MessageBinderInterface $requestHeaderMessageBinder, MessageBinderInterface $requestMessageBinder, MessageBinderInterface $responseMessageBinder) {
+    public function __construct(Definition $definition, MessageBinderInterface $requestHeaderMessageBinder, MessageBinderInterface $requestMessageBinder, MessageBinderInterface $responseMessageBinder)
+    {
         $this->definition = $definition;
 
         $this->requestHeaderMessageBinder = $requestHeaderMessageBinder;

src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ComplexType.php

@@ -18,7 +18,7 @@ class ComplexType extends Configuration
     private $name;
     private $value;
     private $isNillable = false;
-    private $isAttribute = false;
+    private $minOccurs = 1;
 
     public function getName()
     {
@@ -60,24 +60,14 @@ class ComplexType extends Configuration
         $this->isNillable = (bool) $isNillable;
     }
 
-    /**
+    public function setMinOccurs($minOccurs)
-     * @return bool
-     */
-    public function isAttribute()
     {
-        return $this->isAttribute;
+        $this->minOccurs = $minOccurs;
     }
 
-    /**
+    public function getMinOccurs()
-     * @param bool $isAttribute
-     *
-     * @return $this
-     */
-    public function setIsAttribute($isAttribute)
     {
-            $this->isAttribute = $isAttribute;
+        return $this->minOccurs;
-
-            return $this;
     }
 
     public function getAliasName()

src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ConfigurationInterface.php

@@ -22,5 +22,5 @@ interface ConfigurationInterface
      *
      * @return string
      */
-    function getAliasName();
+    public function getAliasName();
 }

src/BeSimple/SoapBundle/ServiceDefinition/Annotation/TypedElementInterface.php

@@ -12,8 +12,8 @@ namespace BeSimple\SoapBundle\ServiceDefinition\Annotation;
 
 interface TypedElementInterface
 {
-    function getPhpType();
+    public function getPhpType();
-    function getXmlType();
+    public function getXmlType();
-    function setPhpType($phpType);
+    public function setPhpType($phpType);
-    function setXmlType($xmlType);
+    public function setXmlType($xmlType);
 }

src/BeSimple/SoapBundle/ServiceDefinition/ComplexType.php

@@ -20,7 +20,7 @@ class ComplexType
     private $name;
     private $value;
     private $isNillable = false;
-    private $isAttribute = false;
+    private $minOccurs = 1;
 
     public function getName()
     {
@@ -47,28 +47,18 @@ class ComplexType
         $this->value = $value;
     }
 
-    /**
-     * @return bool
-     */
-    public function isAttribute()
-    {
-        return $this->isAttribute;
-    }
-
-    /**
-     * @param bool $isAttribute
-     *
-     * @return $this
-     */
-    public function setIsAttribute($isAttribute)
-    {
-        $this->isAttribute = $isAttribute;
-
-        return $this;
-    }
-
     public function setNillable($isNillable)
     {
         $this->isNillable = (bool) $isNillable;
     }
+
+    public function setMinOccurs($minOccurs)
+    {
+        $this->minOccurs = $minOccurs;
+    }
+
+    public function getMinOccurs()
+    {
+        return $this->minOccurs;
+    }
 }

src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php

@@ -160,7 +160,7 @@ class AnnotationClassLoader extends Loader
             $loaded = $complexTypeResolver->load($phpType);
             $complexType = new ComplexType($phpType, isset($loaded['alias']) ? $loaded['alias'] : $phpType);
             foreach ($loaded['properties'] as $name => $property) {
-                $complexType->add($name, $this->loadType($property->getValue()), $property->isNillable(), $property->isAttribute());
+                $complexType->add($name, $this->loadType($property->getValue()), $property->isNillable(), $property->getMinOccurs());
             }
 
             $this->typeRepository->addComplexType($complexType);

src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationComplexTypeLoader.php

@@ -43,7 +43,7 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
             throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
         }
 
-        $annotations = array();
+        $annotations = [];
 
         $class = new \ReflectionClass($class);
         if ($alias = $this->reader->getClassAnnotation($class, $this->aliasClass)) {
@@ -58,8 +58,8 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
                 $propertyComplexType = new ComplexType();
                 $propertyComplexType->setValue($complexType->getValue());
                 $propertyComplexType->setNillable($complexType->isNillable());
-                $propertyComplexType->setIsAttribute($complexType->isAttribute());
                 $propertyComplexType->setName($property->getName());
+                $propertyComplexType->setMinOccurs($complexType->getMinOccurs());
                 $annotations['properties']->add($propertyComplexType);
             }
         }
@@ -73,7 +73,7 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return Boolean True if this class supports the given resource, false otherwise
+     * @return bool True if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null)
     {

src/BeSimple/SoapBundle/Soap/SoapRequest.php

@@ -12,7 +12,7 @@ namespace BeSimple\SoapBundle\Soap;
 
 use BeSimple\SoapBundle\Util\Collection;
 use Symfony\Component\HttpFoundation\Request;
-use Zend\Mime\Message;
+use Laminas\Mime\Message;
 
 /**
  * SoapRequest.

src/BeSimple/SoapBundle/WebServiceContext.php

@@ -79,10 +79,7 @@ class WebServiceContext
             }
 
             $dumper = new Dumper($definition, array('stylesheet' => $this->options['wsdl_stylesheet']));
-
+            $cache->write($dumper->dump());
-            $wsdl = $dumper->dump();
-
-            $cache->write($wsdl);
         }
 
         return $cache->getPath();

src/BeSimple/SoapClient/Curl.php

@@ -77,9 +77,8 @@ class Curl
         if (isset($options['compression']) && !($options['compression'] & SOAP_COMPRESSION_ACCEPT)) {
             curl_setopt($this->ch, CURLOPT_ENCODING, 'identity');
         }
-        if (isset($options['connection_timeout'])) {
+
-            curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, $options['connection_timeout']);
+        curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, 10);
-        }
 
         if (isset($options['proxy_host'])) {
             if (false !== $options['proxy_host']) {
@@ -167,7 +166,6 @@ class Curl
     private function execManualRedirect($redirects = 0)
     {
         if ($redirects > $this->followLocationMaxRedirects) {
-
             // TODO Redirection limit reached, aborting
             return false;
         }
@@ -205,7 +203,7 @@ class Curl
 
     /**
      * Error code mapping from cURL error codes to PHP ext/soap error messages
-     * (where applicable)
+     * (where applicable).
      *
      * http://curl.haxx.se/libcurl/c/libcurl-errors.html
      *
@@ -251,7 +249,6 @@ class Curl
         $errorCodeMapping = $this->getErrorCodeMapping();
         $errorNumber = curl_errno($this->ch);
         if (isset($errorCodeMapping[$errorNumber])) {
-
             return $errorCodeMapping[$errorNumber];
         }
 

src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php

@@ -23,7 +23,7 @@ abstract class AbstractWebServerTest extends \PHPUnit_Framework_TestCase
     /**
      * @var ProcessBuilder
      */
-    static protected $webserver;
+    protected static $webserver;
 
     public static function setUpBeforeClass()
     {

src/BeSimple/SoapClient/Tests/ServerInterop/MTOMClient.php

@@ -36,7 +36,6 @@ try {
     $attachment->binaryData = $b64;
 
     var_dump($sc->attachment($attachment));
-
 } catch (Exception $e) {
     var_dump($e);
 }

src/BeSimple/SoapClient/Tests/ServerInterop/SwaClient.php

@@ -29,7 +29,6 @@ $options = array(
 $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/SwA.wsdl', $options);
 
 try {
-
     $upload = new uploadFile();
     $upload->name = 'upload.txt';
     $upload->data = 'This is a test. :)';

src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerClient.php

@@ -69,7 +69,6 @@ try {
     $ab->type = 'scifi';
 
     var_dump($sc->addBook($ab));
-
 } catch (Exception $e) {
     var_dump($e);
 }

src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerClient.php

@@ -54,7 +54,6 @@ try {
     $ab->type = 'scifi';
 
     var_dump($sc->addBook($ab));
-
 } catch (Exception $e) {
     var_dump($e);
 }

src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php

@@ -25,9 +25,9 @@ use org\bovigo\vfs\vfsStreamWrapper;
  */
 class WsdlDownloaderTest extends AbstractWebserverTest
 {
-    static protected $filesystem;
+    protected static $filesystem;
 
-    static protected $fixturesPath;
+    protected static $fixturesPath;
 
     /**
      * @dataProvider provideDownload

src/BeSimple/SoapClient/WsAddressingFilter.php

@@ -157,7 +157,6 @@ class WsAddressingFilter implements SoapRequestFilter, SoapResponseFilter
     public function getReferenceParameter($ns, $parameter)
     {
         if (isset($this->referenceParametersRecieved[$ns][$parameter])) {
-
             return $this->referenceParametersRecieved[$ns][$parameter];
         }
 

src/BeSimple/SoapClient/WsSecurityFilter.php

@@ -151,7 +151,6 @@ class WsSecurityFilter extends WsSecurityFilterClientServer implements SoapReque
             if (null !== $this->password
                 && (null === $this->userSecurityKey
                     || (null !== $this->userSecurityKey && !$this->userSecurityKey->hasPrivateKey()))) {
-
                 if (self::PASSWORD_TYPE_DIGEST === $this->passwordType) {
                     $nonce = mt_rand();
                     $password = base64_encode(sha1($nonce . $createdTimestamp . $this->password, true));

src/BeSimple/SoapClient/WsdlDownloader.php

@@ -56,7 +56,7 @@ class WsdlDownloader
     /**
      * Resolve WSDl/XSD includes.
      *
-     * @var boolean
+     * @var bool
      */
     protected $resolveRemoteIncludes = true;
 
@@ -64,13 +64,13 @@ class WsdlDownloader
      * Constructor.
      *
      * @param \BeSimple\SoapClient\Curl $curl                  Curl instance
-     * @param boolean                   $resolveRemoteIncludes WSDL/XSD include enabled?
+     * @param bool                      $resolveRemoteIncludes WSDL/XSD include enabled?
-     * @param boolean                   $cacheWsdl             Cache constant
+     * @param bool                      $cacheWsdl             Cache constant
      */
     public function __construct(Curl $curl, $resolveRemoteIncludes = true, $cacheWsdl = Cache::TYPE_DISK)
     {
         $this->curl = $curl;
-        $this->resolveRemoteIncludes = (Boolean) $resolveRemoteIncludes;
+        $this->resolveRemoteIncludes = (bool) $resolveRemoteIncludes;
 
         // get current WSDL caching config
         $this->cacheEnabled = $cacheWsdl === Cache::TYPE_NONE ? Cache::DISABLED : Cache::ENABLED == Cache::isEnabled();
@@ -101,6 +101,20 @@ class WsdlDownloader
                     if ($responseSuccessfull) {
                         $response = $this->curl->getResponseBody();
 
+                        libxml_use_internal_errors(true);
+
+                        $doc = simplexml_load_string($response);
+
+                        if (!$doc) {
+                            $errors = libxml_get_errors();
+
+                            if (count($errors)) {
+                                throw new \Exception('There is something wrong with the WSDL file formatting. The file can\'t be downloaded to be cached.');
+                            }
+
+                            libxml_clear_errors();
+                        }
+
                         if ($this->resolveRemoteIncludes) {
                             $this->resolveRemoteIncludes($response, $cacheFilePath, $wsdl);
                         } else {
@@ -130,7 +144,7 @@ class WsdlDownloader
      *
      * @param string $file File URL/path
      *
-     * @return boolean
+     * @return bool
      */
     private function isRemoteFile($file)
     {
@@ -149,9 +163,7 @@ class WsdlDownloader
      *
      * @param string $xml            XML file
      * @param string $cacheFilePath  Cache file name
-     * @param boolean $parentFilePath Parent file name
+     * @param bool   $parentFilePath Parent file name
-     *
-     * @return void
      */
     private function resolveRemoteIncludes($xml, $cacheFilePath, $parentFilePath = null)
     {
@@ -214,7 +226,7 @@ class WsdlDownloader
         $urlParts = parse_url($base);
 
         // combine base path with relative path
-        if (isset($urlParts['path']) && '/' === $relative{0}) {
+        if (isset($urlParts['path']) && '/' === $relative[0]) {
             // $relative is absolute path from domain (starts with /)
             $path = $relative;
         } elseif (isset($urlParts['path']) && strrpos($urlParts['path'], '/') === (strlen($urlParts['path']))) {
@@ -247,7 +259,7 @@ class WsdlDownloader
                         break;
                     }
 
-                    $keyToDelete--;
+                    --$keyToDelete;
                 }
 
                 unset($parts[$key]);

src/BeSimple/SoapClient/XmlMimeFilter.php

@@ -65,6 +65,5 @@ class XmlMimeFilter implements SoapRequestFilter
                 }
             }
         }
-
     }
 }

src/BeSimple/SoapCommon/AbstractSoapBuilder.php

@@ -27,7 +27,7 @@ abstract class AbstractSoapBuilder
     /**
      * @return AbstractSoapBuilder
      */
-    static public function createWithDefaults()
+    public static function createWithDefaults()
     {
         $builder = new static();
 

src/BeSimple/SoapCommon/Cache.php

@@ -25,24 +25,24 @@ class Cache
     const TYPE_MEMORY      = WSDL_CACHE_MEMORY;
     const TYPE_DISK_MEMORY = WSDL_CACHE_BOTH;
 
-    static protected $types = array(
+    protected static $types = array(
         self::TYPE_NONE,
         self::TYPE_DISK,
         self::TYPE_MEMORY,
         self::TYPE_DISK_MEMORY,
     );
 
-    static public function getTypes()
+    public static function getTypes()
     {
         return self::$types;
     }
 
-    static public function isEnabled()
+    public static function isEnabled()
     {
         return self::iniGet('soap.wsdl_cache_enabled');
     }
 
-    static public function setEnabled($enabled)
+    public static function setEnabled($enabled)
     {
         if (!in_array($enabled, array(self::ENABLED, self::DISABLED), true)) {
             throw new \InvalidArgumentException();
@@ -51,12 +51,12 @@ class Cache
         self::iniSet('soap.wsdl_cache_enabled', $enabled);
     }
 
-    static public function getType()
+    public static function getType()
     {
         return self::iniGet('soap.wsdl_cache');
     }
 
-    static public function setType($type)
+    public static function setType($type)
     {
         if (!in_array($type, self::getTypes(), true)) {
             throw new \InvalidArgumentException('The cache type has to be either Cache::TYPE_NONE, Cache::TYPE_DISK, Cache::TYPE_MEMORY or Cache::TYPE_DISK_MEMORY');
@@ -65,12 +65,12 @@ class Cache
         self::iniSet('soap.wsdl_cache', $type);
     }
 
-    static public function getDirectory()
+    public static function getDirectory()
     {
         return self::iniGet('soap.wsdl_cache_dir');
     }
 
-    static public function setDirectory($directory)
+    public static function setDirectory($directory)
     {
         if (!is_dir($directory)) {
             mkdir($directory, 0777, true);
@@ -79,32 +79,32 @@ class Cache
         self::iniSet('soap.wsdl_cache_dir', $directory);
     }
 
-    static public function getLifetime()
+    public static function getLifetime()
     {
         return self::iniGet('soap.wsdl_cache_ttl');
     }
 
-    static public function setLifetime($lifetime)
+    public static function setLifetime($lifetime)
     {
         self::iniSet('soap.wsdl_cache_ttl', $lifetime);
     }
 
-    static public function getLimit()
+    public static function getLimit()
     {
         return self::iniGet('soap.wsdl_cache_limit');
     }
 
-    static public function setLimit($limit)
+    public static function setLimit($limit)
     {
         self::iniSet('soap.wsdl_cache_limit', $limit);
     }
 
-    static protected function iniGet($key)
+    protected static function iniGet($key)
     {
         return ini_get($key);
     }
 
-    static protected function iniSet($key, $value)
+    protected static function iniSet($key, $value)
     {
         ini_set($key, $value);
     }

src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php

@@ -44,4 +44,3 @@ class DateTimeTypeConverter implements TypeConverterInterface
         return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d\TH:i:sP'));
     }
 }
-

src/BeSimple/SoapCommon/Converter/DateTypeConverter.php

@@ -44,4 +44,3 @@ class DateTypeConverter implements TypeConverterInterface
         return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d'));
     }
 }
-

src/BeSimple/SoapCommon/Converter/MtomTypeConverter.php

@@ -65,10 +65,8 @@ class MtomTypeConverter implements TypeConverterInterface, SoapKernelAwareInterf
             $contentId = urldecode(substr($ref, 4));
 
             if (null !== ($part = $this->soapKernel->getAttachment($contentId))) {
-
                 return $part->getContent();
             } else {
-
                 return null;
             }
         }

src/BeSimple/SoapCommon/Converter/SoapKernelAwareInterface.php

@@ -28,5 +28,5 @@ interface SoapKernelAwareInterface
      *
      * @return void
      */
-    function setKernel(SoapKernel $soapKernel);
+    public function setKernel(SoapKernel $soapKernel);
 }

src/BeSimple/SoapCommon/Converter/SwaTypeConverter.php

@@ -61,10 +61,8 @@ class SwaTypeConverter implements TypeConverterInterface, SoapKernelAwareInterfa
             $contentId = urldecode(substr($ref, 4));
 
             if (null !== ($part = $this->soapKernel->getAttachment($contentId))) {
-
                 return $part->getContent();
             } else {
-
                 return null;
             }
         }

src/BeSimple/SoapCommon/Converter/TypeConverterInterface.php

@@ -24,14 +24,14 @@ interface TypeConverterInterface
      *
      * @return string
      */
-    function getTypeNamespace();
+    public function getTypeNamespace();
 
     /**
      * Get type name.
      *
      * @return string
      */
-    function getTypeName();
+    public function getTypeName();
 
     /**
      * Convert given XML string to PHP type.
@@ -40,7 +40,7 @@ interface TypeConverterInterface
      *
      * @return mixed
      */
-    function convertXmlToPhp($data);
+    public function convertXmlToPhp($data);
 
     /**
      * Convert PHP type to XML string.
@@ -49,5 +49,5 @@ interface TypeConverterInterface
      *
      * @return string
      */
-    function convertPhpToXml($data);
+    public function convertPhpToXml($data);
 }

src/BeSimple/SoapCommon/Definition/Message.php

@@ -25,7 +25,7 @@ class Message
     public function __construct($name)
     {
         $this->name = $name;
-        $this->parts = array();
+        $this->parts = [];
     }
 
     public function getName()
@@ -48,13 +48,13 @@ class Message
         return 0 === count($this->parts) ? true : false;
     }
 
-    public function add($name, $phpType, $nillable = false, $attribute = false)
+    public function add($name, $phpType, $nillable = false, $minOccurs = 1)
     {
         if ($phpType instanceof TypeInterface) {
             $phpType = $phpType->getPhpType();
         }
 
-        $this->parts[$name] = new Part($name, $phpType, $nillable, $attribute);
+        $this->parts[$name] = new Part($name, $phpType, $nillable, $minOccurs);
 
         return $this;
     }

src/BeSimple/SoapCommon/Definition/Method.php

@@ -12,8 +12,6 @@
 
 namespace BeSimple\SoapCommon\Definition;
 
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
-
 /**
  * @author Francis Besset <francis.besset@gmail.com>
  */
@@ -53,7 +51,7 @@ class Method
 
     public function getUse()
     {
-        return \SOAP_ENCODED;
+        return \SOAP_LITERAL;
     }
 
     public function addHeader($name, $type)
@@ -68,11 +66,7 @@ class Method
 
     public function setOutput($type, $name = 'return')
     {
-        if ('return' !== $name) {
+        $this->output->add('return', $type);
-            $this->output = new Message($name);
-        }
-
-        $this->output->add($name, $type);
     }
 
     public function getHeaders()

src/BeSimple/SoapCommon/Definition/Part.php

@@ -20,14 +20,14 @@ class Part
     protected $name;
     protected $type;
     protected $nillable;
-    protected $attribute;
+    protected $minOccurs;
 
-    public function __construct($name, $type, $nillable = false, $attribute = false)
+    public function __construct($name, $type, $nillable = false, $minOccurs = 1)
     {
         $this->name = $name;
         $this->type = $type;
+        $this->minOccurs = $minOccurs;
         $this->setNillable($nillable);
-        $this->setAttribute($attribute);
     }
 
     public function getName()
@@ -35,26 +35,6 @@ class Part
         return $this->name;
     }
 
-    /**
-     * @return bool
-     */
-    public function isAttribute()
-    {
-        return $this->attribute;
-    }
-
-    /**
-     * @param bool $attribute
-     *
-     * @return $this
-     */
-    public function setAttribute($attribute)
-    {
-            $this->attribute = $attribute;
-    
-            return $this;
-    }
-
     public function getType()
     {
         return $this->type;
@@ -72,6 +52,16 @@ class Part
 
     public function setNillable($nillable)
     {
-        $this->nillable = (boolean) $nillable;
+        $this->nillable = (bool) $nillable;
+    }
+
+    public function setMinOccurs($minOccurs)
+    {
+        $this->minOccurs = $minOccurs;
+    }
+
+    public function getMinOccurs()
+    {
+        return $this->minOccurs;
     }
 }

src/BeSimple/SoapCommon/Helper.php

@@ -172,7 +172,8 @@ class Helper
         return sprintf(
             '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
             // 32 bits for "time_low"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+            mt_rand(0, 0xffff),
+            mt_rand(0, 0xffff),
             // 16 bits for "time_mid"
             mt_rand(0, 0xffff),
             // 16 bits for "time_hi_and_version",
@@ -183,7 +184,9 @@ class Helper
             // two most significant bits holds zero and one for variant DCE1.1
             mt_rand(0, 0x3fff) | 0x8000,
             // 48 bits for "node"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+            mt_rand(0, 0xffff),
+            mt_rand(0, 0xffff),
+            mt_rand(0, 0xffff)
         );
     }
 

src/BeSimple/SoapCommon/SoapMessage.php

@@ -47,7 +47,7 @@ abstract class SoapMessage
      *
      * @var array(string=>string)
      */
-    static protected $versionToContentTypeMap = array(
+    protected static $versionToContentTypeMap = array(
         SOAP_1_1 => 'text/xml; charset=utf-8',
         SOAP_1_2 => 'application/soap+xml; charset=utf-8'
     );

src/BeSimple/SoapCommon/SoapRequest.php

@@ -22,5 +22,4 @@ use BeSimple\SoapCommon\SoapMessage;
  */
 class SoapRequest extends SoapMessage
 {
-
 }

src/BeSimple/SoapCommon/SoapResponse.php

@@ -22,5 +22,4 @@ use BeSimple\SoapCommon\SoapMessage;
  */
 class SoapResponse extends SoapMessage
 {
-
 }

src/BeSimple/SoapCommon/Tests/Converter/DateTimeTypeConverterTest.php

@@ -51,4 +51,3 @@ class DateTimeTypeConverterTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($date);
     }
 }
-

src/BeSimple/SoapCommon/Tests/Converter/DateTypeConverterTest.php

@@ -49,4 +49,3 @@ class DateTypeConverterTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($date);
     }
 }
-

src/BeSimple/SoapCommon/WsSecurityFilterClientServer.php

@@ -338,7 +338,6 @@ abstract class WsSecurityFilterClientServer
                             return XmlSecurityKey::factory($algorithm, $key, false, XmlSecurityKey::TYPE_PRIVATE);
                         } elseif (Helper::NS_WSS === $referencedNode->namespaceURI
                                 && 'BinarySecurityToken' == $referencedNode->localName) {
-
                             $key = XmlSecurityPem::formatKeyInPemFormat($referencedNode->textContent);
 
                             return XmlSecurityKey::factory(XmlSecurityKey::RSA_SHA1, $key, false, XmlSecurityKey::TYPE_PUBLIC);

src/BeSimple/SoapServer/SoapServer.php

@@ -100,34 +100,6 @@ class SoapServer extends \SoapServer
         parent::handle($soapRequest->getContent());
         $response = ob_get_clean();
 
-        $dom = \DOMDocument::loadXML($response);
-
-        /** @var \DOMElement $envelop */
-        $envelop = $dom->childNodes->item(0);
-        $ns1 = $envelop->getAttribute('xmlns:ns1');
-        $envelop->removeAttributeNS($ns1, 'ns1');
-        $envelop->prefix = 'soap';
-
-        $envelop->setAttribute('soap:encodingStyle', 'http://schemas.xmlsoap.org/soap/encoding/');
-        $envelop->setAttribute('xmlns:soapenc', 'http://schemas.xmlsoap.org/soap/encoding/');
-        $envelop->setAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema');
-        $envelop->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-
-        /** @var \DOMElement $body */
-        $body = $envelop->childNodes->item(0);
-        $body->prefix = 'soap';
-
-        /** @var \DOMElement $responseRoot */
-        $responseRoot = $body->childNodes->item(0);
-        $responseRoot->setAttribute('xmlns', $ns1);
-
-        $envelop->removeAttributeNS('http://schemas.xmlsoap.org/soap/envelope/', 'SOAP-ENV');
-        $envelop->removeAttributeNS('http://schemas.xmlsoap.org/soap/encoding/', 'SOAP-ENC');
-
-        $response = $dom->saveXML();
-
-        $response = preg_replace('/xsi:type="ns1:\w*"/', '', $response);
-
         // Remove headers added by SoapServer::handle() method
         header_remove('Content-Length');
         header_remove('Content-Type');
@@ -159,9 +131,7 @@ class SoapServer extends \SoapServer
     /**
      * Configure filter and type converter for SwA/MTOM.
      *
-     * @param array &$options SOAP constructor options array.
+     * @param array &$options SOAP constructor options array
-     *
-     * @return void
      */
     private function configureMime(array &$options)
     {

src/BeSimple/SoapServer/SoapServerBuilder.php

@@ -33,7 +33,7 @@ class SoapServerBuilder extends AbstractSoapBuilder
      *
      * @return \BeSimple\SoapServer\SoapServerBuilder
      */
-    static public function createWithDefaults()
+    public static function createWithDefaults()
     {
         return parent::createWithDefaults()
             ->withErrorReporting(false);

src/BeSimple/SoapServer/XmlMimeFilter.php

@@ -65,6 +65,5 @@ class XmlMimeFilter implements SoapResponseFilter
                 }
             }
         }
-
     }
 }

src/BeSimple/SoapWsdl/Dumper/AbstractVersion.php

@@ -61,7 +61,7 @@ abstract class AbstractVersion implements VersionInterface
     {
         if (!$this->bindingNode) {
             $this->bindingNode = $this->document->createElement('binding');
-            $this->bindingNode->setAttribute('name', $this->name.'_SOAP');
+            $this->bindingNode->setAttribute('name', $this->name.'Binding');
             $this->bindingNode->setAttribute('type', $this->portTypeName);
 
             $this->addSoapBinding();
@@ -75,7 +75,7 @@ abstract class AbstractVersion implements VersionInterface
         if (!$this->servicePortNode) {
             $this->servicePortNode = $this->document->createElement('port');
             $this->servicePortNode->setAttribute('name', $this->name.'Port');
-            $this->servicePortNode->setAttribute('binding', $this->typeNs.':'.$this->name.'_SOAP');
+            $this->servicePortNode->setAttribute('binding', $this->typeNs.':'.$this->name.'Binding');
 
             $this->addSoapAddress();
         }

src/BeSimple/SoapWsdl/Dumper/Dumper.php

@@ -54,7 +54,7 @@ class Dumper
     protected $domService;
     protected $domPortType;
 
-    public function __construct(Definition $definition, array $options = array())
+    public function __construct(Definition $definition, array $options = [])
     {
         $this->definition = $definition;
         $this->document = new \DOMDocument('1.0', 'utf-8');
@@ -64,15 +64,15 @@ class Dumper
 
     public function setOptions(array $options)
     {
-        $this->options = array(
+        $this->options = [
             'version11_class' => 'BeSimple\\SoapWsdl\\Dumper\\Version11',
             'version12_class' => 'BeSimple\\SoapWsdl\\Dumper\\Version12',
             'version11_name' => $this->definition->getName(),
             'version12_name' => $this->definition->getName() . '12',
             'stylesheet' => null,
-        );
+        ];
 
-        $invalid = array();
+        $invalid = [];
         foreach ($options as $key => $value) {
             if (array_key_exists($key, $this->options)) {
                 $this->options[$key] = $value;
@@ -114,7 +114,7 @@ class Dumper
         $this->addMethods();
         $this->addService();
 
-        foreach (array($this->version11, $this->version12) as $version) {
+        foreach ([$this->version11, $this->version12] as $version) {
             if (!$version) {
                 continue;
             }
@@ -203,9 +203,9 @@ class Dumper
                 $partElement->setAttribute('name', $part->getName());
 
                 if ($type instanceof ComplexType) {
-                    $partElement->setAttribute('element', static::TYPES_NS.':'.$type->getXmlType());
+                    $partElement->setAttribute('type', static::TYPES_NS . ':' . $type->getXmlType());
                 } else {
-                    $partElement->setAttribute('element', $type);
+                    $partElement->setAttribute('type', $type);
                 }
 
                 $messageElement->appendChild($partElement);
@@ -217,13 +217,11 @@ class Dumper
 
     protected function addComplexTypes()
     {
-        $types = $this->document->createElement(static::WSDL_NS . ':types');
+        $types = $this->document->createElement('types');
         $this->domDefinitions->appendChild($types);
 
         $this->domSchema = $this->document->createElement(static::XSD_NS . ':schema');
         $this->domSchema->setAttribute('targetNamespace', $this->definition->getNamespace());
-        $this->domSchema->setAttribute('elementFormDefault', 'unqualified');
-        $this->domSchema->setAttribute(static::XML_NS.':'.static::XSD_NS, static::XSD_NS_URI);
         $types->appendChild($this->domSchema);
 
         foreach ($this->definition->getTypeRepository()->getComplexTypes() as $type) {
@@ -238,18 +236,13 @@ class Dumper
         $complexType = $this->document->createElement(static::XSD_NS . ':complexType');
         $complexType->setAttribute('name', $type->getXmlType());
 
-        $all = $this->document->createElement(static::XSD_NS.':'.'sequence');
+        $all = $this->document->createElement(static::XSD_NS . ':' . ($type instanceof ArrayOfType ? 'sequence' : 'all'));
         $complexType->appendChild($all);
 
         foreach ($type->all() as $child) {
-            $isArray = false;
             $childType = $this->definition->getTypeRepository()->getType($child->getType());
 
-            if ($child->isAttribute()) {
-                $element = $this->document->createElement(static::XSD_NS.':attribute');
-            } else {
             $element = $this->document->createElement(static::XSD_NS . ':element');
-            }
             $element->setAttribute('name', $child->getName());
 
             if ($childType instanceof ComplexType) {
@@ -264,23 +257,20 @@ class Dumper
             }
 
             if ($child->isNillable()) {
-                $element->setAttribute('minOccurs', 0);
+                $element->setAttribute('nillable', 'true');
-            } else {
-                $element->setAttribute('minOccurs', 1);
             }
 
-            if ($type instanceof ArrayOfType || $isArray) {
+            if ($type instanceof ArrayOfType) {
                 $element->setAttribute('minOccurs', 0);
                 $element->setAttribute('maxOccurs', 'unbounded');
-            } else {
-                $element->setAttribute('maxOccurs', 1);
             }
 
-            if ($child->isAttribute()) {
+            // 1 is the default value of minOccurs.
-                $complexType->appendChild($element);
+            if (1 != $child->getMinOccurs()) {
-            } else {
+                $element->setAttribute('minOccurs', $child->getMinOccurs());
-                $all->appendChild($element);
             }
+
+            $all->appendChild($element);
         }
 
         $this->domSchema->appendChild($complexType);
@@ -299,7 +289,7 @@ class Dumper
         $operation = $this->document->createElement('operation');
         $operation->setAttribute('name', $method->getName());
 
-        foreach (array('input' => $method->getInput(), 'output' => $method->getOutput(), 'fault' => $method->getFault()) as $type => $message) {
+        foreach (['input' => $method->getInput(), 'output' => $method->getOutput(), 'fault' => $method->getFault()] as $type => $message) {
             if ('fault' === $type && $message->isEmpty()) {
                 continue;
             }