Mark client generated services as public

Add minOccurs annotation support on complexType

.gitignore

@@ -1,3 +1,6 @@
 /vendor/
 composer.lock
+composer.phar
 phpunit.xml
+.idea
+.php_cs.cache

.travis.yml

@@ -1,20 +1,16 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
 
 env:
-  - SYMFONY_VERSION=2.0.*
-  - SYMFONY_VERSION=2.1.*
-  - SYMFONY_VERSION=2.2.*
-  - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.4.*
-  - SYMFONY_VERSION=2.5.*
-  - SYMFONY_VERSION="dev-master symfony/debug:~2.6@dev symfony/http-kernel:~2.6@dev"
+  - SYMFONY_VERSION=2.8.*
+  - SYMFONY_VERSION="dev-master symfony/debug:~2.8@dev symfony/http-kernel:~2.8@dev"
 
 before_script:
+  - phpenv config-add myphp.ini
   - composer self-update
   - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
   - composer update --no-interaction --prefer-source
@@ -26,4 +22,4 @@ script:
 
 matrix:
   allow_failures:
-    - env: SYMFONY_VERSION="dev-master symfony/debug:~2.6@dev symfony/http-kernel:~2.6@dev"
+    - env: SYMFONY_VERSION="dev-master symfony/debug:~2.8@dev symfony/http-kernel:~2.8@dev"

README.md

@@ -1,56 +1,146 @@
-# BeSimpleSoap
+# BeSimpleSoap (Symfony 3.4 / 4.x)
 
-Build SOAP and WSDL based web services
+This fork provides the BeSimpleSoap bundle, updated to be compatible with Symfony 3.4 and 4.x (as well as with PHP 7.0-7.4).
+
+We forked the official [BeSimpleSoap](https://github.com/BeSimple/BeSimpleSoap) repository in order to sucessfully maintain some of our projects.
+
+We now have integrated changes and fixes from sub-forks (thank you guys!), and we should be up to date now :)
+
+This fork is maintained by people from [Cadoles](https://www.cadoles.com/).
+
+# Contributing
+
+We do welcome pull requests :) please include tests if you can.
+
+Running tests can be done by running `php vendor/bin/phpunit`.
+
+# Installation
+
+If you do not yet have composer, follow instructions on the [Composer website](https://getcomposer.org/download/) to install it.
+
+Then just running:
+
+```
+$ composer require cadoles/soap
+```
+
+should be enough to get you up and running.
 
 # Components
 
 BeSimpleSoap consists of five components ...
 
-## BeSimpleSoapBundle
-
-The BeSimpleSoapBundle is a Symfony2 bundle to build WSDL and SOAP based web services.
-For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapBundle/README.md).
-
 ## BeSimpleSoapClient
 
-The BeSimpleSoapClient is a component that extends the native PHP SoapClient with further features like SwA, MTOM and WS-Security.
-For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapClient/README.md).
-
-## BeSimpleSoapCommon
-
-The BeSimpleSoapCommon component contains functionylity shared by both the server and client implementations.
-For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapCommon/README.md).
-
+**Refactored** BeSimpleSoapClient is a component that extends the native PHP SoapClient with further features like SwA and WS-Security.
 
 ## BeSimpleSoapServer
 
-The BeSimpleSoapServer is a component that extends the native PHP SoapServer with further features like SwA, MTOM and WS-Security.
-For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapServer/README.md).
+**Refactored** BeSimpleSoapServer is a component that extends the native PHP SoapServer with further features like SwA and WS-Security.
+
+## BeSimpleSoapCommon
+
+**Refactored** BeSimpleSoapCommon component contains functionality shared by both the server and client implementations.
 
 ## BeSimpleSoapWsdl
 
-For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapWsdl/README.md).
+**Untouched!**
+The component is not affected by refactoring so it should work properly. 
+For further information see the original [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapWsdl/README.md).
 
-# Installation
+## BeSimpleSoapBundle
 
-If you do not yet have composer, install it like this:
+**Unsupported!**
+The BeSimpleSoapBundle is a Symfony2 bundle to build WSDL and SOAP based web services.
+For further information see the the original [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapBundle/README.md).
+*Will not work since the Symfony libraries were removed and usages of other components were not refactored. Feel free to fork this repository and fix it!* 
 
-```sh
-curl -s http://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin
+# How to use
+
+You can investigate the unit tests dir ``tests`` in order to get a clue.
+Forget about associative arrays, vague configurations, multiple extension and silent errors!
+This may look a bit more complex at the first sight,
+but it will guide you to configure and set up your client or server properly.
+
+## Example of soap client call
+
+```php
+$soapClientBuilder = new SoapClientBuilder();
+$soapClient = $soapClientBuilder->build(
+    SoapClientOptionsBuilder::createWithDefaults(),
+    SoapOptionsBuilder::createWithDefaults('http://path/to/wsdlfile.wsdl')
+);
+$myRequest = new MyRequest();
+$myRequest->attribute = 'string value';
+$soapResponse = $soapClient->soapCall('myMethod', [$myRequest]);
+
+var_dump($soapResponse); // Contains Response, Attachments
 ```
 
-Create a `composer.json` file:
+### Something wrong?!
 
-```json
+Turn on the tracking and catch `SoapFaultWithTracingData` exception to get some sweets :)
+
+```php
+try {
+    $soapResponse = $soapClient->soapCall('myMethod', [$myRequest]);
+} catch (SoapFaultWithTracingData $fault) {
+    var_dump($fault->getSoapResponseTracingData()->getLastRequest());
+}
+```
+In this example, a ``MyRequest`` object has been used to describe request.
+Using a ClassMap, you help SoapClient to turn it into XML request.
+
+## Example of soap server handling
+
+Starting a SOAP server is a bit more complex.
+I recommend you to inspect SoapServer unit tests for inspiration.
+
+```php
+$dummyService = new DummyService();
+$classMap = new ClassMap();
+foreach ($dummyService->getClassMap() as $type => $className) {
+    $classMap->add($type, $className);
+}
+$soapServerBuilder = new SoapServerBuilder();
+$soapServerOptions = SoapServerOptionsBuilder::createWithDefaults($dummyService);
+$soapOptions = SoapOptionsBuilder::createWithClassMap($dummyService->getWsdlPath(), $classMap);
+$soapServer = $soapServerBuilder->build($soapServerOptions, $soapOptions);
+
+$request = $soapServer->createRequest(
+    $dummyService->getEndpoint(),
+    'DummyService.dummyServiceMethod',
+    'text/xml;charset=UTF-8',
+    '<received><soap><request><here /></request></soap></received>'
+);
+$response = $soapServer->handleRequest($request);
+
+var_dump($response); // Contains Response, Attachments
+```
+
+In this example, a ``DummyService`` service has been used to handle request.
+Using a service can help you create coherent SoapServer endpoints.
+Service can hold an endpoint URL, WSDL path and a class map as associative array.
+You can hold a class map as ``ClassMap`` object directly in the ``DummyService`` instead of array.
+
+In the service you should describe SOAP methods from given WSDL.
+In the example, the dummyServiceMethod is called.
+The method will receive request object and return response object that are matched according to the class map.
+
+See a simplified implementation of ``dummyServiceMethod`` to get a clue:
+
+```php
+/**
+ * @param DummyServiceRequest $dummyServiceRequest
+ * @return DummyServiceResponse
+ */
+public function dummyServiceMethod(DummyServiceRequest $dummyServiceRequest)
 {
-    "require": {
-        "besimple/soap": "0.2.*@dev"
-    }
+    $response = new DummyServiceResponse();
+    $response->status = true;
+
+    return $response;
 }
 ```
 
-Now you are ready to install the library:
-
-```sh
-php /usr/local/bin/composer.phar install
-```
+For further information and getting inspiration for your implementation, see the unit tests in ``tests`` dir.

composer.json

@@ -1,9 +1,9 @@
 {
-    "name": "besimple/soap",
+    "name": "cadoles/soap",
     "type": "library",
     "description": "Build and consume SOAP and WSDL based web services",
     "keywords": ["soap"],
-    "homepage": "http://besim.pl",
+    "homepage": "https://github.com/Cadoles/BeSimpleSoap",
     "license": "MIT",
     "authors": [
         {
@@ -20,33 +20,34 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=7.0",
         "ext-soap": "*",
         "ext-curl": "*",
         "ass/xmlsecurity": "~1.0",
-        "symfony/framework-bundle": "~2.0",
-        "symfony/twig-bundle": "~2.0",
-        "zendframework/zend-mime": "2.1.*"
+        "symfony/framework-bundle": "~3.4|~4.0",
+        "symfony/twig-bundle": "~3.4|~4.0",
+        "laminas/laminas-mime": "~2.1"
     },
     "replace": {
         "besimple/soap-bundle": "self.version",
         "besimple/soap-client": "self.version",
         "besimple/soap-common": "self.version",
         "besimple/soap-server": "self.version",
-        "besimple/soap-wsdl":   "self.version"
+        "besimple/soap-wsdl":   "self.version",
+        "cocciagialla/soap":    "self.version"
     },
     "require-dev": {
-        "ext-mcrypt": "*",
-        "mikey179/vfsStream": "~1.0",
-        "symfony/filesystem": "~2.0",
-        "symfony/process": "~2.3"
+        "mikey179/vfsstream": "~1.6.5",
+        "symfony/filesystem": "~2.3",
+        "symfony/process": "~2.3",
+        "phpunit/phpunit": "^5.7"
     },
     "autoload": {
         "psr-0": { "BeSimple\\": "src/" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2-dev"
+            "dev-master": "5.2.0-dev"
         }
     }
 }

src/BeSimple/SoapBundle/.gitignore

@@ -1,3 +1,4 @@
 vendor/
 composer.lock
 phpunit.xml
+.idea/

src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php

@@ -15,21 +15,26 @@ namespace BeSimple\SoapBundle\Controller;
 use BeSimple\SoapBundle\Handler\ExceptionHandler;
 use BeSimple\SoapBundle\Soap\SoapRequest;
 use BeSimple\SoapBundle\Soap\SoapResponse;
+use BeSimple\SoapBundle\WebServiceContext;
 use BeSimple\SoapServer\SoapServerBuilder;
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\FlattenException;
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
  * @author Francis Besset <francis.besset@gmail.com>
  */
-class SoapWebServiceController extends ContainerAware
+class SoapWebServiceController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     /**
      * @var \SoapServer
      */
@@ -53,19 +58,20 @@ class SoapWebServiceController extends ContainerAware
     /**
      * @var array
      */
-    private $headers = array();
+    private $headers = [];
 
     /**
      * @return \BeSimple\SoapBundle\Soap\SoapResponse
      */
     public function callAction($webservice)
     {
-        $webServiceContext   = $this->getWebServiceContext($webservice);
+        /** @var WebServiceContext $webServiceContext */
+        $webServiceContext = $this->getWebServiceContext($webservice);
 
         $this->serviceBinder = $webServiceContext->getServiceBinder();
 
-        $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request'));
-        $this->soapServer  = $webServiceContext
+        $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request_stack')->getCurrentRequest());
+        $this->soapServer = $webServiceContext
             ->getServerBuilder()
             ->withSoapVersion11()
             ->withHandler($this)
@@ -83,19 +89,26 @@ class SoapWebServiceController extends ContainerAware
     }
 
     /**
-     * @return Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
     public function definitionAction($webservice)
     {
+        $routeName = $webservice.'_webservice_call';
+        $result = $this->container->get('router')->getRouteCollection()->get($routeName);
+        if (null === $result) {
+            $routeName = '_webservice_call';
+        }
+
         $response = new Response($this->getWebServiceContext($webservice)->getWsdlFileContent(
             $this->container->get('router')->generate(
-                '_webservice_call',
-                array('webservice' => $webservice),
-                true
+                $routeName,
+                ['webservice' => $webservice],
+                UrlGeneratorInterface::ABSOLUTE_URL
             )
         ));
 
-        $request = $this->container->get('request');
+        /** @var Request $request */
+        $request = $this->container->get('request_stack')->getCurrentRequest();
         $query = $request->query;
         if ($query->has('wsdl') || $query->has('WSDL')) {
             $request->setRequestFormat('wsdl');
@@ -121,14 +134,14 @@ class SoapWebServiceController extends ContainerAware
             throw new \LogicException(sprintf('The parameter "%s" is required in Request::$query parameter bag to generate the SoapFault.', '_besimple_soap_webservice'), null, $e);
         }
 
-        $view = 'TwigBundle:Exception:'.($this->container->get('kernel')->isDebug() ? 'exception' : 'error').'.txt.twig';
+        $view = '@Twig/Exception/'.($this->container->get('kernel')->isDebug() ? 'exception' : 'error').'.txt.twig';
         $code = $exception->getStatusCode();
-        $details = $this->container->get('templating')->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,
-        ));
+            'exception' => $exception,
+            'logger' => $logger,
+        ]);
 
         $handler = new ExceptionHandler($exception, $details);
         if ($soapFault = $request->query->get('_besimple_soap_fault')) {
@@ -162,8 +175,8 @@ class SoapWebServiceController extends ContainerAware
      * This method gets called once for every SOAP header the \SoapServer received
      * and afterwards once for the called SOAP operation.
      *
-     * @param string $method The SOAP header or SOAP operation name
-     * @param array $arguments
+     * @param string $method    The SOAP header or SOAP operation name
+     * @param array  $arguments
      *
      * @return mixed
      */
@@ -220,7 +233,7 @@ class SoapWebServiceController extends ContainerAware
     }
 
     /**
-     * Set the SoapResponse
+     * Set the SoapResponse.
      *
      * @param Response $response A response to check and set
      *
@@ -237,7 +250,7 @@ class SoapWebServiceController extends ContainerAware
         return $this->soapResponse = $response;
     }
 
-    private function getWebServiceContext($webservice)
+    protected function getWebServiceContext($webservice)
     {
         $context = sprintf('besimple.soap.context.%s', $webservice);
 

src/BeSimple/SoapBundle/Converter/TypeRepository.php

@@ -48,7 +48,7 @@ class TypeRepository
 
     public function fixTypeInformation(ServiceDefinition $definition)
     {
-        foreach($definition->getAllTypes() as $type) {
+        foreach ($definition->getAllTypes() as $type) {
             $phpType = $type->getPhpType();
             $xmlType = $type->getXmlType();
 

src/BeSimple/SoapBundle/Converter/XopIncludeTypeConverter.php

@@ -12,7 +12,7 @@ namespace BeSimple\SoapBundle\Converter;
 
 use BeSimple\SoapBundle\Soap\SoapRequest;
 use BeSimple\SoapBundle\Soap\SoapResponse;
-use BeSimple\SoapBundle\Util\String;
+use BeSimple\SoapBundle\Util\BsString;
 use BeSimple\SoapCommon\Converter\TypeConverterInterface;
 
 /**
@@ -40,7 +40,7 @@ class XopIncludeTypeConverter implements TypeConverterInterface
 
         $ref = $include->getAttribute('href');
 
-        if (String::startsWith($ref, 'cid:')) {
+        if (BsString::startsWith($ref, 'cid:')) {
             $cid = urldecode(substr($ref, 4));
 
             return $request->getSoapAttachments()->get($cid)->getContent();

src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php

@@ -17,10 +17,11 @@ use BeSimple\SoapCommon\Cache;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * BeSimpleSoapExtension.
@@ -59,7 +60,7 @@ class BeSimpleSoapExtension extends Extension
 
         $container->setParameter('besimple.soap.definition.dumper.options.stylesheet', $config['wsdl_dumper']['stylesheet']);
 
-        foreach($config['services'] as $name => $serviceConfig) {
+        foreach ($config['services'] as $name => $serviceConfig) {
             $serviceConfig['name'] = $name;
             $this->createWebServiceContext($serviceConfig, $container);
         }
@@ -80,17 +81,21 @@ class BeSimpleSoapExtension extends Extension
 
     private function registerClientConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
-        $loader->load('client.xml');
+        if (3 === Kernel::MAJOR_VERSION) {
+            $loader->load('client3.xml');
+        } else {
+            $loader->load('client.xml');
+        }
 
         foreach ($config as $client => $options) {
-            $definition = new DefinitionDecorator('besimple.soap.client.builder');
+            $definition = new ChildDefinition('besimple.soap.client.builder');
             $container->setDefinition(sprintf('besimple.soap.client.builder.%s', $client), $definition);
 
             $definition->replaceArgument(0, $options['wsdl']);
 
             $defOptions = $container
-                    ->getDefinition('besimple.soap.client.builder')
-                    ->getArgument(1);
+                ->getDefinition('besimple.soap.client.builder')
+                ->getArgument(1);
 
             foreach (array('cache_type', 'user_agent') as $key) {
                 if (isset($options[$key])) {
@@ -130,7 +135,7 @@ class BeSimpleSoapExtension extends Extension
 
     private function createClientClassmap($client, array $classmap, ContainerBuilder $container)
     {
-        $definition = new DefinitionDecorator('besimple.soap.classmap');
+        $definition = new ChildDefinition('besimple.soap.classmap');
         $container->setDefinition(sprintf('besimple.soap.classmap.%s', $client), $definition);
 
         if (!empty($classmap)) {
@@ -144,10 +149,18 @@ class BeSimpleSoapExtension extends Extension
 
     private function createClient($client, ContainerBuilder $container)
     {
-        $definition = new DefinitionDecorator('besimple.soap.client');
+        $definition = new ChildDefinition('besimple.soap.client');
         $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
 
-        $definition->setFactoryService(sprintf('besimple.soap.client.builder.%s', $client));
+        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));
+        }
     }
 
     private function createWebServiceContext(array $config, ContainerBuilder $container)
@@ -156,7 +169,7 @@ class BeSimpleSoapExtension extends Extension
         unset($config['binding']);
 
         $contextId  = 'besimple.soap.context.'.$config['name'];
-        $definition = new DefinitionDecorator('besimple.soap.context.'.$bindingSuffix);
+        $definition = new ChildDefinition('besimple.soap.context.'.$bindingSuffix);
         $container->setDefinition($contextId, $definition);
 
         if (isset($config['cache_type'])) {
@@ -165,6 +178,7 @@ class BeSimpleSoapExtension extends Extension
 
         $options = $container
             ->getDefinition('besimple.soap.context.'.$bindingSuffix)
+            ->setPublic(true)
             ->getArgument(2);
 
         $definition->replaceArgument(2, array_merge($options, $config));

src/BeSimple/SoapBundle/DependencyInjection/Configuration.php

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

src/BeSimple/SoapBundle/EventListener/SoapExceptionListener.php

@@ -51,7 +51,9 @@ class SoapExceptionListener extends ExceptionListener
         }
 
         $request = $event->getRequest();
-        if ('soap' !== $request->getRequestFormat()) {
+        if (!in_array($request->getRequestFormat(), array('soap', 'xml'))) {
+            return;
+        } elseif ('xml' === $request->getRequestFormat() && '_webservice_call' !== $request->attributes->get('_route')) {
             return;
         }
 

src/BeSimple/SoapBundle/Handler/ExceptionHandler.php

@@ -13,8 +13,8 @@
 namespace BeSimple\SoapBundle\Handler;
 
 use BeSimple\SoapServer\Exception\ReceiverSoapFault;
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\FlattenException;
 
 /**
  * @author Francis Besset <francis.besset@gmail.com>

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/Resources/config/client3.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="besimple.soap.client.builder.class">BeSimple\SoapBundle\Soap\SoapClientBuilder</parameter>
+        <parameter key="besimple.soap.classmap.class">BeSimple\SoapCommon\Classmap</parameter>
+    </parameters>
+
+    <services>
+        <service id="besimple.soap.client.builder" class="%besimple.soap.client.builder.class%" abstract="true">
+            <argument /> <!-- wsdl URI -->
+            <argument type="collection">
+                <argument key="debug">%kernel.debug%</argument>
+            </argument>
+            <argument type="service" id="besimple.soap.classmap" />
+            <argument type="service" id="besimple.soap.converter.collection" />
+            <argument type="service" id="besimple.soap.cache" /> <!-- hack to load besimple cache configuration -->
+        </service>
+
+        <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>
+
+</container>

src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <routes xmlns="http://symfony.com/schema/routing"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <route id="_webservice_call" pattern="/{webservice}">
+    <route id="_webservice_call" path="/{webservice}" methods="POST">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Call</default>
         <default key="_format">xml</default>
-        <requirement key="_method">POST</requirement>
     </route>
 
-    <route id="_webservice_definition" pattern="/{webservice}">
+    <route id="_webservice_definition" path="/{webservice}" methods="GET">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Definition</default>
         <default key="_format">xml</default>
-        <requirement key="_method">GET</requirement>
     </route>
 </routes>

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

@@ -19,7 +19,7 @@
     </parameters>
 
     <services>
-        <service id="besimple.soap.response" class="%besimple.soap.response.class%" />
+        <service id="besimple.soap.response" class="%besimple.soap.response.class%" public="true" />
 
         <service id="besimple.soap.response.listener" class="%besimple.soap.response.listener.class%">
             <tag name="kernel.event_listener" event="kernel.view" method="onKernelView" />
@@ -96,6 +96,14 @@
                 <argument>dateTime</argument>
                 <argument>xsd:dateTime</argument>
             </call>
+            <call method="addType">
+                <argument>base64Binary</argument>
+                <argument>xsd:base64Binary</argument>
+            </call>
+            <call method="addType">
+                <argument>hexBinary</argument>
+                <argument>xsd:hexBinary</argument>
+            </call>
         </service>
     </services>
 

src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedRequestHeaderMessageBinder.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * This file is part of the BeSimpleSoapBundle.
+ *
+ * (c) Christian Kerl <christian-kerl@web.de>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace BeSimple\SoapBundle\ServiceBinding;
+
+use BeSimple\SoapBundle\ServiceDefinition\Method;
+use BeSimple\SoapCommon\Definition\Type\TypeRepository;
+
+/**
+ * @author Francis Besset <francis.besset@gmail.com>
+ */
+class DocumentLiteralWrappedRequestHeaderMessageBinder extends DocumentLiteralWrappedRequestMessageBinder
+{
+    private $header;
+
+    public function setHeader($header)
+    {
+        $this->header = $header;
+    }
+
+    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository)
+    {
+        $headerDefinition = $messageDefinition->getHeaders()->get($this->header);
+        return [];
+    }
+}

src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedRequestMessageBinder.php

@@ -11,25 +11,26 @@
 namespace BeSimple\SoapBundle\ServiceBinding;
 
 use BeSimple\SoapBundle\ServiceDefinition\Method;
+use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
  */
 class DocumentLiteralWrappedRequestMessageBinder implements MessageBinderInterface
 {
-    public function processMessage(Method $messageDefinition, $message)
+    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository)
     {
-        if(count($message) > 1) {
+        if (count($message) > 1) {
             throw new \InvalidArgumentException();
         }
 
-        $result  = array();
+        $result = array();
         $message = $message[0];
 
-        foreach($messageDefinition->getArguments() as $argument) {
-            $result[$argument->getName()] = $message->{$argument->getName()};
+        foreach ($messageDefinition->getInput()->all() as $argument) {
+            $result[$argument->getName()] = $message;
         }
 
         return $result;
     }
-}
+}

src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedResponseMessageBinder.php

@@ -11,17 +11,15 @@
 namespace BeSimple\SoapBundle\ServiceBinding;
 
 use BeSimple\SoapBundle\ServiceDefinition\Method;
+use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
  */
 class DocumentLiteralWrappedResponseMessageBinder implements MessageBinderInterface
 {
-    public function processMessage(Method $messageDefinition, $message)
+    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository)
     {
-        $result = new \stdClass();
-        $result->{$messageDefinition->getName().'Result'} = $message;
-
-        return $result;
+        return $message;
     }
-}
+}

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/RpcLiteralResponseMessageBinder.php

@@ -32,7 +32,10 @@ class RpcLiteralResponseMessageBinder implements MessageBinderInterface
     {
         $this->typeRepository = $typeRepository;
 
-        return $this->processType($messageDefinition->getOutput()->get('return')->getType(), $message);
+        $parts = $messageDefinition->getOutput()->all();
+        $part = array_shift($parts);
+
+        return $this->processType($part->getType(), $message);
     }
 
     private function processType($phpType, $message)

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,6 +18,7 @@ class ComplexType extends Configuration
     private $name;
     private $value;
     private $isNillable = false;
+    private $minOccurs = 1;
 
     public function getName()
     {
@@ -34,6 +35,11 @@ class ComplexType extends Configuration
         return $this->isNillable;
     }
 
+    public function getIsNillable()
+    {
+        return $this->isNillable;
+    }
+
     public function setName($name)
     {
         $this->name = $name;
@@ -49,8 +55,23 @@ class ComplexType extends Configuration
         $this->isNillable = (bool) $isNillable;
     }
 
+    public function setIsNillable($isNillable)
+    {
+        $this->isNillable = (bool) $isNillable;
+    }
+
+    public function setMinOccurs($minOccurs)
+    {
+        $this->minOccurs = $minOccurs;
+    }
+
+    public function getMinOccurs()
+    {
+        return $this->minOccurs;
+    }
+
     public function getAliasName()
     {
         return 'complextype';
     }
-}
+}

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/Header.php

@@ -19,4 +19,4 @@ class Header extends Param
     {
         return 'header';
     }
-}
+}

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

@@ -42,4 +42,4 @@ class Method extends Configuration
     {
         return 'method';
     }
-}
+}

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

@@ -53,4 +53,4 @@ class Param extends Configuration implements TypedElementInterface
     {
         return 'param';
     }
-}
+}

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

@@ -42,4 +42,4 @@ class Result extends Configuration implements TypedElementInterface
     {
         return 'result';
     }
-}
+}

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

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

src/BeSimple/SoapBundle/ServiceDefinition/ComplexType.php

@@ -20,6 +20,7 @@ class ComplexType
     private $name;
     private $value;
     private $isNillable = false;
+    private $minOccurs = 1;
 
     public function getName()
     {
@@ -50,4 +51,14 @@ class ComplexType
     {
         $this->isNillable = (bool) $isNillable;
     }
+
+    public function setMinOccurs($minOccurs)
+    {
+        $this->minOccurs = $minOccurs;
+    }
+
+    public function getMinOccurs()
+    {
+        return $this->minOccurs;
+    }
 }

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

@@ -96,6 +96,7 @@ class AnnotationClassLoader extends Loader
                     }
 
                     $serviceReturn = $annotation->getPhpType();
+                    $serviceXmlReturn = $annotation->getXmlType();
                 }
             }
 
@@ -116,7 +117,11 @@ class AnnotationClassLoader extends Loader
                     throw new \LogicException(sprintf('@Soap\Result non-existent for "%s".', $method->getName()));
                 }
 
-                $serviceMethod->setOutput($this->loadType($serviceReturn));
+                if (!isset($serviceXmlReturn) || !$serviceXmlReturn) {
+                    $serviceXmlReturn = 'return';
+                }
+
+                $serviceMethod->setOutput($this->loadType($serviceReturn), $serviceXmlReturn);
 
                 $definition->addMethod($serviceMethod);
             }
@@ -133,7 +138,7 @@ class AnnotationClassLoader extends Loader
      */
     private function getController(\ReflectionClass $class, \ReflectionMethod $method, Annotation\Method $annotation)
     {
-        if(null !== $annotation->getService()) {
+        if (null !== $annotation->getService()) {
             return $annotation->getService() . ':' . $method->name;
         } else {
             return $class->name . '::' . $method->name;
@@ -155,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());
+                $complexType->add($name, $this->loadType($property->getValue()), $property->isNillable(), $property->getMinOccurs());
             }
 
             $this->typeRepository->addComplexType($complexType);

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

@@ -24,7 +24,7 @@ use BeSimple\SoapBundle\Util\Collection;
  */
 class AnnotationComplexTypeLoader extends AnnotationClassLoader
 {
-    private $aliasClass       = 'BeSimple\SoapBundle\ServiceDefinition\Annotation\Alias';
+    private $aliasClass = 'BeSimple\SoapBundle\ServiceDefinition\Annotation\Alias';
     private $complexTypeClass = 'BeSimple\SoapBundle\ServiceDefinition\Annotation\ComplexType';
 
     /**
@@ -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)) {
@@ -59,6 +59,7 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
                 $propertyComplexType->setValue($complexType->getValue());
                 $propertyComplexType->setNillable($complexType->isNillable());
                 $propertyComplexType->setName($property->getName());
+                $propertyComplexType->setMinOccurs($complexType->getMinOccurs());
                 $annotations['properties']->add($propertyComplexType);
             }
         }
@@ -72,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.
@@ -69,7 +69,7 @@ class SoapRequest extends Request
      */
     public function getSoapMessage()
     {
-        if(null === $this->soapMessage) {
+        if (null === $this->soapMessage) {
             $this->soapMessage = $this->initializeSoapMessage();
         }
 
@@ -88,12 +88,12 @@ class SoapRequest extends Request
 
     protected function initializeSoapMessage()
     {
-        if($this->server->has('CONTENT_TYPE')) {
+        if ($this->server->has('CONTENT_TYPE')) {
             $type = $this->splitContentTypeHeader($this->server->get('CONTENT_TYPE'));
 
-            switch($type['_type']) {
+            switch ($type['_type']) {
                 case 'multipart/related':
-                    if($type['type'] == 'application/xop+xml') {
+                    if ($type['type'] == 'application/xop+xml') {
                         return $this->initializeMtomSoapMessage($type, $this->getContent());
                     } else {
                         //log error
@@ -114,7 +114,7 @@ class SoapRequest extends Request
 
     protected function initializeMtomSoapMessage(array $contentTypeHeader, $content)
     {
-        if(!isset($contentTypeHeader['start']) || !isset($contentTypeHeader['start-info']) || !isset($contentTypeHeader['boundary'])) {
+        if (!isset($contentTypeHeader['start']) || !isset($contentTypeHeader['start-info']) || !isset($contentTypeHeader['boundary'])) {
             throw new \InvalidArgumentException();
         }
 
@@ -129,11 +129,11 @@ class SoapRequest extends Request
 
         // TODO: add more checks to achieve full compatibility to MTOM spec
         // http://www.w3.org/TR/soap12-mtom/
-        if($rootPart->id != $soapMimePartId || $rootPartType['_type'] != 'application/xop+xml' || $rootPartType['type'] != $soapMimePartType) {
+        if ($rootPart->id != $soapMimePartId || $rootPartType['_type'] != 'application/xop+xml' || $rootPartType['type'] != $soapMimePartType) {
             throw new \InvalidArgumentException();
         }
 
-        foreach($mimeParts as $mimePart) {
+        foreach ($mimeParts as $mimePart) {
             $this->soapAttachments->add(new SoapAttachment(
                 $mimePart->id,
                 $mimePart->type,
@@ -153,7 +153,7 @@ class SoapRequest extends Request
 
         $result['_type'] = array_shift($parts);
 
-        foreach($parts as $part) {
+        foreach ($parts as $part) {
             list($key, $value) = explode('=', trim($part), 2);
 
             $result[$key] = trim($value, '"');

src/BeSimple/SoapBundle/Util/Assert.php

@@ -21,7 +21,7 @@ class Assert
 
     public static function thatArgument($name, $condition, $message = self::ARGUMENT_INVALID)
     {
-        if(!$condition) {
+        if (!$condition) {
             throw new \InvalidArgumentException(sprintf($message, $name));
         }
     }

src/BeSimple/SoapBundle/Util/BsString.php

@@ -15,7 +15,7 @@ namespace BeSimple\SoapBundle\Util;
  *
  * @author Christian Kerl <christian-kerl@web.de>
  */
-class String
+class BsString
 {
     /**
      * Checks if a string starts with a given string.
@@ -27,7 +27,7 @@ class String
      */
     public static function startsWith($str, $substr)
     {
-        if(is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
+        if (is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
             return $substr == substr($str, 0, strlen($substr));
         }
     }
@@ -42,8 +42,8 @@ class String
      */
     public static function endsWith($str, $substr)
     {
-        if(is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
+        if (is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
             return $substr == substr($str, strlen($str) - strlen($substr));
         }
     }
-}
+}

src/BeSimple/SoapBundle/Util/Collection.php

@@ -62,4 +62,4 @@ class Collection implements \IteratorAggregate, \Countable
     {
         return new \ArrayIterator($this->elements);
     }
-}
+}

src/BeSimple/SoapBundle/WebServiceContext.php

@@ -44,7 +44,7 @@ class WebServiceContext
         if (null === $this->serviceDefinition) {
             $cache = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
             if ($cache->isFresh()) {
-                $this->serviceDefinition = include (string) $cache;
+                $this->serviceDefinition = include $cache->getPath();
             } else {
                 if (!$this->loader->supports($this->options['resource'], $this->options['resource_type'])) {
                     throw new \LogicException(sprintf('Cannot load "%s" (%s)', $this->options['resource'], $this->options['resource_type']));
@@ -68,10 +68,10 @@ class WebServiceContext
 
     public function getWsdlFile($endpoint = null)
     {
-        $file      = sprintf ('%s/%s.%s.wsdl', $this->options['cache_dir'], $this->options['name'], md5($endpoint));
+        $file      = sprintf('%s/%s.%s.wsdl', $this->options['cache_dir'], $this->options['name'], md5($endpoint));
         $cache = new ConfigCache($file, $this->options['debug']);
 
-        if(!$cache->isFresh()) {
+        if (!$cache->isFresh()) {
             $definition = $this->getServiceDefinition();
 
             if ($endpoint) {
@@ -82,7 +82,7 @@ class WebServiceContext
             $cache->write($dumper->dump());
         }
 
-        return (string) $cache;
+        return $cache->getPath();
     }
 
     public function getServiceBinder()

src/BeSimple/SoapBundle/composer.json

@@ -25,8 +25,8 @@
         "besimple/soap-common": "0.2.*",
         "besimple/soap-wsdl": "0.2.*",
         "ass/xmlsecurity": "~1.0",
-        "symfony/framework-bundle": "~2.0",
-        "symfony/twig-bundle": "~2.0",
+        "symfony/framework-bundle": "~2.0|~3.0",
+        "symfony/twig-bundle": "~2.0|~3.0",
         "zendframework/zend-mime": "2.1.*"
     },
     "suggest": {

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;
         }
@@ -193,7 +191,7 @@ class Curl
                 if (!isset($url['path'])) {
                     $url['path'] = $lastUrl['path'];
                 }
-                $newUrl = $url['scheme'] . '://' . $url['host'] . $url['path'] . ($url['query'] ? '?' . $url['query'] : '');
+                $newUrl = $url['scheme'].'://'.$url['host'].$url['path'].($url['query'] ? '?'.$url['query'] : '');
                 curl_setopt($this->ch, CURLOPT_URL, $newUrl);
 
                 return $this->execManualRedirect($redirects++);
@@ -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/SoapClient.php

@@ -338,10 +338,10 @@ class SoapClient extends \SoapClient
             $options['typemap'][] = array(
                 'type_name' => $converter->getTypeName(),
                 'type_ns'   => $converter->getTypeNamespace(),
-                'from_xml'  => function($input) use ($converter) {
+                'from_xml'  => function ($input) use ($converter) {
                     return $converter->convertXmlToPhp($input);
                 },
-                'to_xml'    => function($input) use ($converter) {
+                'to_xml'    => function ($input) use ($converter) {
                     return $converter->convertPhpToXml($input);
                 },
             );
@@ -380,4 +380,4 @@ class SoapClient extends \SoapClient
 
         return $cacheFileName;
     }
-}
+}

src/BeSimple/SoapClient/SoapRequest.php

@@ -45,4 +45,4 @@ class SoapRequest extends CommonSoapRequest
 
         return $request;
     }
-}
+}

src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php

@@ -23,8 +23,7 @@ abstract class AbstractWebServerTest extends \PHPUnit_Framework_TestCase
     /**
      * @var ProcessBuilder
      */
-    static protected $webserver;
-    static protected $websererPortLength;
+    protected static $webserver;
 
     public static function setUpBeforeClass()
     {
@@ -44,8 +43,6 @@ abstract class AbstractWebServerTest extends \PHPUnit_Framework_TestCase
 
         self::$webserver->start();
         usleep(100000);
-
-        self::$websererPortLength = strlen(WEBSERVER_PORT);
     }
 
     public static function tearDownAfterClass()

src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentRequest.php

@@ -4,4 +4,4 @@ namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
 
 class AttachmentRequest extends AttachmentType
 {
-}
+}

src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentType.php

@@ -6,4 +6,4 @@ class AttachmentType
 {
     public $fileName;
     public $binaryData;
-}
+}

src/BeSimple/SoapClient/Tests/AxisInterop/TestCase.php

@@ -20,4 +20,4 @@ class TestCase extends \PHPUnit_Framework_TestCase
 
         curl_close($ch);
     }
-}
+}

src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php

@@ -74,7 +74,7 @@ class WsSecurityUserPassAxisInteropTest extends TestCase
         $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecurityUserPass.wsdl', $this->options);
 
         $wssFilter = new BeSimpleWsSecurityFilter(true, 600);
-        $wssFilter->addUserData( 'libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST );
+        $wssFilter->addUserData('libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST);
 
         $soapKernel = $sc->getSoapKernel();
         $soapKernel->registerFilter($wssFilter);

src/BeSimple/SoapClient/Tests/CurlTest.php

@@ -45,19 +45,6 @@ class CurlTest extends AbstractWebserverTest
         $this->assertEquals('Unable to parse URL', $curl->getErrorMessage());
     }
 
-    public function testGetRequestHeaders()
-    {
-        $curl = new Curl(array(
-            'proxy_host' => false,
-        ));
-
-        $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT));
-        $this->assertEquals(132 + self::$websererPortLength, strlen($curl->getRequestHeaders()));
-
-        $curl->exec(sprintf('http://localhost:%s/404.txt', WEBSERVER_PORT));
-        $this->assertEquals(131 + self::$websererPortLength, strlen($curl->getRequestHeaders()));
-    }
-
     public function testGetResponse()
     {
         $curl = new Curl(array(
@@ -66,7 +53,6 @@ class CurlTest extends AbstractWebserverTest
 
         $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT));
         $this->assertSame('OK', $curl->getResponseStatusMessage());
-        $this->assertEquals(145 + self::$websererPortLength, strlen($curl->getResponse()));
 
         $curl->exec(sprintf('http://localhost:%d/404.txt', WEBSERVER_PORT));
         $this->assertSame('Not Found', $curl->getResponseStatusMessage());
@@ -95,19 +81,6 @@ class CurlTest extends AbstractWebserverTest
         $this->assertEquals('text/html; charset=UTF-8', $curl->getResponseContentType());
     }
 
-    public function testGetResponseHeaders()
-    {
-        $curl = new Curl(array(
-            'proxy_host' => false,
-        ));
-
-        $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT));
-        $this->assertEquals(117 + self::$websererPortLength, strlen($curl->getResponseHeaders()));
-
-        $curl->exec(sprintf('http://localhost:%d/404.txt', WEBSERVER_PORT));
-        $this->assertEquals(124 + self::$websererPortLength, strlen($curl->getResponseHeaders()));
-    }
-
     public function testGetResponseStatusCode()
     {
         $curl = new Curl(array(

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentRequest.php

@@ -4,4 +4,4 @@ namespace BeSimple\SoapClient\Tests\ServerInterop\Fixtures;
 
 class AttachmentRequest extends AttachmentType
 {
-}
+}

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentType.php

@@ -6,4 +6,4 @@ class AttachmentType
 {
     public $fileName;
     public $binaryData;
-}
+}

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);
 }
@@ -46,4 +45,4 @@ try {
 //     $sc->__getLastRequest(),
 //     $sc->__getLastResponseHeaders(),
 //     $sc->__getLastResponse()
-// );
+// );

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. :)';
@@ -49,4 +48,4 @@ try {
 //     $sc->__getLastRequest(),
 //     $sc->__getLastResponseHeaders(),
 //     $sc->__getLastResponse()
-// );
+// );

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

@@ -26,4 +26,4 @@ class TestCase extends \PHPUnit_Framework_TestCase
 
         curl_close($ch);
     }
-}
+}

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/ServerInterop/WsSecurityUserPassServerInteropTest.php

@@ -63,7 +63,7 @@ class WsSecurityUserPassServerInteropTest extends TestCase
         $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecurityUserPass.wsdl', $this->options);
 
         $wssFilter = new BeSimpleWsSecurityFilter(true, 600);
-        $wssFilter->addUserData( 'libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST );
+        $wssFilter->addUserData('libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST);
 
         $soapKernel = $sc->getSoapKernel();
         $soapKernel->registerFilter($wssFilter);

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];
         }
 
@@ -344,4 +343,4 @@ class WsAddressingFilter implements SoapRequestFilter, SoapResponseFilter
             }
         }
     }
-}
+}

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 boolean                   $cacheWsdl             Cache constant
+     * @param bool                      $resolveRemoteIncludes WSDL/XSD include enabled?
+     * @param bool                      $cacheWsdl             Cache constant
      */
     public function __construct(Curl $curl, $resolveRemoteIncludes = true, $cacheWsdl = Cache::TYPE_DISK)
     {
-        $this->curl                  = $curl;
-        $this->resolveRemoteIncludes = (Boolean) $resolveRemoteIncludes;
+        $this->curl = $curl;
+        $this->resolveRemoteIncludes = (bool) $resolveRemoteIncludes;
 
         // get current WSDL caching config
         $this->cacheEnabled = $cacheWsdl === Cache::TYPE_NONE ? Cache::DISABLED : Cache::ENABLED == Cache::isEnabled();
@@ -101,19 +101,33 @@ 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 {
                             file_put_contents($cacheFilePath, $response);
                         }
                     } else {
-                        throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '" . $wsdl ."'");
+                        throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '".$wsdl."'");
                     }
                 } elseif (file_exists($wsdl)) {
                     $response = file_get_contents($wsdl);
                     $this->resolveRemoteIncludes($response, $cacheFilePath);
                 } else {
-                    throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '" . $wsdl ."'");
+                    throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '".$wsdl."'");
                 }
             }
 
@@ -122,7 +136,7 @@ class WsdlDownloader
             return realpath($wsdl);
         }
 
-        throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '" . $wsdl ."'");
+        throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '".$wsdl."'");
     }
 
     /**
@@ -130,7 +144,7 @@ class WsdlDownloader
      *
      * @param string $file File URL/path
      *
-     * @return boolean
+     * @return bool
      */
     private function isRemoteFile($file)
     {
@@ -147,11 +161,9 @@ class WsdlDownloader
     /**
      * Resolves remote WSDL/XSD includes within the WSDL files.
      *
-     * @param string  $xml            XML file
-     * @param string  $cacheFilePath  Cache file name
-     * @param boolean $parentFilePath Parent file name
-     *
-     * @return void
+     * @param string $xml            XML file
+     * @param string $cacheFilePath  Cache file name
+     * @param bool   $parentFilePath Parent file name
      */
     private function resolveRemoteIncludes($xml, $cacheFilePath, $parentFilePath = null)
     {
@@ -214,10 +226,10 @@ 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']) )) {
+        } elseif (isset($urlParts['path']) && strrpos($urlParts['path'], '/') === (strlen($urlParts['path']))) {
             // base path is directory
             $path = $urlParts['path'].$relative;
         } elseif (isset($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,33 +79,33 @@ 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/Classmap.php

@@ -90,4 +90,4 @@ class Classmap
             $this->add($type, $classname);
         }
     }
-}
+}

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/TypeConverterCollection.php

@@ -74,10 +74,10 @@ class TypeConverterCollection
             $typemap[] = array(
                 'type_name' => $converter->getTypeName(),
                 'type_ns'   => $converter->getTypeNamespace(),
-                'from_xml'  => function($input) use ($converter) {
+                'from_xml'  => function ($input) use ($converter) {
                     return $converter->convertXmlToPhp($input);
                 },
-                'to_xml'    => function($input) use ($converter) {
+                'to_xml'    => function ($input) use ($converter) {
                     return $converter->convertPhpToXml($input);
                 },
             );

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)
+    public function add($name, $phpType, $nillable = false, $minOccurs = 1)
     {
         if ($phpType instanceof TypeInterface) {
             $phpType = $phpType->getPhpType();
         }
 
-        $this->parts[$name] = new Part($name, $phpType, $nillable);
+        $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>
  */
@@ -66,7 +64,7 @@ class Method
         $this->input->add($name, $type);
     }
 
-    public function setOutput($type)
+    public function setOutput($type, $name = 'return')
     {
         $this->output->add('return', $type);
     }

src/BeSimple/SoapCommon/Definition/Part.php

@@ -20,11 +20,13 @@ class Part
     protected $name;
     protected $type;
     protected $nillable;
+    protected $minOccurs;
 
-    public function __construct($name, $type, $nillable = false)
+    public function __construct($name, $type, $nillable = false, $minOccurs = 1)
     {
         $this->name = $name;
         $this->type = $type;
+        $this->minOccurs = $minOccurs;
         $this->setNillable($nillable);
     }
 
@@ -50,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/FilterHelper.php

@@ -175,4 +175,4 @@ class FilterHelper
             $this->namespaces[$namespaceURI] = $prefix;
         }
     }
-}
+}

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)
         );
     }
 
@@ -218,4 +221,4 @@ class Helper
             return SOAP_1_1;
         }
     }
-}
+}

src/BeSimple/SoapCommon/Mime/MultiPart.php

@@ -172,4 +172,4 @@ class MultiPart extends PartHeader
     {
         return 'urn:uuid:' . Helper::generateUUID();
     }
-}
+}

src/BeSimple/SoapCommon/Mime/Parser.php

@@ -184,4 +184,4 @@ class Parser
         }
         $part->setContent($content);
     }
-}
+}

src/BeSimple/SoapCommon/Mime/Part.php

@@ -166,4 +166,4 @@ class Part extends PartHeader
     {
         return 'urn:uuid:' . Helper::generateUUID();
     }
-}
+}

src/BeSimple/SoapCommon/Mime/PartHeader.php

@@ -143,4 +143,4 @@ abstract class PartHeader
             return $string;
         }
     }
-}
+}

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/SoapRequestFilter.php

@@ -28,4 +28,4 @@ interface SoapRequestFilter
      * @param SoapRequest $request SOAP request
      */
     public function filterRequest(SoapRequest $request);
-}
+}

src/BeSimple/SoapCommon/SoapResponse.php

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

src/BeSimple/SoapCommon/SoapResponseFilter.php

@@ -28,4 +28,4 @@ interface SoapResponseFilter
      * @param SoapResponse $response SOAP response
      */
     public function filterResponse(SoapResponse $response);
-}
+}

src/BeSimple/SoapCommon/Tests/ClassmapTest.php

@@ -78,4 +78,4 @@ class ClassmapTest extends \PHPUnit_Framework_TestCase
         $this->setExpectedException('InvalidArgumentException');
         $classmap1->addClassmap($classmap2);
     }
-}
+}

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/Tests/Converter/TypeConverterCollectionTest.php

@@ -90,4 +90,4 @@ class TypeConverterCollectionTest extends \PHPUnit_Framework_TestCase
         $this->setExpectedException('InvalidArgumentException');
         $converters1->addCollection($converters2);
     }
-}
+}

src/BeSimple/SoapCommon/Tests/Mime/MultiPartTest.php

@@ -131,13 +131,13 @@ class MultiPartTest extends \PHPUnit_Framework_TestCase
         $mp->addPart($p2);
 
         $withoutMain = array(
-            trim($p2->getHeader('Content-ID'),'<>') => $p2,
+            trim($p2->getHeader('Content-ID'), '<>') => $p2,
         );
         $this->assertEquals($withoutMain, $mp->getParts());
 
         $withMain = array(
-            trim($p1->getHeader('Content-ID'),'<>') => $p1,
-            trim($p2->getHeader('Content-ID'),'<>') => $p2,
+            trim($p1->getHeader('Content-ID'), '<>') => $p1,
+            trim($p2->getHeader('Content-ID'), '<>') => $p2,
         );
         $this->assertEquals($withMain, $mp->getParts(true));
     }

src/BeSimple/SoapCommon/Type/KeyValue/BsBoolean.php

@@ -5,7 +5,7 @@ namespace BeSimple\SoapCommon\Type\KeyValue;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 use BeSimple\SoapCommon\Type\AbstractKeyValue;
 
-class Boolean extends AbstractKeyValue
+class BsBoolean extends AbstractKeyValue
 {
     /**
      * @Soap\ComplexType("boolean")

src/BeSimple/SoapCommon/Type/KeyValue/BsFloat.php

@@ -5,7 +5,7 @@ namespace BeSimple\SoapCommon\Type\KeyValue;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 use BeSimple\SoapCommon\Type\AbstractKeyValue;
 
-class Float extends AbstractKeyValue
+class BsFloat extends AbstractKeyValue
 {
     /**
      * @Soap\ComplexType("float")

src/BeSimple/SoapCommon/Type/KeyValue/BsInt.php

@@ -5,7 +5,7 @@ namespace BeSimple\SoapCommon\Type\KeyValue;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 use BeSimple\SoapCommon\Type\AbstractKeyValue;
 
-class Int extends AbstractKeyValue
+class BsInt extends AbstractKeyValue
 {
     /**
      * @Soap\ComplexType("int")

src/BeSimple/SoapCommon/Type/KeyValue/BsString.php

@@ -5,7 +5,7 @@ namespace BeSimple\SoapCommon\Type\KeyValue;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 use BeSimple\SoapCommon\Type\AbstractKeyValue;
 
-class String extends AbstractKeyValue
+class BsString extends AbstractKeyValue
 {
     /**
      * @Soap\ComplexType("string")

src/BeSimple/SoapCommon/WsSecurityFilterClientServer.php

@@ -30,7 +30,7 @@ abstract class WsSecurityFilterClientServer
     /**
      * The date format to be used with {@link \DateTime}
      */
-    const DATETIME_FORMAT = 'Y-m-d\TH:i:s.000\Z';
+    const DATETIME_FORMAT = 'Y-m-d\TH:i:s.u\Z';
 
     /**
      * (X509 3.2.1) Reference to a Subject Key Identifier
@@ -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/SoapCommon/WsSecurityKey.php

@@ -113,4 +113,4 @@ class WsSecurityKey
     {
         return null !== $this->publicKey;
     }
-}
+}

src/BeSimple/SoapCommon/composer.json

@@ -25,8 +25,7 @@
         "ass/xmlsecurity": "~1.0"
     },
     "require-dev": {
-        "ext-mcrypt": "*",
-        "mikey179/vfsStream": "~1.0"
+        "mikey179/vfsstream": "~1.0"
     },
     "autoload": {
         "psr-0": { "BeSimple\\SoapCommon": "" }

src/BeSimple/SoapServer/SoapRequest.php

@@ -62,7 +62,7 @@ class SoapRequest extends CommonSoapRequest
         } else {
             $url .= 'http://';
         }
-        $url .= isset( $_SERVER['SERVER_NAME'] ) ? $_SERVER['SERVER_NAME'] : '';
+        $url .= isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
         if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80) {
             $url .= ":{$_SERVER['SERVER_PORT']}";
         }

src/BeSimple/SoapServer/SoapServer.php

@@ -131,9 +131,7 @@ class SoapServer extends \SoapServer
     /**
      * Configure filter and type converter for SwA/MTOM.
      *
-     * @param array &$options SOAP constructor options array.
-     *
-     * @return void
+     * @param array &$options SOAP constructor options array
      */
     private function configureMime(array &$options)
     {
@@ -157,11 +155,11 @@ class SoapServer extends \SoapServer
             }
             $options['typemap'][] = array(
                 'type_name' => $converter->getTypeName(),
-                'type_ns'   => $converter->getTypeNamespace(),
-                'from_xml'  => function($input) use ($converter) {
+                'type_ns' => $converter->getTypeNamespace(),
+                'from_xml' => function ($input) use ($converter) {
                     return $converter->convertXmlToPhp($input);
                 },
-                'to_xml'    => function($input) use ($converter) {
+                'to_xml' => function ($input) use ($converter) {
                     return $converter->convertPhpToXml($input);
                 },
             );

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);
@@ -197,4 +197,4 @@ class SoapServerBuilder extends AbstractSoapBuilder
             throw new \InvalidArgumentException('The handler has to be configured!');
         }
     }
-}
+}

src/BeSimple/SoapServer/WsSecurityFilter.php

@@ -86,7 +86,7 @@ class WsSecurityFilter extends WsSecurityFilterClientServer implements SoapReque
             $expires = $xpath->query($query, $security)->item(0);
 
             if (null !== $expires) {
-                $expiresDatetime = \DateTime::createFromFormat(self::DATETIME_FORMAT, $expires->textContent, new \DateTimeZone('UTC'));
+                $expiresDatetime = \DateTime::createFromFormat(static::DATETIME_FORMAT, $expires->textContent, new \DateTimeZone('UTC'));
                 $currentDatetime = new \DateTime('now', new \DateTimeZone('UTC'));
 
                 if ($currentDatetime > $expiresDatetime) {
@@ -170,7 +170,7 @@ class WsSecurityFilter extends WsSecurityFilterClientServer implements SoapReque
 
         // init timestamp
         $dt = new \DateTime('now', new \DateTimeZone('UTC'));
-        $createdTimestamp = $dt->format(self::DATETIME_FORMAT);
+        $createdTimestamp = $dt->format(static::DATETIME_FORMAT);
 
         // create security header
         $security = $filterHelper->createElement(Helper::NS_WSS, 'Security');
@@ -182,7 +182,7 @@ class WsSecurityFilter extends WsSecurityFilterClientServer implements SoapReque
             $timestamp->appendChild($created);
             if (null !== $this->expires) {
                 $dt->modify('+' . $this->expires . ' seconds');
-                $expiresTimestamp = $dt->format(self::DATETIME_FORMAT);
+                $expiresTimestamp = $dt->format(static::DATETIME_FORMAT);
                 $expires = $filterHelper->createElement(Helper::NS_WSU, 'Expires', $expiresTimestamp);
                 $timestamp->appendChild($expires);
             }