.gitignore

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

.travis.yml

@@ -1,19 +1,19 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+  - 5.3
+  - 5.4
+  - 5.5
 
 env:
-  - SYMFONY_VERSION=2.8.*
-  - SYMFONY_VERSION="dev-master symfony/debug:~2.8@dev symfony/http-kernel:~2.8@dev"
+  - SYMFONY_VERSION=2.0.*
+  - SYMFONY_VERSION=2.1.*
+  - SYMFONY_VERSION=2.2.*
+  - SYMFONY_VERSION=2.3.*
+  - SYMFONY_VERSION=dev-master
 
 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
+  - composer require symfony/http-foundation:${SYMFONY_VERSION} --no-interaction --prefer-source
   - ./src/BeSimple/SoapClient/Tests/bin/phpwebserver.sh
   - ./src/BeSimple/SoapClient/Tests/bin/axis.sh
 
@@ -22,4 +22,4 @@ script:
 
 matrix:
   allow_failures:
-    - env: SYMFONY_VERSION="dev-master symfony/debug:~2.8@dev symfony/http-kernel:~2.8@dev"
+    - env: SYMFONY_VERSION=dev-master

README.md

@@ -1,146 +1,56 @@
-# BeSimpleSoap (Symfony 3.4 / 4.x)
+# BeSimpleSoap
 
-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.
+Build SOAP and WSDL based web services
 
 # 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
 
-**Refactored** BeSimpleSoapClient is a component that extends the native PHP SoapClient with further features like SwA and WS-Security.
-
-## BeSimpleSoapServer
-
-**Refactored** BeSimpleSoapServer is a component that extends the native PHP SoapServer with further features like SwA and WS-Security.
+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
 
-**Refactored** BeSimpleSoapCommon component contains functionality shared by both the server and client implementations.
+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).
+
+
+## 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).
 
 ## BeSimpleSoapWsdl
 
-**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).
+For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapWsdl/README.md).
 
-## BeSimpleSoapBundle
+# Installation
 
-**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!* 
+If you do not yet have composer, install it like this:
 
-# 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
+```sh
+curl -s http://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin
 ```
 
-### Something wrong?!
+Create a `composer.json` file:
 
-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)
+```json
 {
-    $response = new DummyServiceResponse();
-    $response->status = true;
-
-    return $response;
+    "require": {
+        "besimple/soap": "0.2.*@dev"
+    }
 }
 ```
 
-For further information and getting inspiration for your implementation, see the unit tests in ``tests`` dir.
+Now you are ready to install the library:
+
+```sh
+php /usr/local/bin/composer.phar install
+```

composer.json

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

src/BeSimple/SoapBundle/.gitignore

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

src/BeSimple/SoapBundle/Cache.php

@@ -25,6 +25,7 @@ class Cache
 
         BaseCache::setEnabled($isEnabled);
 
+        if (BaseCache::ENABLED == BaseCache::isEnabled()) {
             BaseCache::setType($type);
             BaseCache::setDirectory($directory);
 
@@ -37,3 +38,4 @@ class Cache
             }
         }
     }
+}

src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php

@@ -15,26 +15,20 @@ 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\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Debug\Exception\FlattenException;
+use Symfony\Component\HttpKernel\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 implements ContainerAwareInterface
+class SoapWebServiceController extends ContainerAware
 {
-    use ContainerAwareTrait;
-
     /**
      * @var \SoapServer
      */
@@ -58,19 +52,18 @@ class SoapWebServiceController implements ContainerAwareInterface
     /**
      * @var array
      */
-    private $headers = [];
+    private $headers = array();
 
     /**
      * @return \BeSimple\SoapBundle\Soap\SoapResponse
      */
     public function callAction($webservice)
     {
-        /** @var WebServiceContext $webServiceContext */
         $webServiceContext   = $this->getWebServiceContext($webservice);
 
         $this->serviceBinder = $webServiceContext->getServiceBinder();
 
-        $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request_stack')->getCurrentRequest());
+        $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request'));
         $this->soapServer  = $webServiceContext
             ->getServerBuilder()
             ->withSoapVersion11()
@@ -89,29 +82,21 @@ class SoapWebServiceController implements ContainerAwareInterface
     }
 
     /**
-     * @return Response
+     * @return Symfony\Component\HttpFoundation\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(
-                $routeName,
-                ['webservice' => $webservice],
-                UrlGeneratorInterface::ABSOLUTE_URL
+                '_webservice_call',
+                array('webservice' => $webservice),
+                true
             )
         ));
 
-        /** @var Request $request */
-        $request = $this->container->get('request_stack')->getCurrentRequest();
-        $query = $request->query;
-        if ($query->has('wsdl') || $query->has('WSDL')) {
-            $request->setRequestFormat('wsdl');
+        $query = $this->container->get('request')->query;
+        if (!$query->has('wsdl') && !$query->has('WSDL')) {
+            $this->container->get('request')->setRequestFormat('xml');
         }
 
         return $response;
@@ -134,39 +119,25 @@ class SoapWebServiceController implements ContainerAwareInterface
             throw new \LogicException(sprintf('The parameter "%s" is required in Request::$query parameter bag to generate the SoapFault.', '_besimple_soap_webservice'), null, $e);
         }
 
-        $view = '@Twig/Exception/'.($this->container->get('kernel')->isDebug() ? 'exception' : 'error').'.txt.twig';
+        $view = 'TwigBundle:Exception:'.($this->container->get('kernel')->isDebug() ? 'exception' : 'error').'.txt.twig';
         $code = $exception->getStatusCode();
-        $details = $this->container->get('twig')->render($view, [
+        $details = $this->container->get('templating')->render($view, array(
             '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')) {
-            $handler->setSoapFault($soapFault);
-
-            // Remove parameter from query because cannot be Serialized in Logger
-            $request->query->remove('_besimple_soap_fault');
-        }
-
-        $server = SoapServerBuilder::createWithDefaults()
-            ->withWsdl(__DIR__.'/../Handler/wsdl/exception.wsdl')
-            ->withWsdlCacheNone()
-            ->withHandler($handler)
+        $server = $this
+            ->container
+            ->get(sprintf('besimple.soap.context.%s', $webservice))
+            ->getServerBuilder()
+            ->withHandler(new ExceptionHandler($exception, $details))
             ->build()
         ;
 
         ob_start();
-        $server->handle(
-            '<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://besim.pl/soap/exception/1.0/">'.
-               '<soapenv:Header/>'.
-               '<soapenv:Body>'.
-                  '<ns:exception />'.
-               '</soapenv:Body>'.
-            '</soapenv:Envelope>'
-        );
+        $server->handle($request->getContent());
 
         return new Response(ob_get_clean());
     }
@@ -233,7 +204,7 @@ class SoapWebServiceController implements ContainerAwareInterface
     }
 
     /**
-     * Set the SoapResponse.
+     * Set the SoapResponse
      *
      * @param Response $response A response to check and set
      *
@@ -250,7 +221,7 @@ class SoapWebServiceController implements ContainerAwareInterface
         return $this->soapResponse = $response;
     }
 
-    protected function getWebServiceContext($webservice)
+    private function getWebServiceContext($webservice)
     {
         $context = sprintf('besimple.soap.context.%s', $webservice);
 

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

src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php

@@ -17,11 +17,10 @@ use BeSimple\SoapCommon\Cache;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * BeSimpleSoapExtension.
@@ -81,14 +80,10 @@ class BeSimpleSoapExtension extends Extension
 
     private function registerClientConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
-        if (3 === Kernel::MAJOR_VERSION) {
-            $loader->load('client3.xml');
-        } else {
         $loader->load('client.xml');
-        }
 
         foreach ($config as $client => $options) {
-            $definition = new ChildDefinition('besimple.soap.client.builder');
+            $definition = new DefinitionDecorator('besimple.soap.client.builder');
             $container->setDefinition(sprintf('besimple.soap.client.builder.%s', $client), $definition);
 
             $definition->replaceArgument(0, $options['wsdl']);
@@ -103,31 +98,18 @@ class BeSimpleSoapExtension extends Extension
                 }
             }
 
-            $proxy = $options['proxy'];
-            if (false !== $proxy['host']) {
-                if (null !== $proxy['auth']) {
-                    if ('basic' === $proxy['auth']) {
-                        $proxy['auth'] = \CURLAUTH_BASIC;
-                    } elseif ('ntlm' === $proxy['auth']) {
-                        $proxy['auth'] = \CURLAUTH_NTLM;
-                    }
-                }
-
-                $definition->addMethodCall('withProxy', array(
-                    $proxy['host'], $proxy['port'],
-                    $proxy['login'], $proxy['password'],
-                    $proxy['auth']
-                ));
-            }
-
             if (isset($defOptions['cache_type'])) {
                 $defOptions['cache_type'] = $this->getCacheType($defOptions['cache_type']);
             }
 
             $definition->replaceArgument(1, $defOptions);
 
+            if (!empty($options['classmap'])) {
                 $classmap = $this->createClientClassmap($client, $options['classmap'], $container);
                 $definition->replaceArgument(2, new Reference($classmap));
+            } else {
+                $definition->replaceArgument(2, null);
+            }
 
             $this->createClient($client, $container);
         }
@@ -135,33 +117,23 @@ class BeSimpleSoapExtension extends Extension
 
     private function createClientClassmap($client, array $classmap, ContainerBuilder $container)
     {
-        $definition = new ChildDefinition('besimple.soap.classmap');
+        $definition = new DefinitionDecorator('besimple.soap.classmap');
         $container->setDefinition(sprintf('besimple.soap.classmap.%s', $client), $definition);
 
-        if (!empty($classmap)) {
         $definition->setMethodCalls(array(
             array('set', array($classmap)),
         ));
-        }
 
         return sprintf('besimple.soap.classmap.%s', $client);
     }
 
     private function createClient($client, ContainerBuilder $container)
     {
-        $definition = new ChildDefinition('besimple.soap.client');
+        $definition = new DefinitionDecorator('besimple.soap.client');
         $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
 
-        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)
     {
@@ -169,7 +141,7 @@ class BeSimpleSoapExtension extends Extension
         unset($config['binding']);
 
         $contextId  = 'besimple.soap.context.'.$config['name'];
-        $definition = new ChildDefinition('besimple.soap.context.'.$bindingSuffix);
+        $definition = new DefinitionDecorator('besimple.soap.context.'.$bindingSuffix);
         $container->setDefinition($contextId, $definition);
 
         if (isset($config['cache_type'])) {
@@ -178,7 +150,6 @@ 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

@@ -24,7 +24,6 @@ use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 class Configuration
 {
     private $cacheTypes = array('none', 'disk', 'memory', 'disk_memory');
-    private $proxyAuth = array('basic', 'ntlm');
 
     /**
      * Generates the configuration tree.
@@ -86,37 +85,12 @@ class Configuration
                                 ->scalarNode('cache_type')
                                     ->validate()
                                         ->ifNotInArray($this->cacheTypes)
-                                        ->thenInvalid(sprintf('The cache type has to be either: %s', implode(', ', $this->cacheTypes)))
+                                        ->thenInvalid(sprintf('The cache type has to be either %s', implode(', ', $this->cacheTypes)))
                                     ->end()
                                 ->end()
                                 ->arrayNode('classmap')
                                     ->useAttributeAsKey('name')->prototype('scalar')->end()
                                 ->end()
-                                ->arrayNode('proxy')
-                                    ->info('proxy configuration')
-                                    ->addDefaultsIfNotSet()
-                                    ->beforeNormalization()
-                                        ->ifTrue(function ($v) {
-                                            return !is_array($v);
-                                        })
-                                        ->then(function ($v) {
-                                            return array('host' => null === $v ? false : $v);
-                                        })
-                                    ->end()
-                                    ->children()
-                                        ->scalarNode('host')->defaultFalse()->end()
-                                        ->scalarNode('port')->defaultValue(3128)->end()
-                                        ->scalarNode('login')->defaultNull()->end()
-                                        ->scalarNode('password')->defaultNull()->end()
-                                        ->scalarNode('auth')
-                                            ->defaultNull()
-                                            ->validate()
-                                                ->ifNotInArray($this->proxyAuth)
-                                                ->thenInvalid(sprintf('The proxy auth has to be either: %s', implode(', ', $this->proxyAuth)))
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                ->end()
                             ->end()
                         ->end()
                     ->end()

src/BeSimple/SoapBundle/EventListener/SoapExceptionListener.php

@@ -51,9 +51,7 @@ class SoapExceptionListener extends ExceptionListener
         }
 
         $request = $event->getRequest();
-        if (!in_array($request->getRequestFormat(), array('soap', 'xml'))) {
-            return;
-        } elseif ('xml' === $request->getRequestFormat() && '_webservice_call' !== $request->attributes->get('_route')) {
+        if ('soap' !== $request->getRequestFormat()) {
             return;
         }
 
@@ -69,18 +67,12 @@ class SoapExceptionListener extends ExceptionListener
         // hack to retrieve the current WebService name in the controller
         $request->query->set('_besimple_soap_webservice', $webservice);
 
-        $exception = $event->getException();
-        if ($exception instanceof \SoapFault) {
-            $request->query->set('_besimple_soap_fault', $exception);
-        }
-
         parent::onKernelException($event);
     }
 
     public static function getSubscribedEvents()
     {
         return array(
-            // Must be called before ExceptionListener of HttpKernel component
             KernelEvents::EXCEPTION => array('onKernelException', -64),
         );
     }

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>
@@ -23,7 +23,6 @@ class ExceptionHandler
 {
     protected $exception;
     protected $details;
-    protected $soapFault;
 
     public function __construct(FlattenException $exception, $details = null)
     {
@@ -31,17 +30,8 @@ class ExceptionHandler
         $this->details = $details;
     }
 
-    public function setSoapFault(\SoapFault $soapFault)
-    {
-        $this->soapFault = $soapFault;
-    }
-
     public function __call($method, $arguments)
     {
-        if (isset($this->soapFault)) {
-            throw $this->soapFault;
-        }
-
         $code = $this->exception->getStatusCode();
 
         throw new ReceiverSoapFault(

src/BeSimple/SoapBundle/Handler/wsdl/exception.wsdl

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://besim.pl/soap/exception/1.0/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Exception" targetNamespace="http://besim.pl/soap/exception/1.0/">
-
-  <portType name="ExceptionPortType">
-    <operation name="exception">
-      <input message="tns:empty"/>
-      <output message="tns:empty"/>
-    </operation>
-  </portType>
-
-  <message name="empty" />
-
-  <binding name="ExceptionBinding" type="tns:ExceptionPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-    <operation name="exception">
-      <soap:operation soapAction="http://besim.pl/soap/exception/1.0/exception"/>
-      <input>
-        <soap:body use="literal" namespace="http://besim.pl/soap/exception/1.0/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="http://besim.pl/soap/exception/1.0/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-  </binding>
-
-  <service name="ExceptionService">
-    <port name="ExceptionPort" binding="tns:ExceptionBinding">
-      <soap:address location="http://localhost/soap/Exception"/>
-    </port>
-  </service>
-</definitions>

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

@@ -16,12 +16,9 @@
             </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.client" factory-service="besimple.soap.client.builder" factory-method="build" class="%besimple.soap.client.builder.class%" abstract="true" />
 
         <service id="besimple.soap.classmap" class="%besimple.soap.classmap.class%" abstract="true" />
     </services>

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

@@ -1,29 +0,0 @@
-<?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

@@ -4,13 +4,15 @@
     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" path="/{webservice}" methods="POST">
+    <route id="_webservice_call" pattern="/{webservice}">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Call</default>
-        <default key="_format">xml</default>
+        <default key="_format">soap</default>
+        <requirement key="_method">POST</requirement>
     </route>
 
-    <route id="_webservice_definition" path="/{webservice}" methods="GET">
+    <route id="_webservice_definition" pattern="/{webservice}">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Definition</default>
-        <default key="_format">xml</default>
+        <default key="_format">wsdl</default>
+        <requirement key="_method">GET</requirement>
     </route>
 </routes>

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

@@ -12,7 +12,7 @@
         <service id="besimple.soap.cache" class="%besimple.soap.cache.class%">
             <argument>%kernel.debug%</argument>
             <argument>%besimple.soap.cache.type%</argument>
-            <argument>%besimple.soap.cache.dir%/cache</argument>
+            <argument>%besimple.soap.cache.dir%/php</argument>
             <argument>%besimple.soap.cache.lifetime%</argument>
             <argument>%besimple.soap.cache.limit%</argument>
         </service>

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

@@ -19,7 +19,7 @@
     </parameters>
 
     <services>
-        <service id="besimple.soap.response" class="%besimple.soap.response.class%" public="true" />
+        <service id="besimple.soap.response" class="%besimple.soap.response.class%" />
 
         <service id="besimple.soap.response.listener" class="%besimple.soap.response.listener.class%">
             <tag name="kernel.event_listener" event="kernel.view" method="onKernelView" />
@@ -44,7 +44,6 @@
                 <argument key="binder_request_header_class">%besimple.soap.binder.request_header.rpcliteral.class%</argument>
                 <argument key="binder_request_class">%besimple.soap.binder.request.rpcliteral.class%</argument>
                 <argument key="binder_response_class">%besimple.soap.binder.response.rpcliteral.class%</argument>
-                <argument key="wsdl_stylesheet">%besimple.soap.definition.dumper.options.stylesheet%</argument>
             </argument>
             <argument type="service" id="besimple.soap.cache" />
         </service>
@@ -59,7 +58,6 @@
                 <argument key="binder_request_header_class">%besimple.soap.binder.request_header.documentwrapped.class%</argument>
                 <argument key="binder_request_class">%besimple.soap.binder.request.documentwrapped.class%</argument>
                 <argument key="binder_response_class">%besimple.soap.binder.response.documentwrapped.class%</argument>
-                <argument key="wsdl_stylesheet">%besimple.soap.definition.dumper.options.stylesheet%</argument>
             </argument>
             <argument type="service" id="besimple.soap.cache" />
         </service>
@@ -96,14 +94,6 @@
                 <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/Resources/doc/index.rst

@@ -33,8 +33,4 @@ SoapServer
 SoapClient
 ----------
 
-.. toctree::
-    :maxdepth: 1
-    :numbered:
-
-    soapclient/configuration
+Coming soon.

src/BeSimple/SoapBundle/Resources/doc/soapclient/configuration.rst

@@ -1,158 +0,0 @@
-Configuration
-=============
-
-Client configuration
---------------------
-
-Configure your first client in your config file:
-
-.. code-block:: yaml
-
-    # app/config/config.yml
-    be_simple_soap:
-        clients:
-            DemoApi:
-                # required
-                wsdl: http://localhost/app_dev.php/ws/DemoApi?wsdl
-
-                # classmap (optional)
-                classmap:
-                    type_name: "Full\Class\Name"
-
-                # proxy (optional)
-                proxy:
-                    host:     proxy.domain.name # required to enable proxy configuration
-                    port:     3128
-                    login:    ~
-                    password: ~
-                    auth:     ~ # can be 'basic' or 'ntlm'
-
-Using client
-------------
-
-.. code-block:: php
-
-    namespace Acme\DemoBundle\Controller;
-
-    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-
-    class DemoController extends Controller
-    {
-        public function helloAction($name)
-        {
-            // The client service name is `besimple.soap.client.demoapi`:
-            // `besimple.soap.client.`: is the base name of your client
-            // `demoapi`: is the name specified in your config file converted to lowercase
-            $client = $this->container->get('besimple.soap.client.demoapi');
-
-            // call `hello` method on WebService with the string parameter `$name`
-            $helloResult = $client->hello($name);
-
-            return $this->render('AcmeDemoBundle:Demo:hello.html.twig', array(
-                'hello' => $helloResult,
-            ));
-        }
-    }
-
-Classmap
---------
-
-Configuration
-~~~~~~~~~~~~~
-
-.. code-block:: yaml
-
-    # app/config/config.yml
-    be_simple_soap:
-        clients:
-            DemoApi:
-                # ...
-                classmap:
-                    User: Acme\DemoBundle\Api\UserApi
-                    # add other type_name: classname
-
-UserApi class
-~~~~~~~~~~~~~
-
-.. code-block:: php
-
-    namespace Acme\DemoBundle\Api;
-
-    class UserApi
-    {
-        private $username;
-
-        private $firstname;
-
-        private $lastname;
-
-        public function __construct($username)
-        {
-            $this->username = $username;
-        }
-
-        public function getFirstname()
-        {
-            return $this->firstname;
-        }
-
-        public function getLastname()
-        {
-            return $this->lastname;
-        }
-    }
-
-Usage
-~~~~~
-
-.. code-block:: php
-
-    namespace Acme\DemoBundle\Controller;
-
-    use Acme\DemoBundle\Api\UserApi;
-    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-
-    class DemoController extends Controller
-    {
-        public function userAction($username)
-        {
-            // The client service name is `besimple.soap.client.demoapi`:
-            // `besimple.soap.client.`: is the base name of your client
-            // `demoapi`: is the name specified in your config file converted to lowercase
-            $client = $this->container->get('besimple.soap.client.demoapi');
-
-            // call `getUser` method on WebService with an instance of UserApi
-            // if the `getUserByUsername` method return a `User` type then `$userResult` is an instance of UserApi
-            $userResult = $client->getUserByUsername($username);
-
-            return $this->render('AcmeDemoBundle:Demo:user.html.twig', array(
-                'user' => $userResult,
-            ));
-        }
-    }
-
-Without classmap configuration the `$userResult` is an instance of `stdClass`:
-
-.. code-block:: text
-
-    object(stdClass)#5561 (3) {
-      ["username"]=>
-      string(6) "FooBar"
-      ["firstname"]=>
-      string(3) "Foo"
-      ["lastname"]=>
-      string(3) "Bar"
-    }
-
-With classmap configuration the `$userResult` is an instance of `Acme\DemoBundle\Api\UserApi`:
-
-.. code-block:: text
-
-    object(Acme\DemoBundle\Api\UserApi)#208 (3) {
-      ["username":"Acme\DemoBundle\Api\UserApi":private]=>
-      string(6) "FooBar"
-      ["firstname":"Acme\DemoBundle\Api\UserApi":private]=>
-      string(3) "Foo"
-      ["lastname":"Acme\DemoBundle\Api\UserApi":private]=>
-      string(3) "Bar"
-    }

src/BeSimple/SoapBundle/Resources/doc/soapserver/tutorial/associative_array.rst

@@ -47,9 +47,9 @@ Controller
         /**
          * @Soap\Method("sendAssocArray")
          * @Soap\Param("assocArray", phpType = "BeSimple\SoapCommon\Type\KeyValue\String[]")
-         * @Soap\Result(phpType = "BeSimple\SoapCommon\Type\KeyValue\String[]")
+         * @Soap\Return(phpType = "BeSimple\SoapCommon\Type\KeyValue\String[]")
          */
-        public function sendAssocArrayOfStringAction(array $assocArray)
+        public function assocArrayOfStringAction(array $assocArray)
         {
             // The $assocArray it's a real associative array
             // var_dump($assocArray);die;
@@ -97,4 +97,3 @@ How to create my Associative Array?
                 'user2' => new User('user2', 'user2@user.com'),
             );
         }
-    }

src/BeSimple/SoapBundle/Resources/doc/soapserver/tutorial/complex_type.rst

@@ -86,16 +86,6 @@ You can expose only the properties (public, protected or private) of a complex t
          */
         private $newsletter;
 
-        /**
-         * @Soap\ComplexType("date")
-         */
-        private $createdAt:
-
-        /**
-         * @Soap\ComplexType("datetime")
-         */
-        private $updatedAt;
-
         public function getId()
         {
             return $this->id;
@@ -138,27 +128,7 @@ You can expose only the properties (public, protected or private) of a complex t
 
         public function setNewsletter($newsletter)
         {
-            $this->newletter = (Boolean) $newsletter;
-        }
-
-        public function getCreatedAt()
-        {
-            return $this->createdAt;
-        }
-
-        public function setCreatedAt(\DateTime $createdAt)
-        {
-            $this->createdAt = $createdAt;
-        }
-
-        public function getUpdatedAt()
-        {
-            return this->updatedAt;
-        }
-
-        public function setUpdatedAt(\DateTime $updatedAt)
-        {
-            $this->updatedAt = $updatedAt;
+            $this->newletter = (Boolean) $newsletter
         }
     }
 

src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedRequestHeaderMessageBinder.php

@@ -1,33 +0,0 @@
-<?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,14 +11,13 @@
 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, TypeRepository $typeRepository)
+    public function processMessage(Method $messageDefinition, $message)
     {
         if(count($message) > 1) {
             throw new \InvalidArgumentException();
@@ -27,8 +26,8 @@ class DocumentLiteralWrappedRequestMessageBinder implements MessageBinderInterfa
         $result  = array();
         $message = $message[0];
 
-        foreach ($messageDefinition->getInput()->all() as $argument) {
-            $result[$argument->getName()] = $message;
+        foreach($messageDefinition->getArguments() as $argument) {
+            $result[$argument->getName()] = $message->{$argument->getName()};
         }
 
         return $result;

src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedResponseMessageBinder.php

@@ -11,15 +11,17 @@
 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, TypeRepository $typeRepository)
+    public function processMessage(Method $messageDefinition, $message)
     {
-        return $message;
+        $result = new \stdClass();
+        $result->{$messageDefinition->getName().'Result'} = $message;
+
+        return $result;
     }
 }

src/BeSimple/SoapBundle/ServiceBinding/MessageBinderInterface.php

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

src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestMessageBinder.php

@@ -112,8 +112,9 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
                 $value = $this->processType($type->getType(), $value);
 
                 $messageBinder->writeProperty($property, $value);
-            } elseif (!$type->isNillable()) {
-                // @TODO use xmlType instead of phpType
+            }
+
+            if (!$type->isNillable() && null === $value) {
                 throw new \SoapFault('SOAP_ERROR_COMPLEX_TYPE', sprintf('"%s:%s" cannot be null.', ucfirst($phpType), $type->getName()));
             }
         }

src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralResponseMessageBinder.php

@@ -32,10 +32,7 @@ class RpcLiteralResponseMessageBinder implements MessageBinderInterface
     {
         $this->typeRepository = $typeRepository;
 
-        $parts = $messageDefinition->getOutput()->all();
-        $part = array_shift($parts);
-
-        return $this->processType($part->getType(), $message);
+        return $this->processType($messageDefinition->getOutput()->get('return')->getType(), $message);
     }
 
     private function processType($phpType, $message)
@@ -88,7 +85,7 @@ class RpcLiteralResponseMessageBinder implements MessageBinderInterface
         $this->messageRefs[$hash] = $message;
 
         if (!$message instanceof $phpType) {
-            throw new \InvalidArgumentException(sprintf('The instance class must be "%s", "%s" given.', $phpType, get_class($message)));
+            throw new \InvalidArgumentException(sprintf('The instance class must be "%s", "%s" given.', get_class($message), $phpType));
         }
 
         $messageBinder = new MessageBinder($message);

src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php

@@ -44,8 +44,7 @@ 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,6 @@ class ComplexType extends Configuration
     private $name;
     private $value;
     private $isNillable = false;
-    private $minOccurs = 1;
 
     public function getName()
     {
@@ -35,11 +34,6 @@ class ComplexType extends Configuration
         return $this->isNillable;
     }
 
-    public function getIsNillable()
-    {
-        return $this->isNillable;
-    }
-
     public function setName($name)
     {
         $this->name = $name;
@@ -55,21 +49,6 @@ 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
      */
-    public function getAliasName();
+    function getAliasName();
 }

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

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

src/BeSimple/SoapBundle/ServiceDefinition/ComplexType.php

@@ -20,7 +20,6 @@ class ComplexType
     private $name;
     private $value;
     private $isNillable = false;
-    private $minOccurs = 1;
 
     public function getName()
     {
@@ -51,14 +50,4 @@ 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

@@ -88,6 +88,7 @@ class AnnotationClassLoader extends Loader
 
                     $serviceMethod = new Definition\Method(
                         $annotation->getValue(),
+                        $this->typeRepository,
                         $this->getController($class, $method, $annotation)
                     );
                 } elseif ($annotation instanceof Annotation\Result) {
@@ -96,7 +97,6 @@ class AnnotationClassLoader extends Loader
                     }
 
                     $serviceReturn = $annotation->getPhpType();
-                    $serviceXmlReturn = $annotation->getXmlType();
                 }
             }
 
@@ -117,11 +117,7 @@ class AnnotationClassLoader extends Loader
                     throw new \LogicException(sprintf('@Soap\Result non-existent for "%s".', $method->getName()));
                 }
 
-                if (!isset($serviceXmlReturn) || !$serviceXmlReturn) {
-                    $serviceXmlReturn = 'return';
-                }
-
-                $serviceMethod->setOutput($this->loadType($serviceReturn), $serviceXmlReturn);
+                $serviceMethod->setOutput($this->loadType($serviceReturn));
 
                 $definition->addMethod($serviceMethod);
             }
@@ -160,7 +156,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->getMinOccurs());
+                $complexType->add($name, $this->loadType($property->getValue()), $property->isNillable());
             }
 
             $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 = [];
+        $annotations = array();
 
         $class = new \ReflectionClass($class);
         if ($alias = $this->reader->getClassAnnotation($class, $this->aliasClass)) {
@@ -59,7 +59,6 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
                 $propertyComplexType->setValue($complexType->getValue());
                 $propertyComplexType->setNillable($complexType->isNillable());
                 $propertyComplexType->setName($property->getName());
-                $propertyComplexType->setMinOccurs($complexType->getMinOccurs());
                 $annotations['properties']->add($propertyComplexType);
             }
         }
@@ -73,7 +72,7 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return bool True if this class supports the given resource, false otherwise
+     * @return Boolean True if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null)
     {

src/BeSimple/SoapBundle/ServiceDefinition/Method.php

@@ -23,9 +23,9 @@ class Method extends BaseMethod
 {
     private $controller;
 
-    public function __construct($name, $controller)
+    public function __construct($name, TypeRepository $typeRepository, $controller)
     {
-        parent::__construct($name);
+        parent::__construct($name, $typeRepository);
 
         $this->controller = $controller;
     }

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 Laminas\Mime\Message;
+use Zend\Mime\Message;
 
 /**
  * SoapRequest.

src/BeSimple/SoapBundle/Tests/ServiceBinding/RpcLiteralRequestMessageBinderTest.php

@@ -16,70 +16,66 @@ use BeSimple\SoapBundle\ServiceBinding\RpcLiteralRequestMessageBinder;
 use BeSimple\SoapBundle\ServiceDefinition as Definition;
 use BeSimple\SoapBundle\Tests\fixtures\ServiceBinding as Fixtures;
 use BeSimple\SoapBundle\Util\Collection;
-use BeSimple\SoapCommon\Definition\Type\ComplexType;
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 
 class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider messageProvider
      */
-    public function testProcessMessage(Definition\Method $method, array $message, array $assert)
+    public function testProcessMessage(Definition\Method $method, $message, $assert)
     {
         $messageBinder = new RpcLiteralRequestMessageBinder();
-        $result        = $messageBinder->processMessage($method, $message, $this->getTypeRepository());
+        $result        = $messageBinder->processMessage($method, $message);
 
         $this->assertSame($assert, $result);
     }
 
     public function testProcessMessageWithComplexType()
     {
-        $typeRepository = $this->addComplexTypes($this->getTypeRepository());
         $messageBinder = new RpcLiteralRequestMessageBinder();
 
-        $method = new Definition\Method('complextype_argument', null);
-        $method->addInput('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo');
-
         $foo    = new Fixtures\Foo('foobar', 19395);
         $result = $messageBinder->processMessage(
-            $method,
+            new Definition\Method('complextype_argument', null, array(), array(
+                new Definition\Argument('foo', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo')),
+            )),
             array($foo),
-            $typeRepository
+            $this->getDefinitionComplexTypes()
         );
 
         $this->assertEquals(array('foo' => $foo), $result);
 
+
         $foo1 = new Fixtures\Foo('foobar', 29291);
         $foo2 = new Fixtures\Foo('barfoo', 39392);
         $foos = new \stdClass();
         $foos->item = array($foo1, $foo2);
 
-        $method = new Definition\Method('complextype_argument', null);
-        $method->addInput('foos', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]');
-
         $result = $messageBinder->processMessage(
-            $method,
+            new Definition\Method('complextype_argument', null, array(), array(
+                new Definition\Argument('foos', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]')),
+            )),
             array($foos),
-            $typeRepository
+            $this->getDefinitionComplexTypes()
         );
 
         $this->assertEquals(array('foos' => array($foo1, $foo2)), $result);
     }
 
+    /**
+     * @expectedException SoapFault
+     */
     public function testProcessMessageSoapFault()
     {
         $messageBinder = new RpcLiteralRequestMessageBinder();
 
-        $method = new Definition\Method('complextype_argument', null);
-        $method->addInput('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo');
-
         $foo = new Fixtures\Foo('foo', null);
-
-        $this->setExpectedException('SoapFault');
-        $messageBinder->processMessage(
-            $method,
+        $result = $messageBinder->processMessage(
+            new Definition\Method('complextype_argument', null, array(), array(
+                new Definition\Argument('foo', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo')),
+            )),
             array($foo),
-            $this->addComplexTypes($this->getTypeRepository())
+            $this->getDefinitionComplexTypes()
         );
     }
 
@@ -87,17 +83,16 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
     {
         $messageBinder = new RpcLiteralRequestMessageBinder();
 
-        $method = new Definition\Method('complextype_argument', null);
-        $method->addInput('foos', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]');
-
         $foo  = new Fixtures\Foo('foo', 2499104);
         $foos = new \stdClass();
         $foos->item = array($foo, $foo);
 
         $result = $messageBinder->processMessage(
-            $method,
+            new Definition\Method('complextype_argument', null, array(), array(
+                new Definition\Argument('foos', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]')),
+            )),
             array($foos),
-            $this->addComplexTypes($this->getTypeRepository())
+            $this->getDefinitionComplexTypes()
         );
 
         $this->assertEquals(array('foos' => array($foo, $foo)), $result);
@@ -107,17 +102,16 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
     {
         $messageBinder = new RpcLiteralRequestMessageBinder();
 
-        $method = new Definition\Method('complextype_argument', null);
-        $method->addInput('fooBar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar');
-
         $foo    = new Fixtures\Foo('foo', 38845);
         $bar    = new Fixtures\Bar('bar', null);
         $fooBar = new Fixtures\FooBar($foo, $bar);
 
         $result = $messageBinder->processMessage(
-            $method,
+            new Definition\Method('complextype_argument', null, array(), array(
+                new Definition\Argument('fooBar', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar')),
+            )),
             array($fooBar),
-            $this->addComplexTypes($this->getTypeRepository())
+            $this->getDefinitionComplexTypes()
         );
 
         $this->assertEquals(array('fooBar' => $fooBar), $result);
@@ -127,18 +121,17 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
     {
         $messageBinder = new RpcLiteralRequestMessageBinder();
 
-        $method = new Definition\Method('complextype_with_array', null);
-        $method->addInput('simple_arrays', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays');
-
         $array          = array(1, 2, 3, 4);
         $stdClass       = new \stdClass();
         $stdClass->item = $array;
         $simpleArrays   = new Fixtures\SimpleArrays(null, new \stdClass(), $stdClass);
 
         $result = $messageBinder->processMessage(
-            $method,
+            new Definition\Method('complextype_with_array', null, array(), array(
+                new Definition\Argument('simple_arrays', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays')),
+            )),
             array($simpleArrays),
-            $this->addComplexTypes($this->getTypeRepository())
+            $this->getDefinitionComplexTypes()
         );
 
         $result = $result['simple_arrays'];
@@ -151,13 +144,12 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
     {
         $messageBinder = new RpcLiteralRequestMessageBinder();
 
-        $method = new Definition\Method('empty_array_complex_type', null);
-        $method->addInput('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]');
-
         $result = $messageBinder->processMessage(
-            $method,
+            new Definition\Method('empty_array_complex_type', null, array(), array(
+                new Definition\Argument('foo', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]')),
+            )),
             array(new \stdClass()),
-            $this->addComplexTypes($this->getTypeRepository())
+            $this->getDefinitionComplexTypes()
         );
 
         $this->assertEquals(array('foo' => array()), $result);
@@ -167,17 +159,16 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
     {
         $messageBinder = new RpcLiteralRequestMessageBinder();
 
-        $method = new Definition\Method('prevent_infinite_recursion', null);
-        $method->addInput('foo_recursive', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive');
-
         $foo = new Fixtures\FooRecursive('foo', '');
         $bar = new Fixtures\BarRecursive($foo, 10394);
         $foo->bar = $bar;
 
         $result = $messageBinder->processMessage(
-            $method,
+            new Definition\Method('prevent_infinite_recursion', null, array(), array(
+                new Definition\Argument('foo_recursive', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive')),
+            )),
             array($foo),
-            $this->addComplexTypes($this->getTypeRepository())
+            $this->getDefinitionComplexTypes()
         );
 
         $this->assertEquals(array('foo_recursive' => $foo), $result);
@@ -188,43 +179,43 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
         $messages = array();
 
         $messages[] = array(
-            new Definition\Method('no_argument', null),
+            new Definition\Method('no_argument'),
             array(),
             array(),
         );
 
-        $method = new Definition\Method('string_argument', null);
-        $method->addInput('foo', 'string');
         $messages[] = array(
-            $method,
+            new Definition\Method('string_argument', null, array(), array(
+                new Definition\Argument('foo', new Definition\Type('string')),
+            )),
             array('bar'),
             array('foo' => 'bar'),
         );
 
-        $method = new Definition\Method('string_int_arguments', null);
-        $method->addInput('foo', 'string');
-        $method->addInput('bar', 'int');
         $messages[] = array(
-            $method,
+            new Definition\Method('string_int_arguments', null, array(), array(
+                new Definition\Argument('foo', new Definition\Type('string')),
+                new Definition\Argument('bar', new Definition\Type('int')),
+            )),
             array('test', 20),
             array('foo' => 'test', 'bar' => 20),
         );
 
-        $method = new Definition\Method('array_string_arguments', null);
-        $method->addInput('foo', 'string[]');
-        $method->addInput('bar', 'int');
         $strings = new \stdClass();
         $strings->item = array('foo', 'bar', 'barfoo');
         $messages[] = array(
-            $method,
+            new Definition\Method('array_string_arguments', null, array(), array(
+                new Definition\Argument('foo', new Definition\Type('string[]')),
+                new Definition\Argument('bar', new Definition\Type('int')),
+            )),
             array($strings, 4),
             array('foo' => array('foo', 'bar', 'barfoo'), 'bar' => 4),
         );
 
-        $method = new Definition\Method('empty_array', null);
-        $method->addInput('foo', 'string[]');
         $messages[] = array(
-            $method,
+            new Definition\Method('empty_array', null, array(), array(
+                new Definition\Argument('foo', new Definition\Type('string[]')),
+            )),
             array(new \stdClass()),
             array('foo' => array()),
         );
@@ -232,38 +223,40 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
         return $messages;
     }
 
-    private function addComplexTypes(TypeRepository $typeRepository)
+    private function getDefinitionComplexTypes()
     {
-        $foo = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo', 'Foo');
-        $foo->add('foo', 'string');
-        $foo->add('bar', 'int');
-        $typeRepository->addComplexType($foo);
+        $definitionComplexTypes = array();
 
-        $bar = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar', 'Bar');
-        $bar->add('foo', 'string');
-        $bar->add('bar', 'int', true);
-        $typeRepository->addComplexType($bar);
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo'] = $this->createComplexTypeCollection(array(
+            array('foo', 'string'),
+            array('bar', 'int'),
+        ));
 
-        $fooBar = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar', 'FooBar');
-        $fooBar->add('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo');
-        $fooBar->add('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar');
-        $typeRepository->addComplexType($fooBar);
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar'] = $this->createComplexTypeCollection(array(
+            array('foo', 'string'),
+            array('bar', 'int', true),
+        ));
 
-        $simpleArrays = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays', 'SimpleArrays');
-        $simpleArrays->add('array1', 'string[]', true);
-        $simpleArrays->add('array2', 'string[]');
-        $simpleArrays->add('array3', 'string[]');
-        $typeRepository->addComplexType($simpleArrays);
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar'] = $this->createComplexTypeCollection(array(
+            array('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo'),
+            array('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar'),
+        ));
 
-        $fooRecursive = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive', 'FooRecursive');
-        $fooRecursive->add('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive');
-        $typeRepository->addComplexType($fooRecursive);
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays'] = $this->createComplexTypeCollection(array(
+            array('array1', 'string[]', true),
+            array('array2', 'string[]'),
+            array('array3', 'string[]'),
+        ));
 
-        $barRecursive = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive', 'BarRecursive');
-        $barRecursive->add('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive');
-        $typeRepository->addComplexType($barRecursive);
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive'] = $this->createComplexTypeCollection(array(
+            array('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive'),
+        ));
 
-        return $typeRepository;
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive'] = $this->createComplexTypeCollection(array(
+            array('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive'),
+        ));
+
+        return $definitionComplexTypes;
     }
 
     private function createComplexTypeCollection(array $properties)
@@ -284,18 +277,4 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
 
         return array('properties' => $collection);
     }
-
-    private function getTypeRepository()
-    {
-        $typeRepository = new TypeRepository();
-        $typeRepository->addXmlNamespace('xsd', 'http://www.w3.org/2001/XMLSchema');
-        $typeRepository->addType('string', 'xsd:string');
-        $typeRepository->addType('boolean', 'xsd:boolean');
-        $typeRepository->addType('int', 'xsd:int');
-        $typeRepository->addType('float', 'xsd:float');
-        $typeRepository->addType('date', 'xsd:date');
-        $typeRepository->addType('dateTime', 'xsd:dateTime');
-
-        return $typeRepository;
-    }
 }

src/BeSimple/SoapBundle/Tests/Soap/SoapRequestTest.php

@@ -23,8 +23,6 @@ class SoapRequestTest extends \PHPUnit_Framework_TestCase
 {
     public function testMtomMessage()
     {
-        $this->markTestSkipped('Skip because I\'m not sure that SoapRequest is used in a HTTP Request process.');
-
         $content = $this->loadRequestContentFixture('mtom/simple.txt');
 
         $request = new SoapRequest(array(), array(), array(), array(), array(), array(), $content);

src/BeSimple/SoapBundle/Util/String.php

@@ -15,7 +15,7 @@ namespace BeSimple\SoapBundle\Util;
  *
  * @author Christian Kerl <christian-kerl@web.de>
  */
-class BsString
+class String
 {
     /**
      * Checks if a string starts with a given string.

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 $cache->getPath();
+                $this->serviceDefinition = include (string) $cache;
             } 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']));
@@ -78,11 +78,11 @@ class WebServiceContext
                 $definition->setOption('location', $endpoint);
             }
 
-            $dumper = new Dumper($definition, array('stylesheet' => $this->options['wsdl_stylesheet']));
+            $dumper = new Dumper($definition);
             $cache->write($dumper->dump());
         }
 
-        return $cache->getPath();
+        return (string) $cache;
     }
 
     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|~3.0",
-        "symfony/twig-bundle": "~2.0|~3.0",
+        "symfony/framework-bundle": "~2.0",
+        "symfony/twig-bundle": "~2.0",
         "zendframework/zend-mime": "2.1.*"
     },
     "suggest": {
@@ -37,6 +37,7 @@
         "psr-0": { "BeSimple\\SoapBundle": "" }
     },
     "target-dir": "BeSimple/SoapBundle",
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"

src/BeSimple/SoapClient/Curl.php

@@ -77,41 +77,24 @@ class Curl
         if (isset($options['compression']) && !($options['compression'] & SOAP_COMPRESSION_ACCEPT)) {
             curl_setopt($this->ch, CURLOPT_ENCODING, 'identity');
         }
-
-        curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, 10);
-
+        if (isset($options['connection_timeout'])) {
+            curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, $options['connection_timeout']);
+        }
         if (isset($options['proxy_host'])) {
-            if (false !== $options['proxy_host']) {
-                $proxyHost = $options['proxy_host'].(isset($options['proxy_port']) ? $options['proxy_port'] : 8080);
-            } else {
-                $proxyHost = false;
+            $port = isset($options['proxy_port']) ? $options['proxy_port'] : 8080;
+            curl_setopt($this->ch, CURLOPT_PROXY, $options['proxy_host'] . ':' . $port);
         }
-
-            curl_setopt($this->ch, CURLOPT_PROXY, $proxyHost);
-
-            if (false !== $proxyHost && isset($options['proxy_login'])) {
-                curl_setopt($this->ch, CURLOPT_PROXYUSERPWD, $options['proxy_login'].':'.$options['proxy_password']);
-
-                if (isset($options['proxy_auth'])) {
-                    curl_setopt($this->ch, CURLOPT_PROXYAUTH, $options['proxy_auth']);
+        if (isset($options['proxy_user'])) {
+            curl_setopt($this->ch, CURLOPT_PROXYUSERPWD, $options['proxy_user'] . ':' . $options['proxy_password']);
         }
-            }
-        }
-
         if (isset($options['login'])) {
-            curl_setopt($this->ch, CURLOPT_HTTPAUTH, isset($options['extra_options']['http_auth']) ? $options['extra_options']['http_auth'] : CURLAUTH_ANY);
+            curl_setopt($this->ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
             curl_setopt($this->ch, CURLOPT_USERPWD, $options['login'].':'.$options['password']);
         }
         if (isset($options['local_cert'])) {
             curl_setopt($this->ch, CURLOPT_SSLCERT, $options['local_cert']);
             curl_setopt($this->ch, CURLOPT_SSLCERTPASSWD, $options['passphrase']);
         }
-        if (isset($options['ca_info'])) {
-            curl_setopt($this->ch, CURLOPT_CAINFO, $options['ca_info']);
-        }
-        if (isset($options['ca_path'])) {
-            curl_setopt($this->ch, CURLOPT_CAPATH, $options['ca_path']);
-        }
     }
 
     /**
@@ -129,11 +112,10 @@ class Curl
      * @param string $location       HTTP location
      * @param string $request        Request body
      * @param array  $requestHeaders Request header strings
-     * @param array  $requestOptions An array of request options
      *
      * @return bool
      */
-    public function exec($location, $request = null, $requestHeaders = array(), $requestOptions = array())
+    public function exec($location, $request = null, $requestHeaders = array())
     {
         curl_setopt($this->ch, CURLOPT_URL, $location);
 
@@ -146,10 +128,6 @@ class Curl
             curl_setopt($this->ch, CURLOPT_HTTPHEADER, $requestHeaders);
         }
 
-        if (count($requestOptions) > 0) {
-            curl_setopt_array($this->ch, $requestOptions);
-        }
-
         $this->response = $this->execManualRedirect();
 
         return ($this->response === false) ? false : true;
@@ -166,6 +144,7 @@ class Curl
     private function execManualRedirect($redirects = 0)
     {
         if ($redirects > $this->followLocationMaxRedirects) {
+
             // TODO Redirection limit reached, aborting
             return false;
         }
@@ -203,7 +182,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
      *
@@ -249,6 +228,7 @@ class Curl
         $errorCodeMapping = $this->getErrorCodeMapping();
         $errorNumber = curl_errno($this->ch);
         if (isset($errorCodeMapping[$errorNumber])) {
+
             return $errorCodeMapping[$errorNumber];
         }
 

src/BeSimple/SoapClient/SoapClient.php

@@ -41,6 +41,15 @@ class SoapClient extends \SoapClient
      */
     protected $tracingEnabled = false;
 
+    /**
+     * Work around missing header/php://input access in PHP cli webserver by
+     * setting headers additionally as GET parameters and SOAP request body
+     * explicitly as POST variable.
+     *
+     * @var boolean
+     */
+    private $cliWebserverWorkaround = false;
+
     /**
      * cURL instance.
      *
@@ -99,13 +108,11 @@ class SoapClient extends \SoapClient
         if (isset($options['soap_version'])) {
             $this->soapVersion = $options['soap_version'];
         }
-
-        $this->curl = new Curl($options);
-
-        if (isset($options['extra_options'])) {
-            unset($options['extra_options']);
+        // activate cli webserver workaround
+        if (isset($options['cli_webserver_workaround'])) {
+            $this->cliWebserverWorkaround = $options['cli_webserver_workaround'];
         }
-
+        $this->curl = new Curl($options);
         $wsdlFile = $this->loadWsdl($wsdl, $options);
         // TODO $wsdlHandler = new WsdlHandler($wsdlFile, $this->soapVersion);
         $this->soapKernel = new SoapKernel();
@@ -146,19 +153,32 @@ class SoapClient extends \SoapClient
 
         $location = $soapRequest->getLocation();
         $content = $soapRequest->getContent();
+        /*
+         * Work around missing header/php://input access in PHP cli webserver by
+         * setting headers additionally as GET parameters and SOAP request body
+         * explicitly as POST variable
+         */
+        if ($this->cliWebserverWorkaround === true) {
+            if (strpos($location, '?') === false) {
+                $location .= '?';
+            } else {
+                $location .= '&';
+            }
+            $location .= SoapMessage::CONTENT_TYPE_HEADER.'='.urlencode($soapRequest->getContentType());
+            $location .= '&';
+            $location .= SoapMessage::SOAP_ACTION_HEADER.'='.urlencode($soapRequest->getAction());
 
-        $headers = $this->filterRequestHeaders($soapRequest, $headers);
+            $content = http_build_query(array('request' => $content));
 
-        $options = $this->filterRequestOptions($soapRequest);
+            $headers = array();
+        }
 
         // execute HTTP request with cURL
         $responseSuccessfull = $this->curl->exec(
             $location,
             $content,
-            $headers,
-            $options
+            $headers
         );
-
         // tracing enabled: store last request header and body
         if ($this->tracingEnabled === true) {
             $this->lastRequestHeaders = $this->curl->getRequestHeaders();
@@ -233,31 +253,6 @@ class SoapClient extends \SoapClient
         return $soapResponse;
     }
 
-    /**
-     * Filters HTTP headers which will be sent
-     *
-     * @param SoapRequest $soapRequest SOAP request object
-     * @param array       $headers     An array of HTTP headers
-     *
-     * @return array
-     */
-    protected function filterRequestHeaders(SoapRequest $soapRequest, array $headers)
-    {
-        return $headers;
-    }
-
-    /**
-     * Adds additional cURL options for the request
-     *
-     * @param SoapRequest $soapRequest SOAP request object
-     *
-     * @return array
-     */
-    protected function filterRequestOptions(SoapRequest $soapRequest)
-    {
-        return array();
-    }
-
     /**
      * Get last request HTTP headers.
      *
@@ -359,7 +354,7 @@ class SoapClient extends \SoapClient
      *
      * @return string
      */
-    protected function loadWsdl($wsdl, array $options)
+    private function loadWsdl($wsdl, array $options)
     {
         // option to resolve wsdl/xsd includes
         $resolveRemoteIncludes = true;

src/BeSimple/SoapClient/SoapClientBuilder.php

@@ -175,28 +175,19 @@ class SoapClientBuilder extends AbstractSoapBuilder
      *
      * @param string $host     Host
      * @param int    $port     Port
-     * @param string $login    Login
+     * @param string $username Username
      * @param string $password Password
-     * @param int    $auth     Authentication method
      *
      * @return \BeSimple\SoapClient\SoapClientBuilder
      */
-    public function withProxy($host, $port, $login = null, $password = null, $auth = null)
+    public function withProxy($host, $port, $username = null, $password = null)
     {
         $this->soapOptions['proxy_host'] = $host;
         $this->soapOptions['proxy_port'] = $port;
 
-        if ($login) {
-            $this->soapOptions['proxy_login'] = $login;
+        if ($username) {
+            $this->soapOptions['proxy_login']    = $username;
             $this->soapOptions['proxy_password'] = $password;
-
-            if ($auth) {
-                if (!in_array($auth, array(\CURLAUTH_BASIC, \CURLAUTH_NTLM), true)) {
-                    throw new \InvalidArgumentException('Invalid authentication method: CURLAUTH_BASIC or CURLAUTH_NTLM constants are availables.');
-                }
-
-                $this->soapOptions['proxy_auth'] = $auth;
-            }
         }
 
         return $this;

src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php

@@ -23,7 +23,8 @@ abstract class AbstractWebServerTest extends \PHPUnit_Framework_TestCase
     /**
      * @var ProcessBuilder
      */
-    protected static $webserver;
+    static protected $webserver;
+    static protected $websererPortLength;
 
     public static function setUpBeforeClass()
     {
@@ -43,6 +44,8 @@ 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/MtomAxisInteropTest.php

@@ -28,7 +28,6 @@ class MtomAxisInteropTest extends TestCase
             'base64Binary'      => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\base64Binary',
             'AttachmentRequest' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\AttachmentRequest',
         ),
-        'proxy_host' => false,
     );
 
     public function testAttachment()

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

@@ -37,7 +37,6 @@ class SwaAxisInteropTest extends TestCase
             'uploadFile'           => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\uploadFile',
             'uploadFileResponse'   => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\uploadFileResponse',
         ),
-        'proxy_host' => false,
     );
 
     public function testUploadDownloadText()

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

@@ -32,7 +32,6 @@ class WsAddressingAxisInteropTest extends TestCase
     private $options = array(
         'soap_version' => SOAP_1_2,
         'features'     => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1
-        'proxy_host' => false,
     );
 
     public function testSession()

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

@@ -64,7 +64,6 @@ class WsSecuritySigEncAxisInteropTest extends TestCase
             'addBookResponse'        => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\addBookResponse',
             'BookInformation'        => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\BookInformation',
         ),
-        'proxy_host' => false,
     );
 
     public function testSigEnc()

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

@@ -40,7 +40,6 @@ class WsSecurityUserPassAxisInteropTest extends TestCase
             'addBookResponse'        => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\addBookResponse',
             'BookInformation'        => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\BookInformation',
         ),
-        'proxy_host' => false,
     );
 
     public function testUserPassText()

src/BeSimple/SoapClient/Tests/CurlTest.php

@@ -21,9 +21,7 @@ class CurlTest extends AbstractWebserverTest
 {
     public function testExec()
     {
-        $curl = new Curl(array(
-            'proxy_host' => false,
-        ));
+        $curl = new Curl();
 
         $this->assertTrue($curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT)));
         $this->assertTrue($curl->exec(sprintf('http://localhost:%d/404.txt', WEBSERVER_PORT)));
@@ -31,9 +29,7 @@ class CurlTest extends AbstractWebserverTest
 
     public function testGetErrorMessage()
     {
-        $curl = new Curl(array(
-            'proxy_host' => false,
-        ));
+        $curl = new Curl();
 
         $curl->exec('http://unknown/curl.txt');
         $this->assertEquals('Could not connect to host', $curl->getErrorMessage());
@@ -45,14 +41,24 @@ class CurlTest extends AbstractWebserverTest
         $this->assertEquals('Unable to parse URL', $curl->getErrorMessage());
     }
 
+    public function testGetRequestHeaders()
+    {
+        $curl = new Curl();
+
+        $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(
-            'proxy_host' => false,
-        ));
+        $curl = new Curl();
 
         $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());
@@ -60,9 +66,7 @@ class CurlTest extends AbstractWebserverTest
 
     public function testGetResponseBody()
     {
-        $curl = new Curl(array(
-            'proxy_host' => false,
-        ));
+        $curl = new Curl();
 
         $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT));
         $this->assertEquals('This is a testfile for cURL.', $curl->getResponseBody());
@@ -70,9 +74,7 @@ class CurlTest extends AbstractWebserverTest
 
     public function testGetResponseContentType()
     {
-        $curl = new Curl(array(
-            'proxy_host' => false,
-        ));
+        $curl = new Curl();
 
         $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT));
         $this->assertEquals('text/plain; charset=UTF-8', $curl->getResponseContentType());
@@ -81,11 +83,20 @@ class CurlTest extends AbstractWebserverTest
         $this->assertEquals('text/html; charset=UTF-8', $curl->getResponseContentType());
     }
 
+    public function testGetResponseHeaders()
+    {
+        $curl = new Curl();
+
+        $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(
-            'proxy_host' => false,
-        ));
+        $curl = new Curl();
 
         $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT));
         $this->assertEquals(200, $curl->getResponseStatusCode());

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

@@ -18,6 +18,7 @@ $options = array(
         'base64Binary'      => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary',
         'AttachmentRequest' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest',
     ),
+    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     'connection_timeout' => 1,
 );
 
@@ -36,6 +37,7 @@ try {
     $attachment->binaryData = $b64;
 
     var_dump($sc->attachment($attachment));
+
 } catch (Exception $e) {
     var_dump($e);
 }

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

@@ -14,13 +14,13 @@ $options = array(
     'cache_wsdl'      => WSDL_CACHE_NONE,
     'classmap'        => array(
         'base64Binary'      => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary',
-        'AttachmentType' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest',
+        'AttachmentRequest' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest',
     ),
 );
 
 class Mtom
 {
-    public function attachment(Fixtures\AttachmentRequest $attachment)
+    public function attachment(AttachmentRequest $attachment)
     {
         $b64 = $attachment->binaryData;
 

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

@@ -20,7 +20,7 @@ class MtomServerInteropTest extends TestCase
             'base64Binary'      => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary',
             'AttachmentRequest' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest',
         ),
-        'proxy_host' => false,
+        'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     );
 
     public function testAttachment()

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

@@ -24,11 +24,13 @@ $options = array(
         'uploadFile'           => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFile',
         'uploadFileResponse'   => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFileResponse',
     ),
+    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
 );
 
 $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/SwaServerInteropTest.php

@@ -23,7 +23,7 @@ class SwaServerInteropTest extends TestCase
             'uploadFile'           => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFile',
             'uploadFileResponse'   => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFileResponse',
         ),
-        'proxy_host' => false,
+        'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     );
 
     public function testUploadDownloadText()
@@ -42,8 +42,6 @@ class SwaServerInteropTest extends TestCase
         $result = $sc->downloadFile($download);
 
         $this->assertEquals($upload->data, $result->data);
-
-        unlink(__DIR__.'/../ServerInterop/'.$download->name);
     }
 
     public function testUploadDownloadImage()
@@ -62,7 +60,5 @@ class SwaServerInteropTest extends TestCase
         $result = $sc->downloadFile($download);
 
         $this->assertEquals($upload->data, $result->data);
-
-        unlink(__DIR__.'/../ServerInterop/'.$download->name);
     }
 }

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

@@ -31,6 +31,7 @@ $options = array(
         'addBookResponse'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse',
         'BookInformation'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation',
     ),
+    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
 );
 
 $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecuritySigEnc.wsdl', $options);
@@ -69,6 +70,7 @@ try {
     $ab->type = 'scifi';
 
     var_dump($sc->addBook($ab));
+
 } catch (Exception $e) {
     var_dump($e);
 }

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

@@ -30,7 +30,7 @@ class WsSecuritySigEncServerInteropTest extends TestCase
             'addBookResponse'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse',
             'BookInformation'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation',
         ),
-        'proxy_host' => false,
+        'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     );
 
     public function testSigEnc()

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

@@ -28,6 +28,7 @@ $options = array(
         'addBookResponse'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse',
         'BookInformation'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation',
     ),
+    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
 );
 
 $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecurityUserPass.wsdl', $options);
@@ -54,6 +55,7 @@ try {
     $ab->type = 'scifi';
 
     var_dump($sc->addBook($ab));
+
 } catch (Exception $e) {
     var_dump($e);
 }

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

@@ -29,7 +29,7 @@ class WsSecurityUserPassServerInteropTest extends TestCase
             'addBookResponse'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse',
             'BookInformation'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation',
         ),
-        'proxy_host' => false,
+        'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     );
 
     public function testUserPassText()

src/BeSimple/SoapClient/Tests/SoapClientBuilderTest.php

@@ -96,20 +96,6 @@ class SoapClientBuilderTest extends \PHPUnit_Framework_TestCase
 
         $builder->withProxy('127.0.0.1', 8585, 'foo', 'bar');
         $this->assertEquals($this->mergeOptions(array('proxy_host' => '127.0.0.1', 'proxy_port' => 8585, 'proxy_login' => 'foo', 'proxy_password' => 'bar')), $builder->getSoapOptions());
-
-        $builder->withProxy('127.0.0.1', 8585, 'foo', 'bar', \CURLAUTH_BASIC);
-        $this->assertEquals($this->mergeOptions(array('proxy_host' => '127.0.0.1', 'proxy_port' => 8585, 'proxy_login' => 'foo', 'proxy_password' => 'bar', 'proxy_auth' => \CURLAUTH_BASIC)), $builder->getSoapOptions());
-
-        $builder->withProxy('127.0.0.1', 8585, 'foo', 'bar', \CURLAUTH_NTLM);
-        $this->assertEquals($this->mergeOptions(array('proxy_host' => '127.0.0.1', 'proxy_port' => 8585, 'proxy_login' => 'foo', 'proxy_password' => 'bar', 'proxy_auth' => \CURLAUTH_NTLM)), $builder->getSoapOptions());
-
-        try {
-            $builder->withProxy('127.0.0.1', 8585, 'foo', 'bar', -100);
-
-            $this->fail('An expected exception has not been raised.');
-        } catch (\Exception $e) {
-            $this->assertInstanceOf('InvalidArgumentException', $e);
-        }
     }
 
     public function testCreateWithDefaults()

src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php

@@ -25,9 +25,9 @@ use org\bovigo\vfs\vfsStreamWrapper;
  */
 class WsdlDownloaderTest extends AbstractWebserverTest
 {
-    protected static $filesystem;
+    static protected $filesystem;
 
-    protected static $fixturesPath;
+    static protected $fixturesPath;
 
     /**
      * @dataProvider provideDownload
@@ -41,9 +41,7 @@ class WsdlDownloaderTest extends AbstractWebserverTest
         Cache::setDirectory($wsdlCacheUrl);
         $cacheDirForRegExp = preg_quote($wsdlCacheUrl, '#');
 
-        $wsdlDownloader = new WsdlDownloader(new Curl(array(
-            'proxy_host' => false,
-        )));
+        $wsdlDownloader = new WsdlDownloader(new Curl());
         $this->assertCount(0, $wsdlCacheDir->getChildren());
 
         $cacheFileName = $wsdlDownloader->download($source);
@@ -115,9 +113,7 @@ class WsdlDownloaderTest extends AbstractWebserverTest
         Cache::setDirectory($wsdlCacheUrl);
         $cacheDirForRegExp = preg_quote($wsdlCacheUrl, '#');
 
-        $wsdlDownloader = new WsdlDownloader(new Curl(array(
-            'proxy_host' => false,
-        )));
+        $wsdlDownloader = new WsdlDownloader(new Curl());
         $r = new \ReflectionClass($wsdlDownloader);
         $m = $r->getMethod('resolveRemoteIncludes');
         $m->setAccessible(true);
@@ -180,9 +176,7 @@ class WsdlDownloaderTest extends AbstractWebserverTest
         Cache::setDirectory($wsdlCacheUrl);
         $cacheDirForRegExp = preg_quote($wsdlCacheUrl, '#');
 
-        $wsdlDownloader = new WsdlDownloader(new Curl(array(
-            'proxy_host' => false,
-        )));
+        $wsdlDownloader = new WsdlDownloader(new Curl());
         $r = new \ReflectionClass($wsdlDownloader);
         $m = $r->getMethod('resolveRemoteIncludes');
         $m->setAccessible(true);
@@ -278,7 +272,7 @@ class WsdlDownloaderTest extends AbstractWebserverTest
             $content = file_get_contents(self::$fixturesPath.$file);
             $content = preg_replace('#'.preg_quote('%location%').'#', sprintf('localhost:%d', WEBSERVER_PORT), $content);
 
-            file_put_contents(self::$fixturesPath.'build_include'.DIRECTORY_SEPARATOR.pathinfo($file, PATHINFO_BASENAME), $content);
+            self::$filesystem->dumpFile(self::$fixturesPath.'build_include'.DIRECTORY_SEPARATOR.pathinfo($file, PATHINFO_BASENAME), $content);
         }
     }
 

src/BeSimple/SoapClient/Tests/bin/axis.sh

@@ -23,12 +23,12 @@ if [ ! -f "$DIR/$ZIP_RAMPART" ]; then
     curl -O -s $PATH_RAMPART
 fi
 
-unzip -o -qq "$DIR/$ZIP_AXIS"
+unzip -qq "$DIR/$ZIP_AXIS"
 
 AXIS_DIR=$DIR/axis2-$VERSION_AXIS
 
-unzip -o -qq -j "$DIR/$ZIP_RAMPART" '*/lib/*.jar' -d $AXIS_DIR/lib
-unzip -o -qq -j "$DIR/$ZIP_RAMPART" '*/modules/*.mar' -d $AXIS_DIR/repository/modules
+unzip -qq -j "$DIR/$ZIP_RAMPART" '*/lib/*.jar' -d $AXIS_DIR/lib
+unzip -qq -j "$DIR/$ZIP_RAMPART" '*/modules/*.mar' -d $AXIS_DIR/repository/modules
 
 cp -r $DIR/../AxisInterop/axis_services/* $AXIS_DIR/repository/services
 

src/BeSimple/SoapClient/WsAddressingFilter.php

@@ -157,6 +157,7 @@ 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,6 +151,7 @@ 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 bool
+     * @var boolean
      */
     protected $resolveRemoteIncludes = true;
 
@@ -64,13 +64,13 @@ class WsdlDownloader
      * Constructor.
      *
      * @param \BeSimple\SoapClient\Curl $curl                  Curl instance
-     * @param bool                      $resolveRemoteIncludes WSDL/XSD include enabled?
-     * @param bool                      $cacheWsdl             Cache constant
+     * @param boolean                   $resolveRemoteIncludes WSDL/XSD include enabled?
+     * @param boolean                   $cacheWsdl             Cache constant
      */
     public function __construct(Curl $curl, $resolveRemoteIncludes = true, $cacheWsdl = Cache::TYPE_DISK)
     {
         $this->curl                  = $curl;
-        $this->resolveRemoteIncludes = (bool) $resolveRemoteIncludes;
+        $this->resolveRemoteIncludes = (Boolean) $resolveRemoteIncludes;
 
         // get current WSDL caching config
         $this->cacheEnabled = $cacheWsdl === Cache::TYPE_NONE ? Cache::DISABLED : Cache::ENABLED == Cache::isEnabled();
@@ -101,20 +101,6 @@ 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 {
@@ -144,7 +130,7 @@ class WsdlDownloader
      *
      * @param string $file File URL/path
      *
-     * @return bool
+     * @return boolean
      */
     private function isRemoteFile($file)
     {
@@ -163,7 +149,9 @@ class WsdlDownloader
      *
      * @param string  $xml            XML file
      * @param string  $cacheFilePath  Cache file name
-     * @param bool   $parentFilePath Parent file name
+     * @param boolean $parentFilePath Parent file name
+     *
+     * @return void
      */
     private function resolveRemoteIncludes($xml, $cacheFilePath, $parentFilePath = null)
     {
@@ -226,7 +214,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']) )) {
@@ -259,7 +247,7 @@ class WsdlDownloader
                         break;
                     }
 
-                    --$keyToDelete;
+                    $keyToDelete--;
                 }
 
                 unset($parts[$key]);

src/BeSimple/SoapClient/XmlMimeFilter.php

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

src/BeSimple/SoapClient/composer.json

@@ -27,14 +27,15 @@
         "ass/xmlsecurity": "~1.0"
     },
     "require-dev": {
-        "mikey179/vfsStream": "~1.0",
-        "symfony/filesystem": "~2.0",
+        "mikey179/vfsStream": "dev-master",
+        "symfony/filesystem": "~2.3",
         "symfony/process": "~2.3"
     },
     "autoload": {
         "psr-0": { "BeSimple\\SoapClient": "" }
     },
     "target-dir": "BeSimple/SoapClient",
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"

src/BeSimple/SoapCommon/AbstractSoapBuilder.php

@@ -27,7 +27,7 @@ abstract class AbstractSoapBuilder
     /**
      * @return AbstractSoapBuilder
      */
-    public static function createWithDefaults()
+    static public 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;
 
-    protected static $types = array(
+    static protected $types = array(
         self::TYPE_NONE,
         self::TYPE_DISK,
         self::TYPE_MEMORY,
         self::TYPE_DISK_MEMORY,
     );
 
-    public static function getTypes()
+    static public function getTypes()
     {
         return self::$types;
     }
 
-    public static function isEnabled()
+    static public function isEnabled()
     {
         return self::iniGet('soap.wsdl_cache_enabled');
     }
 
-    public static function setEnabled($enabled)
+    static public 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);
     }
 
-    public static function getType()
+    static public function getType()
     {
         return self::iniGet('soap.wsdl_cache');
     }
 
-    public static function setType($type)
+    static public 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);
     }
 
-    public static function getDirectory()
+    static public function getDirectory()
     {
         return self::iniGet('soap.wsdl_cache_dir');
     }
 
-    public static function setDirectory($directory)
+    static public function setDirectory($directory)
     {
         if (!is_dir($directory)) {
             mkdir($directory, 0777, true);
@@ -79,32 +79,32 @@ class Cache
         self::iniSet('soap.wsdl_cache_dir', $directory);
     }
 
-    public static function getLifetime()
+    static public function getLifetime()
     {
         return self::iniGet('soap.wsdl_cache_ttl');
     }
 
-    public static function setLifetime($lifetime)
+    static public function setLifetime($lifetime)
     {
         self::iniSet('soap.wsdl_cache_ttl', $lifetime);
     }
 
-    public static function getLimit()
+    static public function getLimit()
     {
         return self::iniGet('soap.wsdl_cache_limit');
     }
 
-    public static function setLimit($limit)
+    static public function setLimit($limit)
     {
         self::iniSet('soap.wsdl_cache_limit', $limit);
     }
 
-    protected static function iniGet($key)
+    static protected function iniGet($key)
     {
         return ini_get($key);
     }
 
-    protected static function iniSet($key, $value)
+    static protected function iniSet($key, $value)
     {
         ini_set($key, $value);
     }

src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php

@@ -44,3 +44,4 @@ 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,3 +44,4 @@ 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,8 +65,10 @@ 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
      */
-    public function setKernel(SoapKernel $soapKernel);
+    function setKernel(SoapKernel $soapKernel);
 }

src/BeSimple/SoapCommon/Converter/SwaTypeConverter.php

@@ -61,8 +61,10 @@ 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
      */
-    public function getTypeNamespace();
+    function getTypeNamespace();
 
     /**
      * Get type name.
      *
      * @return string
      */
-    public function getTypeName();
+    function getTypeName();
 
     /**
      * Convert given XML string to PHP type.
@@ -40,7 +40,7 @@ interface TypeConverterInterface
      *
      * @return mixed
      */
-    public function convertXmlToPhp($data);
+    function convertXmlToPhp($data);
 
     /**
      * Convert PHP type to XML string.
@@ -49,5 +49,5 @@ interface TypeConverterInterface
      *
      * @return string
      */
-    public function convertPhpToXml($data);
+    function convertPhpToXml($data);
 }

src/BeSimple/SoapCommon/Definition/Message.php

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

src/BeSimple/SoapCommon/Definition/Method.php

@@ -12,6 +12,8 @@
 
 namespace BeSimple\SoapCommon\Definition;
 
+use BeSimple\SoapCommon\Definition\Type\TypeRepository;
+
 /**
  * @author Francis Besset <francis.besset@gmail.com>
  */
@@ -24,14 +26,14 @@ class Method
     private $output;
     private $fault;
 
-    public function __construct($name)
+    public function __construct($name, TypeRepository $typeRepository)
     {
         $this->name = $name;
 
-        $this->headers = new Message($name.'Header');
-        $this->input = new Message($name.'Request');
-        $this->output = new Message($name.'Response');
-        $this->fault = new Message($name.'Fault');
+        $this->headers = new Message($name.'Header', $typeRepository);
+        $this->input = new Message($name.'Request', $typeRepository);
+        $this->output = new Message($name.'Response', $typeRepository);
+        $this->fault = new Message($name.'Fault', $typeRepository);
     }
 
     public function getName()
@@ -64,7 +66,7 @@ class Method
         $this->input->add($name, $type);
     }
 
-    public function setOutput($type, $name = 'return')
+    public function setOutput($type)
     {
         $this->output->add('return', $type);
     }

src/BeSimple/SoapCommon/Definition/Part.php

@@ -20,13 +20,11 @@ class Part
     protected $name;
     protected $type;
     protected $nillable;
-    protected $minOccurs;
 
-    public function __construct($name, $type, $nillable = false, $minOccurs = 1)
+    public function __construct($name, $type, $nillable = false)
     {
         $this->name = $name;
         $this->type = $type;
-        $this->minOccurs = $minOccurs;
         $this->setNillable($nillable);
     }
 
@@ -52,16 +50,6 @@ class Part
 
     public function setNillable($nillable)
     {
-        $this->nillable = (bool) $nillable;
-    }
-
-    public function setMinOccurs($minOccurs)
-    {
-        $this->minOccurs = $minOccurs;
-    }
-
-    public function getMinOccurs()
-    {
-        return $this->minOccurs;
+        $this->nillable = (boolean) $nillable;
     }
 }

src/BeSimple/SoapCommon/Helper.php

@@ -172,8 +172,7 @@ 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",
@@ -184,9 +183,7 @@ 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

@@ -28,13 +28,6 @@ abstract class SoapMessage
      */
     const CONTENT_TYPE_HEADER = 'CONTENT_TYPE';
 
-    /**
-     * $_SERVER key for 'Content-Type' header (with PHP cli-webserver)
-     *
-     * @var string
-     */
-    const HTTP_CONTENT_TYPE_HEADER = 'HTTP_CONTENT_TYPE';
-
     /**
      * $_SERVER key for 'SOAPAction' header.
      *
@@ -47,7 +40,7 @@ abstract class SoapMessage
      *
      * @var array(string=>string)
      */
-    protected static $versionToContentTypeMap = array(
+    static protected $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,4 +22,5 @@ use BeSimple\SoapCommon\SoapMessage;
  */
 class SoapRequest extends SoapMessage
 {
+
 }

src/BeSimple/SoapCommon/SoapResponse.php

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@ namespace BeSimple\SoapCommon\Type\KeyValue;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 use BeSimple\SoapCommon\Type\AbstractKeyValue;
 
-class BsString extends AbstractKeyValue
+class String 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.u\Z';
+    const DATETIME_FORMAT = 'Y-m-d\TH:i:s.000\Z';
 
     /**
      * (X509 3.2.1) Reference to a Subject Key Identifier
@@ -338,6 +338,7 @@ 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/composer.json

@@ -25,12 +25,14 @@
         "ass/xmlsecurity": "~1.0"
     },
     "require-dev": {
-        "mikey179/vfsstream": "~1.0"
+        "ext-mcrypt": "*",
+        "mikey179/vfsStream": "dev-master"
     },
     "autoload": {
         "psr-0": { "BeSimple\\SoapCommon": "" }
     },
     "target-dir": "BeSimple/SoapCommon",
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"

src/BeSimple/SoapServer/SoapRequest.php

@@ -32,20 +32,30 @@ class SoapRequest extends CommonSoapRequest
      */
     public static function create($content, $version)
     {
-        $request = new SoapRequest();
-
-        // $content is if unmodified from SoapClient not a php string type!
-        $request->setContent((string) (null === $content ? file_get_contents("php://input") : $content));
-        $request->setLocation(self::getCurrentUrl());
-        $request->setAction(isset($_SERVER[SoapMessage::SOAP_ACTION_HEADER]) ? $_SERVER[SoapMessage::SOAP_ACTION_HEADER] : null);
-        $request->setVersion($version);
-
-        if (isset($_SERVER[SoapMessage::CONTENT_TYPE_HEADER])) {
-            $request->setContentType($_SERVER[SoapMessage::CONTENT_TYPE_HEADER]);
-        } elseif (isset($_SERVER[SoapMessage::HTTP_CONTENT_TYPE_HEADER])) {
-            $request->setContentType($_SERVER[SoapMessage::HTTP_CONTENT_TYPE_HEADER]);
+        $location = self::getCurrentUrl();
+        /*
+         * Work around missing header/php://input access in PHP cli webserver by
+         * setting headers additionally as GET parameters and SOAP request body
+         * explicitly as POST variable
+         */
+        if (php_sapi_name() == "cli-server") {
+            $content = is_null($content) ? $_POST['request'] : $content;
+            $action = $_GET[SoapMessage::SOAP_ACTION_HEADER];
+            $contentType = $_GET[SoapMessage::CONTENT_TYPE_HEADER];
+        } else {
+            $content = is_null($content) ? file_get_contents("php://input") : $content;
+            $action = isset($_SERVER[SoapMessage::SOAP_ACTION_HEADER]) ? $_SERVER[SoapMessage::SOAP_ACTION_HEADER] : null;
+            $contentType = $_SERVER[SoapMessage::CONTENT_TYPE_HEADER];
         }
 
+        $request = new SoapRequest();
+        // $content is if unmodified from SoapClient not a php string type!
+        $request->setContent((string) $content);
+        $request->setLocation($location);
+        $request->setAction($action);
+        $request->setVersion($version);
+        $request->setContentType($contentType);
+
         return $request;
     }
 

src/BeSimple/SoapServer/SoapServer.php

@@ -131,7 +131,9 @@ 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
      */
-    public static function createWithDefaults()
+    static public function createWithDefaults()
     {
         return parent::createWithDefaults()
             ->withErrorReporting(false);

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(static::DATETIME_FORMAT, $expires->textContent, new \DateTimeZone('UTC'));
+                $expiresDatetime = \DateTime::createFromFormat(self::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(static::DATETIME_FORMAT);
+        $createdTimestamp = $dt->format(self::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(static::DATETIME_FORMAT);
+                $expiresTimestamp = $dt->format(self::DATETIME_FORMAT);
                 $expires = $filterHelper->createElement(Helper::NS_WSU, 'Expires', $expiresTimestamp);
                 $timestamp->appendChild($expires);
             }

src/BeSimple/SoapServer/XmlMimeFilter.php

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

src/BeSimple/SoapServer/composer.json

@@ -29,6 +29,7 @@
         "psr-0": { "BeSimple\\SoapServer": "" }
     },
     "target-dir": "BeSimple/SoapServer",
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"

src/BeSimple/SoapWsdl/Dumper/Dumper.php

@@ -54,7 +54,7 @@ class Dumper
     protected $domService;
     protected $domPortType;
 
-    public function __construct(Definition $definition, array $options = [])
+    public function __construct(Definition $definition, array $options = array())
     {
         $this->definition = $definition;
         $this->document = new \DOMDocument('1.0', 'utf-8');
@@ -64,15 +64,14 @@ class Dumper
 
     public function setOptions(array $options)
     {
-        $this->options = [
+        $this->options = array(
             '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 = [];
+        $invalid = array();
         foreach ($options as $key => $value) {
             if (array_key_exists($key, $this->options)) {
                 $this->options[$key] = $value;
@@ -114,7 +113,7 @@ class Dumper
         $this->addMethods();
         $this->addService();
 
-        foreach ([$this->version11, $this->version12] as $version) {
+        foreach (array($this->version11, $this->version12) as $version) {
             if (!$version) {
                 continue;
             }
@@ -124,8 +123,6 @@ class Dumper
 
         $this->document->formatOutput = true;
 
-        $this->addStylesheet();
-
         return $this->document->saveXML();
     }
 
@@ -189,7 +186,7 @@ class Dumper
     protected function addMessages(array $messages)
     {
         foreach ($messages as $message) {
-            if (preg_match('#Header$#', $message->getName()) && $message->isEmpty()) {
+            if ($message->isEmpty()) {
                 continue;
             }
 
@@ -265,11 +262,6 @@ class Dumper
                 $element->setAttribute('maxOccurs', 'unbounded');
             }
 
-            // 1 is the default value of minOccurs.
-            if (1 != $child->getMinOccurs()) {
-                $element->setAttribute('minOccurs', $child->getMinOccurs());
-            }
-
             $all->appendChild($element);
         }
 
@@ -289,8 +281,8 @@ class Dumper
         $operation = $this->document->createElement('operation');
         $operation->setAttribute('name', $method->getName());
 
-        foreach (['input' => $method->getInput(), 'output' => $method->getOutput(), 'fault' => $method->getFault()] as $type => $message) {
-            if ('fault' === $type && $message->isEmpty()) {
+        foreach (array('input' => $method->getInput(), 'output' => $method->getOutput(), 'fault' => $method->getFault()) as $type => $message) {
+            if ($message->isEmpty()) {
                 continue;
             }
 
@@ -305,15 +297,6 @@ class Dumper
         return $operation;
     }
 
-    protected function addStylesheet()
-    {
-        if ($this->options['stylesheet']) {
-            $stylesheet = $this->document->createProcessingInstruction('xml-stylesheet', sprintf('type="text/xsl" href="%s"', $this->options['stylesheet']));
-
-            $this->document->insertBefore($stylesheet, $this->document->documentElement);
-        }
-    }
-
     protected function getVersion($version)
     {
         if (\SOAP_1_2 === $version) {

src/BeSimple/SoapWsdl/composer.json

@@ -22,6 +22,7 @@
         "psr-0": { "BeSimple\\SoapWsdl": "" }
     },
     "target-dir": "BeSimple/SoapWsdl",
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"