.gitignore

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

.travis.yml

@@ -1,25 +1,23 @@
 language: php
 
 php:
-  - 5.6
+  - 5.3
-  - 7.0
+  - 5.4
-  - 7.1
+  - 5.5
 
 env:
-  - SYMFONY_VERSION=2.8.*
+  - SYMFONY_VERSION=2.0.*
-  - SYMFONY_VERSION="dev-master symfony/debug:~2.8@dev symfony/http-kernel:~2.8@dev"
+  - SYMFONY_VERSION=2.1.*
+  - SYMFONY_VERSION=2.2.*
+  - SYMFONY_VERSION=2.3.*
+  - SYMFONY_VERSION=dev-master
 
 before_script:
-  - phpenv config-add myphp.ini
+  - composer require symfony/http-foundation:${SYMFONY_VERSION} --no-interaction --prefer-source
-  - composer self-update
-  - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
-  - composer update --no-interaction --prefer-source
-  - ./src/BeSimple/SoapClient/Tests/bin/phpwebserver.sh
-  - ./src/BeSimple/SoapClient/Tests/bin/axis.sh
 
 script:
   - phpunit --coverage-text
 
 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 +0,0 @@
-# BeSimpleSoap (Symfony 3.4 / 4.x)
-
-This fork provides the BeSimpleSoap bundle, updated to be compatible with Symfony 3.4 and 4.x (as well as with PHP 7.0-7.4).
-
-We forked the official [BeSimpleSoap](https://github.com/BeSimple/BeSimpleSoap) repository in order to sucessfully maintain some of our projects.
-
-We now have integrated changes and fixes from sub-forks (thank you guys!), and we should be up to date now :)
-
-This fork is maintained by people from [Cadoles](https://www.cadoles.com/).
-
-# Contributing
-
-We do welcome pull requests :) please include tests if you can.
-
-Running tests can be done by running `php vendor/bin/phpunit`.
-
-# Installation
-
-If you do not yet have composer, follow instructions on the [Composer website](https://getcomposer.org/download/) to install it.
-
-Then just running:
-
-```
-$ composer require cadoles/soap
-```
-
-should be enough to get you up and running.
-
-# Components
-
-BeSimpleSoap consists of five components ...
-
-## 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.
-
-## BeSimpleSoapCommon
-
-**Refactored** BeSimpleSoapCommon component contains functionality shared by both the server and client implementations.
-
-## 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).
-
-## BeSimpleSoapBundle
-
-**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!* 
-
-# 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
-```
-
-### Something wrong?!
-
-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)
-{
-    $response = new DummyServiceResponse();
-    $response->status = true;
-
-    return $response;
-}
-```
-
-For further information and getting inspiration for your implementation, see the unit tests in ``tests`` dir.

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",
+        "ass/xmlsecurity": "dev-master",
-        "symfony/framework-bundle": "~3.4|~4.0",
+        "symfony/framework-bundle": "~2.0",
-        "symfony/twig-bundle": "~3.4|~4.0",
+        "zendframework/zend-mail": "2.1.*",
-        "laminas/laminas-mime": "~2.1"
+        "zendframework/zend-mime": "2.1.*",
+        "zendframework/zend-soap": "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-server": "self.version"
-        "besimple/soap-wsdl":   "self.version",
-        "cocciagialla/soap":    "self.version"
     },
     "require-dev": {
-        "mikey179/vfsstream": "~1.6.5",
+        "ext-mcrypt": "*",
+        "mikey179/vfsStream": "dev-master",
         "symfony/filesystem": "~2.3",
-        "symfony/process": "~2.3",
+        "symfony/process": "~2.3"
-        "phpunit/phpunit": "^5.7"
     },
     "autoload": {
         "psr-0": { "BeSimple\\": "src/" }
     },
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "5.2.0-dev"
+            "dev-master": "0.1-dev"
         }
     }
 }

src/BeSimple/SoapBundle/.gitignore

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

src/BeSimple/SoapBundle/Cache.php

@@ -25,15 +25,17 @@ class Cache
 
         BaseCache::setEnabled($isEnabled);
 
-        BaseCache::setType($type);
+        if (BaseCache::ENABLED == BaseCache::isEnabled()) {
-        BaseCache::setDirectory($directory);
+            BaseCache::setType($type);
+            BaseCache::setDirectory($directory);
 
-        if (null !== $lifetime) {
+            if (null !== $lifetime) {
-            BaseCache::setLifetime($lifetime);
+                BaseCache::setLifetime($lifetime);
-        }
+            }
 
-        if (null !== $limit) {
+            if (null !== $limit) {
-            BaseCache::setLimit($limit);
+                BaseCache::setLimit($limit);
+            }
         }
     }
-}
+}

src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php

@@ -12,29 +12,21 @@
 
 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\Exception as SoapException;
-use BeSimple\SoapServer\SoapServerBuilder;
+
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAware;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
  * @author Francis Besset <francis.besset@gmail.com>
  */
-class SoapWebServiceController implements ContainerAwareInterface
+class SoapWebServiceController extends ContainerAware
 {
-    use ContainerAwareTrait;
-
     /**
      * @var \SoapServer
      */
@@ -58,22 +50,20 @@ 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);
-        $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
+        $this->soapServer  = $webServiceContext
             ->getServerBuilder()
-            ->withSoapVersion11()
             ->withHandler($this)
             ->build()
         ;
@@ -89,94 +79,32 @@ 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_call',
-                ['webservice' => $webservice],
+                array('webservice' => $webservice),
-                UrlGeneratorInterface::ABSOLUTE_URL
+                true
             )
         ));
 
-        /** @var Request $request */
+        $query = $this->container->get('request')->query;
-        $request = $this->container->get('request_stack')->getCurrentRequest();
+        if (!$query->has('wsdl') && !$query->has('WSDL')) {
-        $query = $request->query;
+            $this->container->get('request')->setRequestFormat('xml');
-        if ($query->has('wsdl') || $query->has('WSDL')) {
-            $request->setRequestFormat('wsdl');
         }
 
         return $response;
     }
 
-    /**
-     * Converts an Exception to a SoapFault Response.
-     *
-     * @param Request              $request   The request
-     * @param FlattenException     $exception A FlattenException instance
-     * @param DebugLoggerInterface $logger    A DebugLoggerInterface instance
-     *
-     * @return Response
-     *
-     * @throws \LogicException When the request query parameter "_besimple_soap_webservice" does not exist
-     */
-    public function exceptionAction(Request $request, FlattenException $exception, DebugLoggerInterface $logger = null)
-    {
-        if (!$webservice = $request->query->get('_besimple_soap_webservice')) {
-            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';
-        $code = $exception->getStatusCode();
-        $details = $this->container->get('twig')->render($view, [
-            'status_code' => $code,
-            'status_text' => isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '',
-            'exception' => $exception,
-            'logger' => $logger,
-        ]);
-
-        $handler = new ExceptionHandler($exception, $details);
-        if ($soapFault = $request->query->get('_besimple_soap_fault')) {
-            $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)
-            ->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>'
-        );
-
-        return new Response(ob_get_clean());
-    }
-
     /**
      * This method gets called once for every SOAP header the \SoapServer received
      * and afterwards once for the called SOAP operation.
      *
-     * @param string $method    The SOAP header or SOAP operation name
+     * @param string $method The SOAP header or SOAP operation name
-     * @param array  $arguments
+     * @param array $arguments
      *
      * @return mixed
      */
@@ -196,7 +124,13 @@ class SoapWebServiceController implements ContainerAwareInterface
             );
 
             // forward to controller
-            $response = $this->container->get('http_kernel')->handle($this->soapRequest, HttpKernelInterface::SUB_REQUEST, false);
+            try {
+                $response = $this->container->get('http_kernel')->handle($this->soapRequest, HttpKernelInterface::SUB_REQUEST, false);
+            } catch (\Exception $e) {
+                $this->soapResponse = new Response(null, 500);
+
+                throw $e instanceof \SoapFault || $this->container->getParameter('kernel.debug') ? $e : new SoapException\ReceiverSoapFault($e->getMessage());
+            }
 
             $this->setResponse($response);
 
@@ -233,7 +167,7 @@ class SoapWebServiceController implements ContainerAwareInterface
     }
 
     /**
-     * Set the SoapResponse.
+     * Set the SoapResponse
      *
      * @param Response $response A response to check and set
      *
@@ -250,7 +184,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/TypeRepository.php

@@ -12,6 +12,8 @@ namespace BeSimple\SoapBundle\Converter;
 
 use BeSimple\SoapBundle\ServiceDefinition\ServiceDefinition;
 use BeSimple\SoapBundle\Util\Assert;
+use BeSimple\SoapBundle\Util\QName;
+use BeSimple\SoapBundle\Util\String;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
@@ -48,7 +50,9 @@ class TypeRepository
 
     public function fixTypeInformation(ServiceDefinition $definition)
     {
-        foreach ($definition->getAllTypes() as $type) {
+        $typeMap = $this->defaultTypeMap;
+
+        foreach($definition->getAllTypes() as $type) {
             $phpType = $type->getPhpType();
             $xmlType = $type->getXmlType();
 
@@ -63,4 +67,4 @@ class TypeRepository
             $type->setXmlType($xmlType);
         }
     }
-}
+}

src/BeSimple/SoapBundle/Converter/XopIncludeTypeConverter.php

@@ -12,8 +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;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
@@ -40,7 +39,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();
@@ -53,4 +52,4 @@ class XopIncludeTypeConverter implements TypeConverterInterface
     {
         return $data;
     }
-}
+}

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.
@@ -60,12 +59,10 @@ class BeSimpleSoapExtension extends Extension
 
         $container->setParameter('besimple.soap.definition.dumper.options.stylesheet', $config['wsdl_dumper']['stylesheet']);
 
-        foreach ($config['services'] as $name => $serviceConfig) {
+        foreach($config['services'] as $name => $serviceConfig) {
             $serviceConfig['name'] = $name;
             $this->createWebServiceContext($serviceConfig, $container);
         }
-
-        $container->setParameter('besimple.soap.exception_listener.controller', $config['exception_controller']);
     }
 
     private function registerCacheConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
@@ -81,21 +78,17 @@ class BeSimpleSoapExtension extends Extension
 
     private function registerClientConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
-        if (3 === Kernel::MAJOR_VERSION) {
+        $loader->load('client.xml');
-            $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);
+            $context    = $container->setDefinition(sprintf('besimple.soap.client.builder.%s', $client), $definition);
 
             $definition->replaceArgument(0, $options['wsdl']);
 
             $defOptions = $container
-                ->getDefinition('besimple.soap.client.builder')
+                    ->getDefinition('besimple.soap.client.builder')
-                ->getArgument(1);
+                    ->getArgument(1);
 
             foreach (array('cache_type', 'user_agent') as $key) {
                 if (isset($options[$key])) {
@@ -103,31 +96,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);
 
-            $classmap = $this->createClientClassmap($client, $options['classmap'], $container);
+            if (!empty($options['classmap'])) {
-            $definition->replaceArgument(2, new Reference($classmap));
+                $classmap = $this->createClientClassmap($client, $options['classmap'], $container);
+                $definition->replaceArgument(2, new Reference($classmap));
+            } else {
+                $definition->replaceArgument(2, null);
+            }
 
             $this->createClient($client, $container);
         }
@@ -135,32 +115,22 @@ 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);
+        $context    = $container->setDefinition(sprintf('besimple.soap.classmap.%s', $client), $definition);
 
-        if (!empty($classmap)) {
+        $definition->setMethodCalls(array(
-            $definition->setMethodCalls(array(
+            array('set', array($classmap)),
-                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);
+        $context    = $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
 
-        if (Kernel::MAJOR_VERSION >= 3) {
+        $definition->setFactoryService(sprintf('besimple.soap.client.builder.%s', $client));
-            $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,8 +139,8 @@ 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);
+        $context    = $container->setDefinition($contextId, $definition);
 
         if (isset($config['cache_type'])) {
             $config['cache_type'] = $this->getCacheType($config['cache_type']);
@@ -178,10 +148,9 @@ class BeSimpleSoapExtension extends Extension
 
         $options = $container
             ->getDefinition('besimple.soap.context.'.$bindingSuffix)
-            ->setPublic(true)
+            ->getArgument(5);
-            ->getArgument(2);
 
-        $definition->replaceArgument(2, array_merge($options, $config));
+        $definition->replaceArgument(5, array_merge($options, $config));
     }
 
     private function getCacheType($type)

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.
@@ -41,12 +40,6 @@ class Configuration
         $this->addServicesSection($rootNode);
         $this->addWsdlDumperSection($rootNode);
 
-        $rootNode
-            ->children()
-                ->scalarNode('exception_controller')->defaultValue('BeSimpleSoapBundle:SoapWebService:exception')->end()
-            ->end()
-        ;
-
         return $treeBuilder->buildTree();
     }
 
@@ -86,37 +79,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/RequestFormatListener.php

@@ -2,6 +2,7 @@
 
 namespace BeSimple\SoapBundle\EventListener;
 
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 class RequestFormatListener

src/BeSimple/SoapBundle/EventListener/SoapExceptionListener.php

@@ -1,87 +0,0 @@
-<?php
-
-/*
- * This file is part of the BeSimpleSoapBundle.
- *
- * (c) Christian Kerl <christian-kerl@web.de>
- * (c) Francis Besset <francis.besset@gmail.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace BeSimple\SoapBundle\EventListener;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\EventListener\ExceptionListener;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * @author Francis Besset <francis.besset@gmail.com>
- */
-class SoapExceptionListener extends ExceptionListener
-{
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * To avoid conflict between , the logger param is not typed:
-     *  The parent class needs and instance of `Psr\Log\LoggerInterface` from Symfony 2.2,
-     *  before logger is an instance of `Symfony\Component\HttpKernel\Log\LoggerInterface`.
-     *
-     * @param ContainerInterface $container  A ContainerInterface instance
-     * @param string             $controller The controller name to call
-     * @param LoggerInterface    $logger     A logger instance
-     */
-    public function __construct(ContainerInterface $container, $controller, $logger)
-    {
-        parent::__construct($controller, $logger);
-
-        $this->container = $container;
-    }
-
-    public function onKernelException(GetResponseForExceptionEvent $event)
-    {
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
-            return;
-        }
-
-        $request = $event->getRequest();
-        if (!in_array($request->getRequestFormat(), array('soap', 'xml'))) {
-            return;
-        } elseif ('xml' === $request->getRequestFormat() && '_webservice_call' !== $request->attributes->get('_route')) {
-            return;
-        }
-
-        $attributes = $request->attributes;
-        if (!$webservice = $attributes->get('webservice')) {
-            return;
-        }
-
-        if (!$this->container->has(sprintf('besimple.soap.context.%s', $webservice))) {
-            return;
-        }
-
-        // 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

@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the BeSimpleSoapBundle.
- *
- * (c) Christian Kerl <christian-kerl@web.de>
- * (c) Francis Besset <francis.besset@gmail.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace BeSimple\SoapBundle\Handler;
-
-use BeSimple\SoapServer\Exception\ReceiverSoapFault;
-use Symfony\Component\Debug\Exception\FlattenException;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * @author Francis Besset <francis.besset@gmail.com>
- */
-class ExceptionHandler
-{
-    protected $exception;
-    protected $details;
-    protected $soapFault;
-
-    public function __construct(FlattenException $exception, $details = null)
-    {
-        $this->exception = $exception;
-        $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(
-            isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '',
-            null,
-            $this->details
-        );
-    }
-}

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

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

@@ -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/loaders.xml

@@ -29,13 +29,10 @@
         <service id="besimple.soap.definition.loader.annot_class" class="%besimple.soap.definition.loader.annot_class.class%" public="false">
             <tag name="besimple.soap.definition.loader" />
             <argument type="service" id="annotation_reader" />
-            <argument type="service" id="besimple.soap.type.repository" />
         </service>
 
         <service id="besimple.soap.definition.loader.annot_complextype" class="%besimple.soap.definition.loader.annot_complextype.class%" public="false">
-            <tag name="besimple.soap.definition.loader" />
             <argument type="service" id="annotation_reader" />
-            <argument type="service" id="besimple.soap.type.repository" />
         </service>
     </services>
 

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

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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">
+    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

@@ -6,7 +6,6 @@
     <parameters>
         <parameter key="besimple.soap.response.class">BeSimple\SoapBundle\Soap\SoapResponse</parameter>
         <parameter key="besimple.soap.response.listener.class">BeSimple\SoapBundle\EventListener\SoapResponseListener</parameter>
-        <parameter key="besimple.soap.exception_listener.class">BeSimple\SoapBundle\EventListener\SoapExceptionListener</parameter>
         <parameter key="besimple.soap.context.class">BeSimple\SoapBundle\WebServiceContext</parameter>
         <parameter key="besimple.soap.binder.request_header.rpcliteral.class">BeSimple\SoapBundle\ServiceBinding\RpcLiteralRequestHeaderMessageBinder</parameter>
         <parameter key="besimple.soap.binder.request.rpcliteral.class">BeSimple\SoapBundle\ServiceBinding\RpcLiteralRequestMessageBinder</parameter>
@@ -14,28 +13,24 @@
         <parameter key="besimple.soap.binder.request.documentwrapped.class">BeSimple\SoapBundle\ServiceBinding\DocumentLiteralWrappedRequestMessageBinder</parameter>
         <parameter key="besimple.soap.binder.request_header.documentwrapped.class">BeSimple\SoapBundle\ServiceBinding\DocumentLiteralWrappedRequestHeaderMessageBinder</parameter>
         <parameter key="besimple.soap.binder.response.documentwrapped.class">BeSimple\SoapBundle\ServiceBinding\DocumentLiteralWrappedResponseMessageBinder</parameter>
-        <parameter key="besimple.soap.type.repository.class">BeSimple\SoapCommon\Definition\Type\TypeRepository</parameter>
+        <parameter key="besimple.soap.definition.dumper.wsdl.rpcliteral.class">BeSimple\SoapBundle\ServiceDefinition\Dumper\WsdlDumper</parameter>
+        <parameter key="besimple.soap.type.repository.class">BeSimple\SoapBundle\Converter\TypeRepository</parameter>
         <parameter key="besimple.soap.server.classmap.class">BeSimple\SoapServer\Classmap</parameter>
     </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" />
             <argument type="service" id="besimple.soap.response" />
         </service>
 
-        <service id="besimple.soap.exception_listener" class="%besimple.soap.exception_listener.class%">
-            <tag name="kernel.event_subscriber" />
-            <tag name="monolog.logger" channel="request" />
-            <argument type="service" id="service_container" />
-            <argument>%besimple.soap.exception_listener.controller%</argument>
-            <argument type="service" id="logger" on-invalid="null" />
-        </service>
-
         <service id="besimple.soap.context.rpcliteral" class="%besimple.soap.context.class%" abstract="true">
             <argument type="service" id="besimple.soap.definition.loader" />
+            <argument type="service" id="besimple.soap.definition.dumper.wsdl.rpcliteral" />
+            <argument type="service" id="besimple.soap.server.classmap" />
+            <argument type="service" id="besimple.soap.type.repository" />
             <argument type="service" id="besimple.soap.converter.collection" />
             <argument type="collection">
                 <argument key="cache_dir">%besimple.soap.cache.dir%</argument>
@@ -44,13 +39,15 @@
                 <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>
 
         <service id="besimple.soap.context.documentwrapped" class="%besimple.soap.context.class%" abstract="true">
             <argument type="service" id="besimple.soap.definition.loader" />
+            <argument type="service" id="besimple.soap.definition.dumper.wsdl.documentwrapped" />
+            <argument type="service" id="besimple.soap.server.classmap" />
+            <argument type="service" id="besimple.soap.type.repository" />
             <argument type="service" id="besimple.soap.converter.collection" />
             <argument type="collection">
                 <argument key="cache_dir">%besimple.soap.cache.dir%</argument>
@@ -59,51 +56,49 @@
                 <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>
 
+        <service id="besimple.soap.definition.dumper.wsdl.rpcliteral" class="%besimple.soap.definition.dumper.wsdl.rpcliteral.class%">
+            <argument type="service" id="besimple.soap.definition.loader.annot_complextype" />
+            <argument type="service" id="besimple.soap.type.repository" />
+            <argument type="collection">
+                <argument key="stylesheet">%besimple.soap.definition.dumper.options.stylesheet%</argument>
+            </argument>
+        </service>
+
         <service id="besimple.soap.server.classmap" class="%besimple.soap.server.classmap.class%" public="false" />
 
         <service id="besimple.soap.type.repository" class="%besimple.soap.type.repository.class%">
-            <argument type="service" id="besimple.soap.server.classmap" />
             <call method="addXmlNamespace">
                 <argument>xsd</argument>
                 <argument>http://www.w3.org/2001/XMLSchema</argument>
             </call>
-            <call method="addType">
+            <call method="addDefaultTypeMapping">
                 <argument>string</argument>
                 <argument>xsd:string</argument>
             </call>
-            <call method="addType">
+            <call method="addDefaultTypeMapping">
                 <argument>boolean</argument>
                 <argument>xsd:boolean</argument>
             </call>
-            <call method="addType">
+            <call method="addDefaultTypeMapping">
                 <argument>int</argument>
                 <argument>xsd:int</argument>
             </call>
-            <call method="addType">
+            <call method="addDefaultTypeMapping">
                 <argument>float</argument>
                 <argument>xsd:float</argument>
             </call>
-            <call method="addType">
+            <call method="addDefaultTypeMapping">
                 <argument>date</argument>
                 <argument>xsd:date</argument>
             </call>
-            <call method="addType">
+            <call method="addDefaultTypeMapping">
                 <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::
+Coming soon.
-    :maxdepth: 1
-    :numbered:
-
-    soapclient/configuration

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;
+            $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;
         }
     }
 

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,26 +11,25 @@
 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) {
+        if(count($message) > 1) {
             throw new \InvalidArgumentException();
         }
 
-        $result = array();
+        $result  = array();
         $message = $message[0];
 
-        foreach ($messageDefinition->getInput()->all() as $argument) {
+        foreach($messageDefinition->getArguments() as $argument) {
-            $result[$argument->getName()] = $message;
+            $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

@@ -11,7 +11,6 @@
 namespace BeSimple\SoapBundle\ServiceBinding;
 
 use BeSimple\SoapBundle\ServiceDefinition\Method;
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
@@ -24,5 +23,5 @@ interface MessageBinderInterface
      *
      * @return mixed
      */
-    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository);
+    function processMessage(Method $messageDefinition, $message, array $definitionComplexTypes = array());
-}
+}

src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestHeaderMessageBinder.php

@@ -11,7 +11,6 @@
 namespace BeSimple\SoapBundle\ServiceBinding;
 
 use BeSimple\SoapBundle\ServiceDefinition\Method;
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 
 /**
  * @author Francis Besset <francis.besset@gmail.com>
@@ -25,11 +24,10 @@ class RpcLiteralRequestHeaderMessageBinder extends RpcLiteralRequestMessageBinde
         $this->header = $header;
     }
 
-    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository)
+    public function processMessage(Method $messageDefinition, $message, array $definitionComplexTypes = array())
     {
-        $this->typeRepository = $typeRepository;
         $headerDefinition = $messageDefinition->getHeaders()->get($this->header);
 
-        return $this->processType($headerDefinition->getType(), $message);
+        return $this->processType($headerDefinition->getType()->getPhpType(), $message, $definitionComplexTypes);
     }
-}
+}

src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestMessageBinder.php

@@ -13,9 +13,8 @@
 namespace BeSimple\SoapBundle\ServiceBinding;
 
 use BeSimple\SoapBundle\ServiceDefinition\Method;
-use BeSimple\SoapCommon\Definition\Type\ArrayOfType;
+use BeSimple\SoapBundle\ServiceDefinition\Strategy\MethodComplexType;
-use BeSimple\SoapCommon\Definition\Type\ComplexType;
+use BeSimple\SoapBundle\ServiceDefinition\Strategy\PropertyComplexType;
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 use BeSimple\SoapCommon\Util\MessageBinder;
 
 /**
@@ -24,20 +23,19 @@ use BeSimple\SoapCommon\Util\MessageBinder;
  */
 class RpcLiteralRequestMessageBinder implements MessageBinderInterface
 {
-    protected $typeRepository;
-
     private $messageRefs = array();
+    private $definitionComplexTypes;
 
-    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository)
+    public function processMessage(Method $messageDefinition, $message, array $definitionComplexTypes = array())
     {
-        $this->typeRepository = $typeRepository;
+        $this->definitionComplexTypes = $definitionComplexTypes;
 
         $result = array();
         $i      = 0;
 
-        foreach ($messageDefinition->getInput()->all() as $argument) {
+        foreach ($messageDefinition->getArguments() as $argument) {
             if (isset($message[$i])) {
-                $result[$argument->getName()] = $this->processType($argument->getType(), $message[$i]);
+                $result[$argument->getName()] = $this->processType($argument->getType()->getPhpType(), $message[$i]);
             }
 
             $i++;
@@ -50,18 +48,14 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
     {
         $isArray = false;
 
-        $type = $this->typeRepository->getType($phpType);
+        if (preg_match('/^([^\[]+)\[\]$/', $phpType, $match)) {
-        if ($type instanceof ArrayOfType) {
             $isArray = true;
-            $array = array();
+            $array   = array();
-
+            $phpType = $match[1];
-            $type = $this->typeRepository->getType($type->get('item')->getType());
         }
 
         // @TODO Fix array reference
-        if ($type instanceof ComplexType) {
+        if (isset($this->definitionComplexTypes[$phpType])) {
-            $phpType = $type->getPhpType();
-
             if ($isArray) {
                 if (isset($message->item)) {
                     foreach ($message->item as $complexType) {
@@ -104,16 +98,17 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
         $this->messageRefs[$hash] = $message;
 
         $messageBinder = new MessageBinder($message);
-        foreach ($this->typeRepository->getType($phpType)->all() as $type) {
+        foreach ($this->definitionComplexTypes[$phpType]['properties'] as $type) {
             $property = $type->getName();
             $value = $messageBinder->readProperty($property);
 
             if (null !== $value) {
-                $value = $this->processType($type->getType(), $value);
+                $value = $this->processType($type->getValue(), $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

@@ -13,9 +13,8 @@
 namespace BeSimple\SoapBundle\ServiceBinding;
 
 use BeSimple\SoapBundle\ServiceDefinition\Method;
-use BeSimple\SoapCommon\Definition\Type\ArrayOfType;
+use BeSimple\SoapBundle\ServiceDefinition\Strategy\PropertyComplexType;
-use BeSimple\SoapCommon\Definition\Type\ComplexType;
+use BeSimple\SoapBundle\ServiceDefinition\Strategy\MethodComplexType;
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 use BeSimple\SoapCommon\Util\MessageBinder;
 
 /**
@@ -24,34 +23,26 @@ use BeSimple\SoapCommon\Util\MessageBinder;
  */
 class RpcLiteralResponseMessageBinder implements MessageBinderInterface
 {
-    protected $typeRepository;
-
     private $messageRefs = array();
+    private $definitionComplexTypes;
 
-    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository)
+    public function processMessage(Method $messageDefinition, $message, array $definitionComplexTypes = array())
     {
-        $this->typeRepository = $typeRepository;
+        $this->definitionComplexTypes = $definitionComplexTypes;
 
-        $parts = $messageDefinition->getOutput()->all();
+        return $this->processType($messageDefinition->getReturn()->getPhpType(), $message);
-        $part = array_shift($parts);
-
-        return $this->processType($part->getType(), $message);
     }
 
     private function processType($phpType, $message)
     {
         $isArray = false;
 
-        $type = $this->typeRepository->getType($phpType);
+        if (preg_match('/^([^\[]+)\[\]$/', $phpType, $match)) {
-        if ($type instanceof ArrayOfType) {
             $isArray = true;
-
+            $phpType = $match[1];
-            $type = $this->typeRepository->getType($type->get('item')->getType());
         }
 
-        if ($type instanceof ComplexType) {
+        if (isset($this->definitionComplexTypes[$phpType])) {
-            $phpType = $type->getPhpType();
-
             if ($isArray) {
                 $array = array();
 
@@ -88,16 +79,16 @@ 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);
-        foreach ($this->typeRepository->getType($phpType)->all() as $type) {
+        foreach ($this->definitionComplexTypes[$phpType]['properties'] as $type) {
             $property = $type->getName();
             $value = $messageBinder->readProperty($property);
 
             if (null !== $value) {
-                $value = $this->processType($type->getType(), $value);
+                $value = $this->processType($type->getValue(), $value);
 
                 $messageBinder->writeProperty($property, $value);
             }

src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php

@@ -10,7 +10,8 @@
 
 namespace BeSimple\SoapBundle\ServiceBinding;
 
-use BeSimple\SoapBundle\ServiceDefinition\Definition;
+use BeSimple\SoapBundle\ServiceDefinition\Header;
+use BeSimple\SoapBundle\ServiceDefinition\ServiceDefinition;
 use BeSimple\SoapBundle\Soap\SoapHeader;
 
 /**
@@ -39,13 +40,12 @@ class ServiceBinder
     private $responseMessageBinder;
 
     /**
-     * @param Definition $definition
+     * @param ServiceDefinition $definition
      * @param MessageBinderInterface $requestHeaderMessageBinder
      * @param MessageBinderInterface $requestMessageBinder
      * @param MessageBinderInterface $responseMessageBinder
      */
-    public function __construct(Definition $definition, MessageBinderInterface $requestHeaderMessageBinder, MessageBinderInterface $requestMessageBinder, MessageBinderInterface $responseMessageBinder)
+    public function __construct(ServiceDefinition $definition, MessageBinderInterface $requestHeaderMessageBinder, MessageBinderInterface $requestMessageBinder, MessageBinderInterface $responseMessageBinder) {
-    {
         $this->definition = $definition;
 
         $this->requestHeaderMessageBinder = $requestHeaderMessageBinder;
@@ -62,7 +62,7 @@ class ServiceBinder
      */
     public function isServiceHeader($method, $header)
     {
-        return $this->definition->getMethod($method)->getHeader($header);
+        return $this->definition->getMethods()->get($method)->getHeaders()->has($header);
     }
 
     /**
@@ -72,7 +72,7 @@ class ServiceBinder
      */
     public function isServiceMethod($method)
     {
-        return null !== $this->definition->getMethod($method);
+        return $this->definition->getMethods()->has($method);
     }
 
     /**
@@ -84,11 +84,11 @@ class ServiceBinder
      */
     public function processServiceHeader($method, $header, $data)
     {
-        $methodDefinition = $this->definition->getMethod($method);
+        $methodDefinition = $this->definition->getMethods()->get($method);
-        $headerDefinition = $methodDefinition->getHeader($header);
+        $headerDefinition = $methodDefinition->getHeaders()->get($header);
 
         $this->requestHeaderMessageBinder->setHeader($header);
-        $data = $this->requestHeaderMessageBinder->processMessage($methodDefinition, $data, $this->definition->getTypeRepository());
+        $data = $this->requestHeaderMessageBinder->processMessage($methodDefinition, $data, $this->definition->getDefinitionComplexTypes());
 
         return new SoapHeader($this->definition->getNamespace(), $headerDefinition->getName(), $data);
     }
@@ -101,11 +101,11 @@ class ServiceBinder
      */
     public function processServiceMethodArguments($method, $arguments)
     {
-        $methodDefinition = $this->definition->getMethod($method);
+        $methodDefinition = $this->definition->getMethods()->get($method);
 
         return array_merge(
             array('_controller' => $methodDefinition->getController()),
-            $this->requestMessageBinder->processMessage($methodDefinition, $arguments, $this->definition->getTypeRepository())
+            $this->requestMessageBinder->processMessage($methodDefinition, $arguments, $this->definition->getDefinitionComplexTypes())
         );
     }
 
@@ -117,8 +117,8 @@ class ServiceBinder
      */
     public function processServiceMethodReturnValue($name, $return)
     {
-        $methodDefinition = $this->definition->getMethod($name);
+        $methodDefinition = $this->definition->getMethods()->get($name);
 
-        return $this->responseMessageBinder->processMessage($methodDefinition, $return, $this->definition->getTypeRepository());
+        return $this->responseMessageBinder->processMessage($methodDefinition, $return, $this->definition->getDefinitionComplexTypes());
     }
-}
+}

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,23 +49,8 @@ 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/Header.php

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

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

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

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

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

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

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

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

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

src/BeSimple/SoapBundle/ServiceDefinition/Argument.php

@@ -0,0 +1,43 @@
+<?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\ServiceDefinition;
+
+class Argument
+{
+    private $name;
+    private $type;
+
+    public function __construct($name = null, Type $type = null)
+    {
+        $this->setName($name);
+        $this->setType($type);
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    public function setType(Type $type)
+    {
+        $this->type = $type;
+    }
+}

src/BeSimple/SoapBundle/ServiceDefinition/ComplexType.php

@@ -1,10 +1,8 @@
 <?php
-
 /*
- * This file is part of the BeSimpleSoap.
+ * This file is part of the BeSimpleSoapBundle.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
- * (c) Francis Besset <francis.besset@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.
@@ -20,7 +18,6 @@ class ComplexType
     private $name;
     private $value;
     private $isNillable = false;
-    private $minOccurs = 1;
 
     public function getName()
     {
@@ -51,14 +48,4 @@ class ComplexType
     {
         $this->isNillable = (bool) $isNillable;
     }
-
+}
-    public function setMinOccurs($minOccurs)
-    {
-        $this->minOccurs = $minOccurs;
-    }
-
-    public function getMinOccurs()
-    {
-        return $this->minOccurs;
-    }
-}

src/BeSimple/SoapBundle/ServiceDefinition/Definition.php

@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of the BeSimpleSoap.
- *
- * (c) Christian Kerl <christian-kerl@web.de>
- * (c) Francis Besset <francis.besset@gmail.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace BeSimple\SoapBundle\ServiceDefinition;
-
-use BeSimple\SoapCommon\Definition\Definition as BaseDefinition;
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
-
-/**
- * @author Christian Kerl <christian-kerl@web.de>
- * @author Francis Besset <francis.besset@gmail.com>
- */
-class Definition extends BaseDefinition
-{
-    public function __construct(TypeRepository $typeRepository)
-    {
-        $this->typeRepository = $typeRepository;
-
-        $this->setOptions(array());
-    }
-
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function setNamespace($namespace)
-    {
-        $this->namespace = $namespace;
-
-        return $this;
-    }
-}

src/BeSimple/SoapBundle/ServiceDefinition/Dumper/DumperInterface.php

@@ -0,0 +1,18 @@
+<?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\ServiceDefinition\Dumper;
+
+use BeSimple\SoapBundle\ServiceDefinition\ServiceDefinition;
+
+interface DumperInterface
+{
+    function dumpServiceDefinition(ServiceDefinition $definition, $endpoint);
+}

src/BeSimple/SoapBundle/ServiceDefinition/Dumper/Wsdl.php

@@ -0,0 +1,80 @@
+<?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\ServiceDefinition\Dumper;
+
+use BeSimple\SoapBundle\Converter\TypeRepository;
+use BeSimple\SoapBundle\ServiceDefinition\Type;
+use Zend\Soap\Wsdl as BaseWsdl;
+
+/**
+ * @author Francis Besset <francis.besset@gmail.com>
+ */
+class Wsdl extends BaseWsdl
+{
+    private $typeRepository;
+
+    public function __construct(TypeRepository $typeRepository, $name, $uri, $strategy = true)
+    {
+        $this->typeRepository = $typeRepository;
+
+        parent::__construct($name, $uri, $strategy);
+    }
+
+    public function getType($type)
+    {
+        if ($type instanceof Type) {
+            return $type->getXmlType();
+        }
+
+        if ('\\' === $type[0]) {
+            $type = substr($type, 1);
+        }
+
+        if (!$xmlType = $this->typeRepository->getXmlTypeMapping($type)) {
+            $xmlType = $this->addComplexType($type);
+        }
+
+        return $xmlType;
+    }
+
+    /**
+     * Translate PHP type into WSDL QName
+     *
+     * @param string $type
+     * @return string QName
+     */
+    public function translateType($type)
+    {
+        if (isset($this->classMap[$type])) {
+            return $this->classMap[$type];
+        }
+
+        return str_replace('\\', '.', $type);
+    }
+
+    public function addBindingOperationHeader(\DOMElement $bindingOperation, array $headers, array $baseBinding)
+    {
+        foreach ($headers as $header) {
+            $inputNode  = $bindingOperation->getElementsByTagName('input')->item(0);
+
+            $headerNode = $this->toDomDocument()->createElement('soap:header');
+            $headerNode->setAttribute('part', $header);
+
+            foreach ($baseBinding as $name => $value) {
+                $headerNode->setAttribute($name, $value);
+            }
+
+            $inputNode->appendChild($headerNode);
+        }
+
+        return $bindingOperation;
+    }
+}

src/BeSimple/SoapBundle/ServiceDefinition/Dumper/WsdlDumper.php

@@ -0,0 +1,177 @@
+<?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\ServiceDefinition\Dumper;
+
+use BeSimple\SoapBundle\Converter\TypeRepository;
+use BeSimple\SoapBundle\ServiceDefinition\Method;
+use BeSimple\SoapBundle\ServiceDefinition\Type;
+use BeSimple\SoapBundle\ServiceDefinition\ServiceDefinition;
+use BeSimple\SoapBundle\ServiceDefinition\Loader\AnnotationComplexTypeLoader;
+use BeSimple\SoapBundle\Util\Assert;
+use BeSimple\SoapBundle\Util\QName;
+
+/**
+ * @author Christian Kerl <christian-kerl@web.de>
+ */
+class WsdlDumper implements DumperInterface
+{
+    private $loader;
+    private $typeRepository;
+    private $options;
+
+    private $wsdl;
+    private $definition;
+
+    public function __construct(AnnotationComplexTypeLoader $loader, TypeRepository $typeRepository, array $options)
+    {
+        $this->loader         = $loader;
+        $this->typeRepository = $typeRepository;
+        $this->options        = $options;
+    }
+
+    public function dumpServiceDefinition(ServiceDefinition $definition, $endpoint)
+    {
+        Assert::thatArgumentNotNull('definition', $definition);
+
+        $this->definition = $definition;
+        $this->wsdl       = new Wsdl($this->typeRepository, $definition->getName(), $definition->getNamespace(), new WsdlTypeStrategy($this->loader, $definition));
+        $port             = $this->wsdl->addPortType($this->getPortTypeName());
+        $binding          = $this->wsdl->addBinding($this->getBindingName(), $this->qualify($this->getPortTypeName()));
+
+        $this->wsdl->addSoapBinding($binding, 'rpc');
+        $this->wsdl->addService($this->getServiceName(), $this->getPortName(), $this->qualify($this->getBindingName()), $endpoint);
+
+        foreach ($definition->getMethods() as $method) {
+            $requestHeaderParts =
+            $requestParts       =
+            $responseParts      = array();
+
+            foreach ($method->getHeaders() as $header) {
+                $requestHeaderParts[$header->getName()] = $this->wsdl->getType($header->getType()->getPhpType());
+            }
+
+            foreach ($method->getArguments() as $argument) {
+                $requestParts[$argument->getName()] = $this->wsdl->getType($argument->getType()->getPhpType());
+            }
+
+            if ($method->getReturn() !== null) {
+                $responseParts['return'] = $this->wsdl->getType($method->getReturn()->getPhpType());
+            }
+
+            if (!empty($requestHeaderParts)) {
+                $this->wsdl->addMessage($this->getRequestHeaderMessageName($method), $requestHeaderParts);
+            }
+            $this->wsdl->addMessage($this->getRequestMessageName($method), $requestParts);
+            $this->wsdl->addMessage($this->getResponseMessageName($method), $responseParts);
+
+            $portOperation = $this->wsdl->addPortOperation(
+                $port,
+                $method->getName(),
+                $this->qualify($this->getRequestMessageName($method)),
+                $this->qualify($this->getResponseMessageName($method))
+            );
+
+            $baseBinding   =
+            $inputBinding  =
+            $outputBinding = array(
+                'use'           => 'literal',
+                'namespace'     => $definition->getNamespace(),
+                'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/',
+            );
+
+            if (!empty($requestParts)) {
+                $portOperation->setAttribute('parameterOrder', implode(' ', array_keys($requestParts)));
+
+                $inputBinding['parts'] = implode(' ', array_keys($requestParts));
+            }
+
+            if (!empty($responseParts)) {
+                $outputBinding['parts'] = implode(' ', array_keys($responseParts));
+            }
+
+            $bindingOperation = $this->wsdl->addBindingOperation(
+                $binding,
+                $method->getName(),
+                $inputBinding,
+                $outputBinding
+            );
+            $bindingOperation = $this->wsdl->addBindingOperationHeader(
+                $bindingOperation,
+                array_keys($requestHeaderParts),
+                array_merge(array('message' => $this->qualify($this->getRequestHeaderMessageName($method))), $baseBinding)
+            );
+
+            $this->wsdl->addSoapOperation($bindingOperation, $this->getSoapOperationName($method));
+        }
+
+        $this->definition = null;
+
+        $dom               = $this->wsdl->toDomDocument();
+        $dom->formatOutput = true;
+
+        if ($this->options['stylesheet']) {
+            $stylesheet = $dom->createProcessingInstruction('xml-stylesheet', sprintf('type="text/xsl" href="%s"', $this->options['stylesheet']));
+
+            $dom->insertBefore($stylesheet, $dom->documentElement);
+        }
+
+        return $this->wsdl->toXml();
+    }
+
+    protected function qualify($name, $namespace = null)
+    {
+        if($namespace === null) {
+            $namespace = $this->definition->getNamespace();
+        }
+
+        return $this->wsdl->toDomDocument()->lookupPrefix($namespace).':'.$name;
+    }
+
+    protected function getPortName()
+    {
+        return $this->definition->getName().'Port';
+    }
+
+    protected function getPortTypeName()
+    {
+        return $this->definition->getName().'PortType';
+    }
+
+    protected function getBindingName()
+    {
+        return $this->definition->getName().'Binding';
+    }
+
+    protected function getServiceName()
+    {
+        return $this->definition->getName().'Service';
+    }
+
+    protected function getRequestHeaderMessageName(Method $method)
+    {
+        return $method->getName().'Header';
+    }
+
+    protected function getRequestMessageName(Method $method)
+    {
+        return $method->getName().'Request';
+    }
+
+    protected function getResponseMessageName(Method $method)
+    {
+        return $method->getName().'Response';
+    }
+
+    protected function getSoapOperationName(Method $method)
+    {
+        return $this->definition->getNamespace().$method->getName();
+    }
+}

src/BeSimple/SoapBundle/ServiceDefinition/Dumper/WsdlTypeStrategy.php

@@ -0,0 +1,95 @@
+<?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\ServiceDefinition\Dumper;
+
+use BeSimple\SoapBundle\ServiceDefinition\ServiceDefinition;
+use BeSimple\SoapBundle\ServiceDefinition\Loader\AnnotationComplexTypeLoader;
+use BeSimple\SoapBundle\ServiceDefinition\Strategy\ComplexType;
+use BeSimple\SoapBundle\Util\String;
+
+use Zend\Soap\Exception;
+use Zend\Soap\Wsdl as BaseWsdl;
+use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface;
+use Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeSequence;
+
+class WsdlTypeStrategy implements ComplexTypeStrategyInterface
+{
+    /**
+     * Context WSDL file
+     *
+     * @var \Zend\Soap\Wsdl|null
+     */
+    private $context;
+
+    private $loader;
+    private $definition;
+
+    private $typeStrategy;
+    private $arrayStrategy;
+
+    public function __construct(AnnotationComplexTypeLoader $loader, ServiceDefinition $definition)
+    {
+        $this->loader     = $loader;
+        $this->definition = $definition;
+    }
+
+    /**
+     * Method accepts the current WSDL context file.
+     *
+     * @param \Zend\Soap\Wsdl $context
+     */
+    public function setContext(BaseWsdl $context)
+    {
+        $this->context = $context;
+
+        return $this;
+    }
+
+    /**
+     * Create a complex type based on a strategy
+     *
+     * @param  string $type
+     *
+     * @return string XSD type
+     *
+     * @throws \Zend\Soap\WsdlException
+     */
+    public function addComplexType($type)
+    {
+        if (!$this->context) {
+            throw new \LogicException(sprintf('Cannot add complex type "%s", no context is set for this composite strategy.', $type));
+        }
+
+        $strategy = String::endsWith($type, '[]') ? $this->getArrayStrategy() : $this->getTypeStrategy();
+
+        return $strategy->addComplexType($type);
+    }
+
+    private function getArrayStrategy()
+    {
+        if (!$this->arrayStrategy) {
+            $this->arrayStrategy = new ArrayOfTypeSequence();
+            $this->arrayStrategy->setContext($this->context);
+        }
+
+        return $this->arrayStrategy;
+    }
+
+    private function getTypeStrategy()
+    {
+        if (!$this->typeStrategy) {
+            $this->typeStrategy = new ComplexType($this->loader, $this->definition);
+            $this->typeStrategy->setContext($this->context);
+        }
+
+        return $this->typeStrategy;
+    }
+}

src/BeSimple/SoapBundle/ServiceDefinition/Header.php

@@ -0,0 +1,43 @@
+<?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\ServiceDefinition;
+
+class Header
+{
+    private $name;
+    private $type;
+
+    public function __construct($name = null, Type $type = null)
+    {
+        $this->setName($name);
+        $this->setType($type);
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    public function setType($type)
+    {
+        $this->type = $type;
+    }
+}

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

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the BeSimpleSoap.
+ * This file is part of the BeSimpleSoapBundle.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
  * (c) Francis Besset <francis.besset@gmail.com>
@@ -14,10 +14,11 @@ namespace BeSimple\SoapBundle\ServiceDefinition\Loader;
 
 use BeSimple\SoapBundle\ServiceDefinition as Definition;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation;
-use BeSimple\SoapCommon\Definition\Type\ComplexType;
+
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 use Doctrine\Common\Annotations\Reader;
+
 use Symfony\Component\Config\Loader\Loader;
+use Symfony\Component\Config\Loader\LoaderResolverInterface;
 
 /**
  * AnnotationClassLoader loads ServiceDefinition from a PHP class and its methods.
@@ -25,23 +26,19 @@ use Symfony\Component\Config\Loader\Loader;
  * Based on \Symfony\Component\Routing\Loader\AnnotationClassLoader
  *
  * @author Christian Kerl <christian-kerl@web.de>
- * @author Francis Besset <francis.besset@gmail.com>
  */
 class AnnotationClassLoader extends Loader
 {
     protected $reader;
 
-    protected $typeRepository;
-
     /**
      * Constructor.
      *
      * @param \Doctrine\Common\Annotations\Reader $reader
      */
-    public function __construct(Reader $reader, TypeRepository $typeRepository)
+    public function __construct(Reader $reader)
     {
         $this->reader = $reader;
-        $this->typeRepository = $typeRepository;
     }
 
     /**
@@ -61,26 +58,39 @@ class AnnotationClassLoader extends Loader
         }
 
         $class      = new \ReflectionClass($class);
-        $definition = new Definition\Definition($this->typeRepository);
+        $definition = new Definition\ServiceDefinition();
 
-        $sharedHeaders = array();
+        $serviceMethodHeaders = array();
         foreach ($this->reader->getClassAnnotations($class) as $annotation) {
             if ($annotation instanceof Annotation\Header) {
-                $sharedHeaders[$annotation->getValue()] = $this->loadType($annotation->getPhpType());
+                $serviceMethodHeaders[$annotation->getValue()] = $annotation;
             }
         }
 
         foreach ($class->getMethods() as $method) {
-            $serviceHeaders   = $sharedHeaders;
+            $serviceArguments =
-            $serviceArguments = array();
+            $serviceHeaders   = array();
             $serviceMethod    =
             $serviceReturn    = null;
 
+            foreach ($serviceMethodHeaders as $annotation) {
+                $serviceHeaders[$annotation->getValue()] = new Definition\Header(
+                    $annotation->getValue(),
+                    $this->getArgumentType($method, $annotation)
+                );
+            }
+
             foreach ($this->reader->getMethodAnnotations($method) as $annotation) {
                 if ($annotation instanceof Annotation\Header) {
-                    $serviceHeaders[$annotation->getValue()] = $this->loadType($annotation->getPhpType());
+                    $serviceHeaders[$annotation->getValue()] = new Definition\Header(
+                        $annotation->getValue(),
+                        $this->getArgumentType($method, $annotation)
+                    );
                 } elseif ($annotation instanceof Annotation\Param) {
-                    $serviceArguments[$annotation->getValue()] = $this->loadType($annotation->getPhpType());
+                    $serviceArguments[] = new Definition\Argument(
+                        $annotation->getValue(),
+                        $this->getArgumentType($method, $annotation)
+                    );
                 } elseif ($annotation instanceof Annotation\Method) {
                     if ($serviceMethod) {
                         throw new \LogicException(sprintf('@Soap\Method defined twice for "%s".', $method->getName()));
@@ -95,8 +105,7 @@ class AnnotationClassLoader extends Loader
                         throw new \LogicException(sprintf('@Soap\Result defined twice for "%s".', $method->getName()));
                     }
 
-                    $serviceReturn = $annotation->getPhpType();
+                    $serviceReturn = new Definition\Type($annotation->getPhpType(), $annotation->getXmlType());
-                    $serviceXmlReturn = $annotation->getXmlType();
                 }
             }
 
@@ -105,25 +114,16 @@ class AnnotationClassLoader extends Loader
             }
 
             if ($serviceMethod) {
-                foreach ($serviceHeaders as $name => $type) {
+                $serviceMethod->setArguments($serviceArguments);
-                    $serviceMethod->addHeader($name, $type);
+                $serviceMethod->setHeaders($serviceHeaders);
-                }
-
-                foreach ($serviceArguments as $name => $type) {
-                    $serviceMethod->addInput($name, $type);
-                }
 
                 if (!$serviceReturn) {
                     throw new \LogicException(sprintf('@Soap\Result non-existent for "%s".', $method->getName()));
                 }
 
-                if (!isset($serviceXmlReturn) || !$serviceXmlReturn) {
+                $serviceMethod->setReturn($serviceReturn);
-                    $serviceXmlReturn = 'return';
-                }
 
-                $serviceMethod->setOutput($this->loadType($serviceReturn), $serviceXmlReturn);
+                $definition->getMethods()->add($serviceMethod);
-
-                $definition->addMethod($serviceMethod);
             }
         }
 
@@ -138,35 +138,35 @@ class AnnotationClassLoader extends Loader
      */
     private function getController(\ReflectionClass $class, \ReflectionMethod $method, Annotation\Method $annotation)
     {
-        if (null !== $annotation->getService()) {
+        if(null !== $annotation->getService()) {
             return $annotation->getService() . ':' . $method->name;
         } else {
             return $class->name . '::' . $method->name;
         }
     }
 
-    private function loadType($phpType)
+    /**
+     * @param \ReflectionMethod $method
+     * @param \BeSimple\SoapBundle\ServiceDefinition\Annotation\Param $annotation
+     *
+     * @return \BeSimple\SoapBundle\ServiceDefinition\Type
+     */
+    private function getArgumentType(\ReflectionMethod $method, Annotation\Param $annotation)
     {
-        if (false !== $arrayOf = $this->typeRepository->getArrayOf($phpType)) {
+        $phpType = $annotation->getPhpType();
-            $this->loadType($arrayOf);
+        $xmlType = $annotation->getXmlType();
+
+        if (null === $phpType) {
+            foreach ($method->getParameters() as $param) {
+                if ($param->name === $annotation->getName()) {
+                    $phpType = $param->getClass()->name;
+
+                    break;
+                }
+            }
         }
 
-        if (!$this->typeRepository->hasType($phpType)) {
+        return new Definition\Type($phpType, $xmlType);
-            $complexTypeResolver = $this->resolve($phpType, 'annotation_complextype');
-            if (!$complexTypeResolver) {
-                throw new \Exception();
-            }
-
-            $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());
-            }
-
-            $this->typeRepository->addComplexType($complexType);
-        }
-
-        return $phpType;
     }
 
     /**

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

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the BeSimpleSoap.
+ * This file is part of the BeSimpleSoapBundle.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
  * (c) Francis Besset <francis.besset@gmail.com>
@@ -24,7 +24,7 @@ use BeSimple\SoapBundle\Util\Collection;
  */
 class AnnotationComplexTypeLoader extends AnnotationClassLoader
 {
-    private $aliasClass = 'BeSimple\SoapBundle\ServiceDefinition\Annotation\Alias';
+    private $aliasClass       = 'BeSimple\SoapBundle\ServiceDefinition\Annotation\Alias';
     private $complexTypeClass = 'BeSimple\SoapBundle\ServiceDefinition\Annotation\ComplexType';
 
     /**
@@ -43,7 +43,7 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
             throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
         }
 
-        $annotations = [];
+        $annotations = array();
 
         $class = new \ReflectionClass($class);
         if ($alias = $this->reader->getClassAnnotation($class, $this->aliasClass)) {
@@ -59,24 +59,10 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
                 $propertyComplexType->setValue($complexType->getValue());
                 $propertyComplexType->setNillable($complexType->isNillable());
                 $propertyComplexType->setName($property->getName());
-                $propertyComplexType->setMinOccurs($complexType->getMinOccurs());
                 $annotations['properties']->add($propertyComplexType);
             }
         }
 
         return $annotations;
     }
-
-    /**
-     * Returns true if this class supports the given resource.
-     *
-     * @param mixed  $resource A resource
-     * @param string $type     The resource type
-     *
-     * @return bool True if this class supports the given resource, false otherwise
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && class_exists($resource) && 'annotation_complextype' === $type;
-    }
 }

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

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the BeSimpleSoap.
+ * This file is part of the BeSimpleSoapBundle.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
  * (c) Francis Besset <francis.besset@gmail.com>
@@ -16,6 +16,7 @@ use BeSimple\SoapBundle\ServiceDefinition\ServiceDefinition;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\FileLoader;
+use Symfony\Component\Config\Resource\FileResource;
 
 /**
  * AnnotationFileLoader loads ServiceDefinition from annotations set
@@ -61,7 +62,7 @@ class AnnotationFileLoader extends FileLoader
         $path = $this->locator->locate($file);
 
         if ($class = $this->findClass($path)) {
-            return $this->loader->load($class, $type);
+            return $definition = $this->loader->load($class, $type);
         }
 
         return null;

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

@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the BeSimpleSoapBundle.
+ *
+ * (c) Christian Kerl <christian-kerl@web.de>
+ * (c) Francis Besset <francis.besset@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace BeSimple\SoapBundle\ServiceDefinition\Loader;
+
+use BeSimple\SoapBundle\ServiceDefinition\Argument;
+use BeSimple\SoapBundle\ServiceDefinition\Header;
+use BeSimple\SoapBundle\ServiceDefinition\Method;
+use BeSimple\SoapBundle\ServiceDefinition\Type;
+use BeSimple\SoapBundle\ServiceDefinition\ServiceDefinition;
+
+use Symfony\Component\Config\Loader\FileLoader;
+
+class XmlFileLoader extends FileLoader
+{
+    public function supports($resource, $type = null)
+    {
+        return is_string($resource) && 'xml' === pathinfo($resource, PATHINFO_EXTENSION);
+    }
+
+    public function load($file, $type = null)
+    {
+        $path = $this->locator->locate($file);
+        $xml  = $this->parseFile($path);
+
+        $definition = new ServiceDefinition();
+        $definition->setName((string) $xml['name']);
+        $definition->setNamespace((string) $xml['namespace']);
+
+        foreach($xml->header as $header) {
+            $definition->getHeaders()->add($this->parseHeader($header));
+        }
+
+        foreach($xml->method as $method) {
+            $definition->getMethods()->add($this->parseMethod($method));
+        }
+
+        return $definition;
+    }
+
+    /**
+     * @param \SimpleXMLElement $node
+     *
+     * @return \BeSimple\SoapBundle\ServiceDefinition\Header
+     */
+    protected function parseHeader(\SimpleXMLElement $node)
+    {
+        return new Header((string)$node['name'], $this->parseType($node->type));
+    }
+
+    /**
+     * @param \SimpleXMLElement $node
+     *
+     * @return \BeSimple\SoapBundle\ServiceDefinition\Method
+     */
+    protected function parseMethod(\SimpleXMLElement $node)
+    {
+        $method = new Method((string)$node['name'], (string)$node['controller']);
+
+        foreach($node->argument as $argument) {
+            $method->getArguments()->add($this->parseArgument($argument));
+        }
+
+        $method->setReturn($this->parseType($node->return->type));
+
+        return $method;
+    }
+
+    /**
+     * @param \SimpleXMLElement $node
+     *
+     * @return \BeSimple\SoapBundle\ServiceDefinition\Argument
+     */
+    protected function parseArgument(\SimpleXMLElement $node)
+    {
+        $argument = new Argument((string)$node['name'], $this->parseType($node->type));
+
+        return $argument;
+    }
+
+    /**
+     * @param \SimpleXMLElement $node
+     *
+     * @return \BeSimple\SoapBundle\ServiceDefinition\Type
+     */
+    protected function parseType(\SimpleXMLElement $node)
+    {
+        $namespaces = $node->getDocNamespaces(true);
+        $qname      = explode(':', $node['xml-type'], 2);
+        $xmlType    = sprintf('{%s}%s', $namespaces[$qname[0]], $qname[1]);
+
+        return new Type((string)$node['php-type'], $xmlType, (string)$node['converter']);
+    }
+
+    /**
+     * @param  string $file
+     *
+     * @return \SimpleXMLElement
+     */
+    protected function parseFile($file)
+    {
+        $dom = new \DOMDocument();
+        libxml_use_internal_errors(true);
+        if (!$dom->load($file, LIBXML_COMPACT)) {
+            throw new \InvalidArgumentException(implode("\n", $this->getXmlErrors()));
+        }
+        if (!$dom->schemaValidate(__DIR__.'/schema/servicedefinition-1.0.xsd')) {
+            throw new \InvalidArgumentException(implode("\n", $this->getXmlErrors()));
+        }
+        $dom->validateOnParse = true;
+        $dom->normalizeDocument();
+        libxml_use_internal_errors(false);
+
+        return simplexml_import_dom($dom);
+    }
+
+    protected function getXmlErrors()
+    {
+        $errors = array();
+        foreach (libxml_get_errors() as $error) {
+            $errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
+                LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
+                $error->code,
+                trim($error->message),
+                $error->file ? $error->file : 'n/a',
+                $error->line,
+                $error->column
+            );
+        }
+
+        libxml_clear_errors();
+        libxml_use_internal_errors(false);
+
+        return $errors;
+    }
+}

src/BeSimple/SoapBundle/ServiceDefinition/Method.php

@@ -1,10 +1,8 @@
 <?php
-
 /*
- * This file is part of the BeSimpleSoap.
+ * This file is part of the BeSimpleSoapBundle.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
- * (c) Francis Besset <francis.besset@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.
@@ -12,22 +10,36 @@
 
 namespace BeSimple\SoapBundle\ServiceDefinition;
 
-use BeSimple\SoapCommon\Definition\Method as BaseMethod;
+use BeSimple\SoapBundle\Util\Collection;
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
 
-/**
+class Method
- * @author Christian Kerl <christian-kerl@web.de>
- * @author Francis Besset <francis.besset@gmail.com>
- */
-class Method extends BaseMethod
 {
+    private $name;
     private $controller;
+    private $arguments;
+    private $headers;
+    private $return;
 
-    public function __construct($name, $controller)
+    public function __construct($name = null, $controller = null, array $headers = array(), array $arguments = array(), Type $return = null)
     {
-        parent::__construct($name);
+        $this->setName($name);
+        $this->setController($controller);
+        $this->setHeaders($headers);
+        $this->setArguments($arguments);
 
-        $this->controller = $controller;
+        if ($return) {
+            $this->setReturn($return);
+        }
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
     }
 
     public function getController()
@@ -35,8 +47,40 @@ class Method extends BaseMethod
         return $this->controller;
     }
 
-    public function getVersions()
+    public function setController($controller)
     {
-        return array(\SOAP_1_1);
+        $this->controller = $controller;
     }
-}
+
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    public function setHeaders(array $headers)
+    {
+        $this->headers = new Collection('getName', 'BeSimple\SoapBundle\ServiceDefinition\Header');
+        $this->headers->addAll($headers);
+    }
+
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->arguments = new Collection('getName', 'BeSimple\SoapBundle\ServiceDefinition\Argument');
+        $this->arguments->addAll($arguments);
+    }
+
+    public function getReturn()
+    {
+        return $this->return;
+    }
+
+    public function setReturn(Type $return)
+    {
+        $this->return = $return;
+    }
+}

src/BeSimple/SoapBundle/ServiceDefinition/ServiceDefinition.php

@@ -0,0 +1,151 @@
+<?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\ServiceDefinition;
+
+use BeSimple\SoapBundle\Util\Collection;
+use BeSimple\SoapCommon\Classmap;
+
+class ServiceDefinition
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $namespace;
+
+    /**
+     * @var \BeSimple\SoapBundle\Util\Collection
+     */
+    private $methods;
+
+    /**
+     * @var \BeSimple\SoapCommon\Classmap
+     */
+    private $classmap;
+
+    private $complexTypes = array();
+
+    public function __construct($name = null, $namespace = null, array $methods = array(), Classmap $classmap = null)
+    {
+        $this->setName($name);
+        $this->setNamespace($namespace);
+
+        $this->methods = new Collection('getName', 'BeSimple\SoapBundle\ServiceDefinition\Method');
+        $this->setMethods($methods);
+
+        $this->classmap = $classmap;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->namespace;
+    }
+
+    /**
+     * @param string $namespace
+     */
+    public function setNamespace($namespace)
+    {
+        $this->namespace = $namespace;
+    }
+
+    /**
+     * @return \BeSimple\SoapBundle\Util\Collection
+     */
+    public function getMethods()
+    {
+        return $this->methods;
+    }
+
+    /**
+     * @param array $methods
+     */
+    public function setMethods(array $methods)
+    {
+        $this->methods->addAll($methods);
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllTypes()
+    {
+        $types = array();
+
+        foreach ($this->methods as $method) {
+            foreach ($method->getArguments() as $argument) {
+                $types[] = $argument->getType();
+            }
+
+            foreach ($method->getHeaders() as $header) {
+                $types[] = $header->getType();
+            }
+
+            $types[] = $method->getReturn();
+        }
+
+        return $types;
+    }
+
+    public function getClassmap()
+    {
+        return $this->classmap ?: array();
+    }
+
+    public function setClassmap(Classmap $classmap)
+    {
+        $this->classmap = $classmap;
+    }
+
+    public function hasDefinitionComplexType($type)
+    {
+        return isset($this->complexTypes[$type]);
+    }
+
+    public function addDefinitionComplexType($type, array $definition)
+    {
+        if ($this->hasDefinitionComplexType($type)) {
+            return false;
+        }
+
+        $this->complexTypes[$type] = $definition;
+
+        return true;
+    }
+
+    public function getDefinitionComplexTypes()
+    {
+        return $this->complexTypes;
+    }
+}

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

@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the BeSimpleSoapBundle.
+ *
+ * (c) Christian Kerl <christian-kerl@web.de>
+ * (c) Francis Besset <francis.besset@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace BeSimple\SoapBundle\ServiceDefinition\Strategy;
+
+use BeSimple\SoapBundle\ServiceDefinition\Loader\AnnotationComplexTypeLoader;
+use Zend\Soap\Wsdl;
+use Zend\Soap\Wsdl\ComplexTypeStrategy\AbstractComplexTypeStrategy;
+
+/**
+ * @author Francis Besset <francis.besset@gmail.com>
+ */
+class ComplexType extends AbstractComplexTypeStrategy
+{
+    private $loader;
+    private $definition;
+
+    public function __construct(AnnotationComplexTypeLoader $loader, $definition)
+    {
+        $this->loader     = $loader;
+        $this->definition = $definition;
+    }
+
+    /**
+     * Add a complex type by recursivly using all the class properties fetched via Reflection.
+     *
+     * @param  string $type Name of the class to be specified
+     * @return string XSD Type for the given PHP type
+     */
+    public function addComplexType($classname)
+    {
+        $classmap = $this->definition->getClassmap();
+        if ($classmap->hasByClassname($classname)) {
+            return 'tns:'.$classmap->getByClassname($classname);
+        }
+
+        if (!$this->loader->supports($classname)) {
+            throw new \InvalidArgumentException(sprintf('Cannot add ComplexType "%s" because it is not an object or the class could not be found.', $classname));
+        }
+
+        $definitionComplexType = $this->loader->load($classname);
+        $classnameAlias        = isset($definitionComplexType['alias']) ? $definitionComplexType['alias'] : $classname;
+
+        $type = $this->getContext()->translateType($classnameAlias);
+        $xmlType = 'tns:'.$type;
+
+        // Register type here to avoid recursion
+        $classmap->add($type, $classname);
+        $this->addXmlDefinition($definitionComplexType, $classname, $type);
+
+        return $xmlType;
+    }
+
+    private function addXmlDefinition(array $definitionComplexType, $classname, $type)
+    {
+        $dom = $this->getContext()->toDomDocument();
+        $complexType = $dom->createElement('xsd:complexType');
+        $complexType->setAttribute('name', $type);
+
+        $all = $dom->createElement('xsd:all');
+
+        $elements = array();
+        foreach ($definitionComplexType['properties'] as $property) {
+            $element = $dom->createElement('xsd:element');
+            $element->setAttribute('name', $property->getName());
+            $element->setAttribute('type', $this->getContext()->getType($property->getValue()));
+
+            if ($property->isNillable()) {
+                $element->setAttribute('nillable', 'true');
+            }
+
+            $all->appendChild($element);
+        }
+
+        $complexType->appendChild($all);
+        $this->getContext()->getSchema()->appendChild($complexType);
+
+        $this->definition->addDefinitionComplexType($classname, $definitionComplexType);
+    }
+}

src/BeSimple/SoapBundle/ServiceDefinition/Type.php

@@ -0,0 +1,60 @@
+<?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\ServiceDefinition;
+
+class Type
+{
+    private $phpType;
+    private $xmlType;
+    private $converter;
+
+    public function __construct($phpType = null, $xmlType = null, $converter = null)
+    {
+        $this->setPhpType($phpType);
+        $this->setXmlType($xmlType);
+        $this->setConverter($converter);
+    }
+
+    public function getPhpType()
+    {
+        return $this->phpType;
+    }
+
+    public function setPhpType($phpType)
+    {
+        $phpType = $phpType;
+        if ($phpType[0] == '\\') {
+            $phpType = substr($phpType, 1);
+        }
+
+        $this->phpType = $phpType;
+    }
+
+    public function getXmlType()
+    {
+        return $this->xmlType;
+    }
+
+    public function setXmlType($xmlType)
+    {
+        $this->xmlType = $xmlType;
+    }
+
+    public function getConverter()
+    {
+        return $this->converter;
+    }
+
+    public function setConverter($converter)
+    {
+        $this->converter = $converter;
+    }
+}

src/BeSimple/SoapBundle/Soap/SoapRequest.php

@@ -11,8 +11,11 @@
 namespace BeSimple\SoapBundle\Soap;
 
 use BeSimple\SoapBundle\Util\Collection;
+
 use Symfony\Component\HttpFoundation\Request;
-use Laminas\Mime\Message;
+
+use Zend\Mime\Mime;
+use Zend\Mime\Message;
 
 /**
  * SoapRequest.
@@ -69,7 +72,7 @@ class SoapRequest extends Request
      */
     public function getSoapMessage()
     {
-        if (null === $this->soapMessage) {
+        if(null === $this->soapMessage) {
             $this->soapMessage = $this->initializeSoapMessage();
         }
 
@@ -88,12 +91,12 @@ class SoapRequest extends Request
 
     protected function initializeSoapMessage()
     {
-        if ($this->server->has('CONTENT_TYPE')) {
+        if($this->server->has('CONTENT_TYPE')) {
             $type = $this->splitContentTypeHeader($this->server->get('CONTENT_TYPE'));
 
-            switch ($type['_type']) {
+            switch($type['_type']) {
                 case 'multipart/related':
-                    if ($type['type'] == 'application/xop+xml') {
+                    if($type['type'] == 'application/xop+xml') {
                         return $this->initializeMtomSoapMessage($type, $this->getContent());
                     } else {
                         //log error
@@ -114,7 +117,7 @@ class SoapRequest extends Request
 
     protected function initializeMtomSoapMessage(array $contentTypeHeader, $content)
     {
-        if (!isset($contentTypeHeader['start']) || !isset($contentTypeHeader['start-info']) || !isset($contentTypeHeader['boundary'])) {
+        if(!isset($contentTypeHeader['start']) || !isset($contentTypeHeader['start-info']) || !isset($contentTypeHeader['boundary'])) {
             throw new \InvalidArgumentException();
         }
 
@@ -129,11 +132,11 @@ class SoapRequest extends Request
 
         // TODO: add more checks to achieve full compatibility to MTOM spec
         // http://www.w3.org/TR/soap12-mtom/
-        if ($rootPart->id != $soapMimePartId || $rootPartType['_type'] != 'application/xop+xml' || $rootPartType['type'] != $soapMimePartType) {
+        if($rootPart->id != $soapMimePartId || $rootPartType['_type'] != 'application/xop+xml' || $rootPartType['type'] != $soapMimePartType) {
             throw new \InvalidArgumentException();
         }
 
-        foreach ($mimeParts as $mimePart) {
+        foreach($mimeParts as $mimePart) {
             $this->soapAttachments->add(new SoapAttachment(
                 $mimePart->id,
                 $mimePart->type,
@@ -153,7 +156,7 @@ class SoapRequest extends Request
 
         $result['_type'] = array_shift($parts);
 
-        foreach ($parts as $part) {
+        foreach($parts as $part) {
             list($key, $value) = explode('=', trim($part), 2);
 
             $result[$key] = trim($value, '"');

src/BeSimple/SoapBundle/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);
-
+        $result = $messageBinder->processMessage(
-        $this->setExpectedException('SoapFault');
+            new Definition\Method('complextype_argument', null, array(), array(
-        $messageBinder->processMessage(
+                new Definition\Argument('foo', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo')),
-            $method,
+            )),
             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');
+        $definitionComplexTypes = array();
-        $foo->add('foo', 'string');
-        $foo->add('bar', 'int');
-        $typeRepository->addComplexType($foo);
 
-        $bar = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar', 'Bar');
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo'] = $this->createComplexTypeCollection(array(
-        $bar->add('foo', 'string');
+            array('foo', 'string'),
-        $bar->add('bar', 'int', true);
+            array('bar', 'int'),
-        $typeRepository->addComplexType($bar);
+        ));
 
-        $fooBar = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar', 'FooBar');
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar'] = $this->createComplexTypeCollection(array(
-        $fooBar->add('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo');
+            array('foo', 'string'),
-        $fooBar->add('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar');
+            array('bar', 'int', true),
-        $typeRepository->addComplexType($fooBar);
+        ));
 
-        $simpleArrays = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays', 'SimpleArrays');
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar'] = $this->createComplexTypeCollection(array(
-        $simpleArrays->add('array1', 'string[]', true);
+            array('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo'),
-        $simpleArrays->add('array2', 'string[]');
+            array('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar'),
-        $simpleArrays->add('array3', 'string[]');
+        ));
-        $typeRepository->addComplexType($simpleArrays);
 
-        $fooRecursive = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive', 'FooRecursive');
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays'] = $this->createComplexTypeCollection(array(
-        $fooRecursive->add('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive');
+            array('array1', 'string[]', true),
-        $typeRepository->addComplexType($fooRecursive);
+            array('array2', 'string[]'),
+            array('array3', 'string[]'),
+        ));
 
-        $barRecursive = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive', 'BarRecursive');
+        $definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive'] = $this->createComplexTypeCollection(array(
-        $barRecursive->add('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive');
+            array('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive'),
-        $typeRepository->addComplexType($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/Assert.php

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

src/BeSimple/SoapBundle/Util/Collection.php

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

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.
@@ -27,7 +27,7 @@ class BsString
      */
     public static function startsWith($str, $substr)
     {
-        if (is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
+        if(is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
             return $substr == substr($str, 0, strlen($substr));
         }
     }
@@ -42,8 +42,8 @@ class BsString
      */
     public static function endsWith($str, $substr)
     {
-        if (is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
+        if(is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
             return $substr == substr($str, strlen($str) - strlen($substr));
         }
     }
-}
+}

src/BeSimple/SoapBundle/WebServiceContext.php

@@ -3,7 +3,6 @@
  * This file is part of the BeSimpleSoapBundle.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
- * (c) Francis Besset <francis.besset@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.
@@ -11,10 +10,15 @@
 
 namespace BeSimple\SoapBundle;
 
+use BeSimple\SoapBundle\Converter\TypeRepository;
+use BeSimple\SoapBundle\ServiceBinding\MessageBinderInterface;
 use BeSimple\SoapBundle\ServiceBinding\ServiceBinder;
+use BeSimple\SoapBundle\ServiceDefinition\Dumper\DumperInterface;
+
+use BeSimple\SoapCommon\Classmap;
 use BeSimple\SoapCommon\Converter\TypeConverterCollection;
-use BeSimple\SoapWsdl\Dumper\Dumper;
 use BeSimple\SoapServer\SoapServerBuilder;
+
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
@@ -22,29 +26,43 @@ use Symfony\Component\Config\Loader\LoaderInterface;
  * WebServiceContext.
  *
  * @author Christian Kerl <christian-kerl@web.de>
- * @author Francis Besset <francis.besset@gmail.com>
  */
 class WebServiceContext
 {
+    private $classmap;
+
+    private $typeRepository;
+    private $converterRepository;
+
+    private $wsdlFileDumper;
+
     private $options;
 
     private $serviceDefinition;
     private $serviceBinder;
     private $serverBuilder;
 
-    public function __construct(LoaderInterface $loader, TypeConverterCollection $converters, array $options)
+    public function __construct(LoaderInterface $loader, DumperInterface $dumper, Classmap $classmap, TypeRepository $typeRepository, TypeConverterCollection $converters, array $options)
     {
-        $this->loader = $loader;
+        $this->loader         = $loader;
-        $this->converters = $converters;
+        $this->wsdlFileDumper = $dumper;
-        $this->options = $options;
+
+        $this->classmap       = $classmap;
+
+        $this->typeRepository = $typeRepository;
+        $this->converters     = $converters;
+
+        // Issue #6: keep the debug because the cache is invalid
+        $options['debug']     = true;
+        $this->options        = $options;
     }
 
     public function getServiceDefinition()
     {
         if (null === $this->serviceDefinition) {
-            $cache = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
+            $cacheDefinition = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
-            if ($cache->isFresh()) {
+            if ($cacheDefinition->isFresh()) {
-                $this->serviceDefinition = include $cache->getPath();
+                $this->serviceDefinition = include (string) $cacheDefinition;
             } 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']));
@@ -54,7 +72,10 @@ class WebServiceContext
                 $this->serviceDefinition->setName($this->options['name']);
                 $this->serviceDefinition->setNamespace($this->options['namespace']);
 
-                $cache->write('<?php return unserialize('.var_export(serialize($this->serviceDefinition), true).');');
+                $this->serviceDefinition->setClassmap($this->classmap);
+                $this->classmap = null;
+
+                $this->typeRepository->fixTypeInformation($this->serviceDefinition);
             }
         }
 
@@ -69,20 +90,18 @@ class WebServiceContext
     public function getWsdlFile($endpoint = null)
     {
         $file      = sprintf('%s/%s.%s.wsdl', $this->options['cache_dir'], $this->options['name'], md5($endpoint));
-        $cache = new ConfigCache($file, $this->options['debug']);
+        $cacheWsdl = new ConfigCache($file, $this->options['debug']);
 
-        if (!$cache->isFresh()) {
+        if(!$cacheWsdl->isFresh()) {
-            $definition = $this->getServiceDefinition();
+            $serviceDefinition = $this->getServiceDefinition();
 
-            if ($endpoint) {
+            $cacheWsdl->write($this->wsdlFileDumper->dumpServiceDefinition($serviceDefinition, $endpoint));
-                $definition->setOption('location', $endpoint);
-            }
 
-            $dumper = new Dumper($definition, array('stylesheet' => $this->options['wsdl_stylesheet']));
+            $cacheDefinition = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
-            $cache->write($dumper->dump());
+            $cacheDefinition->write('<?php return unserialize('.var_export(serialize($serviceDefinition), true).');');
         }
 
-        return $cache->getPath();
+        return (string) $cacheWsdl;
     }
 
     public function getServiceBinder()
@@ -104,7 +123,7 @@ class WebServiceContext
         if (null === $this->serverBuilder) {
             $this->serverBuilder = SoapServerBuilder::createWithDefaults()
                 ->withWsdl($this->getWsdlFile())
-                ->withClassmap($this->getServiceDefinition()->getTypeRepository()->getClassmap())
+                ->withClassmap($this->getServiceDefinition()->getClassmap())
                 ->withTypeConverters($this->converters)
             ;
 

src/BeSimple/SoapBundle/composer.json

@@ -22,24 +22,25 @@
     "require": {
         "php": ">=5.3.0",
         "ext-soap": "*",
-        "besimple/soap-common": "0.2.*",
+        "besimple/soap-common": "0.1.*",
-        "besimple/soap-wsdl": "0.2.*",
+        "ass/xmlsecurity": "dev-master",
-        "ass/xmlsecurity": "~1.0",
+        "zendframework/zend-mail": "2.1.*",
-        "symfony/framework-bundle": "~2.0|~3.0",
+        "zendframework/zend-mime": "2.1.*",
-        "symfony/twig-bundle": "~2.0|~3.0",
+        "zendframework/zend-soap": "2.1.*",
-        "zendframework/zend-mime": "2.1.*"
+        "symfony/framework-bundle": "~2.0"
     },
     "suggest": {
-        "besimple/soap-client": "0.2.*",
+        "besimple/soap-client": "0.1.*",
-        "besimple/soap-server": "0.2.*"
+        "besimple/soap-server": "0.1.*"
     },
     "autoload": {
         "psr-0": { "BeSimple\\SoapBundle": "" }
     },
     "target-dir": "BeSimple/SoapBundle",
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2-dev"
+            "dev-master": "0.1-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');
         }
-
+        if (isset($options['connection_timeout'])) {
-        curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, 10);
+            curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, $options['connection_timeout']);
-
+        }
-        if (isset($options['proxy_host'])) {
+        if (isset($options['proxy_host'])) {
-            if (false !== $options['proxy_host']) {
+            $port = isset($options['proxy_port']) ? $options['proxy_port'] : 8080;
-                $proxyHost = $options['proxy_host'].(isset($options['proxy_port']) ? $options['proxy_port'] : 8080);
+            curl_setopt($this->ch, CURLOPT_PROXY, $options['proxy_host'] . ':' . $port);
-            } else {
+        }
-                $proxyHost = false;
+        if (isset($options['proxy_user'])) {
-            }
+            curl_setopt($this->ch, CURLOPT_PROXYUSERPWD, $options['proxy_user'] . ':' . $options['proxy_password']);
-
-            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['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,11 +128,7 @@ class Curl
             curl_setopt($this->ch, CURLOPT_HTTPHEADER, $requestHeaders);
         }
 
-        if (count($requestOptions) > 0) {
+        $this->response = $this->execManualRedirect($this->followLocationMaxRedirects);
-            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;
         }
@@ -191,7 +170,7 @@ class Curl
                 if (!isset($url['path'])) {
                     $url['path'] = $lastUrl['path'];
                 }
-                $newUrl = $url['scheme'].'://'.$url['host'].$url['path'].($url['query'] ? '?'.$url['query'] : '');
+                $newUrl = $url['scheme'] . '://' . $url['host'] . $url['path'] . ($url['query'] ? '?' . $url['query'] : '');
                 curl_setopt($this->ch, CURLOPT_URL, $newUrl);
 
                 return $this->execManualRedirect($redirects++);
@@ -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];
         }
 
@@ -330,4 +310,4 @@ class Curl
 
         return trim(array_pop($matches));
     }
-}
+}

src/BeSimple/SoapClient/MimeFilter.php

@@ -90,7 +90,7 @@ class MimeFilter implements SoapRequestFilter, SoapResponseFilter
 
             // TODO
             $headers = $multipart->getHeadersForHttp();
-            list(, $contentType) = explode(': ', $headers[0]);
+            list($name, $contentType) = explode(': ', $headers[0]);
 
             $request->setContentType($contentType);
         }
@@ -135,4 +135,4 @@ class MimeFilter implements SoapRequestFilter, SoapResponseFilter
             $response->setAttachments($attachmentsRecieved);
         }
     }
-}
+}

src/BeSimple/SoapClient/README.md

@@ -1,34 +0,0 @@
-# BeSimpleSoapClient
-
-The BeSimpleSoapClient is a component that extends the native PHP SoapClient with further features like SwA, MTOM and WS-Security.
-
-# Features (only subsets of the linked specs implemented)
-
-* SwA: SOAP Messages with Attachments [Spec](http://www.w3.org/TR/SOAP-attachments)
-* MTOM: SOAP Message Transmission Optimization Mechanism [Spec](http://www.w3.org/TR/soap12-mtom/)
-* WS-Security [Spec1](http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf), [Spec2](http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0.pdf)
-* WS-Adressing [Spec](http://www.w3.org/2002/ws/addr/)
-
-# Installation
-
-If you do not yet have composer, install it like this:
-
-```sh
-curl -s http://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin
-```
-
-Create a `composer.json` file:
-
-```json
-{
-    "require": {
-        "besimple/soap-client": "0.2.*@dev"
-    }
-}
-```
-
-Now you are ready to install the library:
-
-```sh
-php /usr/local/bin/composer.phar install
-```

src/BeSimple/SoapClient/SoapClient.php

@@ -15,7 +15,6 @@ namespace BeSimple\SoapClient;
 use BeSimple\SoapCommon\Helper;
 use BeSimple\SoapCommon\Converter\MtomTypeConverter;
 use BeSimple\SoapCommon\Converter\SwaTypeConverter;
-use BeSimple\SoapCommon\SoapMessage;
 
 /**
  * Extended SoapClient that uses a a cURL wrapper for all underlying HTTP
@@ -99,13 +98,7 @@ 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']);
-        }
-
         $wsdlFile = $this->loadWsdl($wsdl, $options);
         // TODO $wsdlHandler = new WsdlHandler($wsdlFile, $this->soapVersion);
         $this->soapKernel = new SoapKernel();
@@ -131,34 +124,16 @@ class SoapClient extends \SoapClient
     private function __doHttpRequest(SoapRequest $soapRequest)
     {
         // HTTP headers
-        $soapVersion = $soapRequest->getVersion();
+        $headers = array(
-        $soapAction = $soapRequest->getAction();
+            'Content-Type:' . $soapRequest->getContentType(),
-        if (SOAP_1_1 == $soapVersion) {
+            'SOAPAction: "' . $soapRequest->getAction() . '"',
-            $headers = array(
+        );
-                'Content-Type:' . $soapRequest->getContentType(),
-                'SOAPAction: "' . $soapAction . '"',
-            );
-        } else {
-            $headers = array(
-               'Content-Type:' . $soapRequest->getContentType() . '; action="' . $soapAction . '"',
-            );
-        }
-
-        $location = $soapRequest->getLocation();
-        $content = $soapRequest->getContent();
-
-        $headers = $this->filterRequestHeaders($soapRequest, $headers);
-
-        $options = $this->filterRequestOptions($soapRequest);
-
         // execute HTTP request with cURL
         $responseSuccessfull = $this->curl->exec(
-            $location,
+            $soapRequest->getLocation(),
-            $content,
+            $soapRequest->getContent(),
-            $headers,
+            $headers
-            $options
         );
-
         // tracing enabled: store last request header and body
         if ($this->tracingEnabled === true) {
             $this->lastRequestHeaders = $this->curl->getRequestHeaders();
@@ -233,31 +208,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.
      *
@@ -338,10 +288,10 @@ class SoapClient extends \SoapClient
             $options['typemap'][] = array(
                 'type_name' => $converter->getTypeName(),
                 'type_ns'   => $converter->getTypeNamespace(),
-                'from_xml'  => function ($input) use ($converter) {
+                'from_xml'  => function($input) use ($converter) {
                     return $converter->convertXmlToPhp($input);
                 },
-                'to_xml'    => function ($input) use ($converter) {
+                'to_xml'    => function($input) use ($converter) {
                     return $converter->convertPhpToXml($input);
                 },
             );
@@ -359,7 +309,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;
@@ -380,4 +330,4 @@ class SoapClient extends \SoapClient
 
         return $cacheFileName;
     }
-}
+}

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) {
+        if ($username) {
-            $this->soapOptions['proxy_login'] = $login;
+            $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;
@@ -245,4 +236,4 @@ class SoapClientBuilder extends AbstractSoapBuilder
     {
         $this->validateWsdl();
     }
-}
+}

src/BeSimple/SoapClient/SoapRequest.php

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

src/BeSimple/SoapClient/SoapResponse.php

@@ -13,6 +13,7 @@
 namespace BeSimple\SoapClient;
 
 use BeSimple\SoapCommon\SoapResponse as CommonSoapResponse;
+use BeSimple\SoapCommon\SoapMessage;
 
 /**
  * SoapResponse class for SoapClient. Provides factory function for response object.
@@ -43,4 +44,4 @@ class SoapResponse extends CommonSoapResponse
 
         return $response;
     }
-}
+}

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/Fixtures/AttachmentRequest.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class AttachmentRequest extends AttachmentType
-{
-}

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

@@ -1,9 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class AttachmentType
-{
-    public $fileName;
-    public $binaryData;
-}

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

@@ -1,11 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class BookInformation
-{
-    public $type;
-    public $isbn;
-    public $author;
-    public $title;
-}

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

@@ -1,11 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class addBook
-{
-    public $type;
-    public $isbn;
-    public $author;
-    public $title;
-}

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

@@ -1,8 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class addBookResponse
-{
-    public $addBookReturn;
-}

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

@@ -1,9 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class base64Binary
-{
-    public $_;
-    public $contentType;
-}

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

@@ -1,8 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class downloadFile
-{
-    public $name;
-}

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

@@ -1,8 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class downloadFileResponse
-{
-    public $data;
-}

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

@@ -1,8 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class getBook
-{
-    public $isbn;
-}

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

@@ -1,8 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class getBookResponse
-{
-    public $getBookReturn;
-}

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

@@ -1,8 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class getBooksByType
-{
-    public $type;
-}

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

@@ -1,8 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class getBooksByTypeResponse
-{
-    public $getBooksByTypeReturn;
-}

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

@@ -1,9 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class uploadFile
-{
-    public $data;
-    public $name;
-}

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

@@ -1,8 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
-
-class uploadFileResponse
-{
-    public $return;
-}

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

@@ -0,0 +1,100 @@
+<?php
+
+use BeSimple\SoapCommon\Helper as BeSimpleSoapHelper;
+use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
+
+require '../bootstrap.php';
+
+class base64Binary
+{
+    public $_;
+    public $contentType;
+}
+
+class AttachmentType
+{
+    public $fileName;
+    public $binaryData;
+}
+
+class AttachmentRequest extends AttachmentType
+{
+}
+
+class base64Binary
+{
+    public $_;
+    public $contentType;
+}
+
+class AttachmentType
+{
+    public $fileName;
+    public $binaryData;
+}
+
+class AttachmentRequest extends AttachmentType
+{
+}
+
+class base64Binary
+{
+    public $_;
+    public $contentType;
+}
+
+class AttachmentType
+{
+    public $fileName;
+    public $binaryData;
+}
+
+class AttachmentRequest extends AttachmentType
+{
+}
+
+$options = array(
+    'soap_version'    => SOAP_1_1,
+    'features'        => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1
+    'trace'           => true, // enables use of the methods  SoapClient->__getLastRequest,  SoapClient->__getLastRequestHeaders,  SoapClient->__getLastResponse and  SoapClient->__getLastResponseHeaders
+    'attachment_type' => BeSimpleSoapHelper::ATTACHMENTS_TYPE_MTOM,
+    'cache_wsdl'      => WSDL_CACHE_NONE,
+    'classmap'        => array(
+        'base64Binary'      => 'base64Binary',
+        'AttachmentRequest' => 'AttachmentRequest',
+    ),
+);
+
+/*
+ * Deploy "axis_services/sample-mtom.aar" to Apache Axis2 to get this
+ * example to work.
+ *
+ * Apache Axis2 MTOM example.
+ *
+ */
+$sc = new BeSimpleSoapClient('MTOM.wsdl', $options);
+
+//var_dump($sc->__getFunctions());
+//var_dump($sc->__getTypes());
+
+try {
+    $b64 = new base64Binary();
+    $b64->_ = 'This is a test. :)';
+    $b64->contentType = 'text/plain';
+
+    $attachment = new AttachmentRequest();
+    $attachment->fileName = 'test123.txt';
+    $attachment->binaryData = $b64;
+
+    var_dump($sc->attachment($attachment));
+
+} catch (Exception $e) {
+    var_dump($e);
+}
+
+// var_dump(
+//     $sc->__getLastRequestHeaders(),
+//     $sc->__getLastRequest(),
+//     $sc->__getLastResponseHeaders(),
+//     $sc->__getLastResponse()
+// );

src/BeSimple/SoapClient/Tests/AxisInterop/MTOM.wsdl

@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<definitions targetNamespace="http://ws.apache.org/axis2/mtomsample/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.apache.org/axis2/mtomsample/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">
+<definitions targetNamespace="http://ws.apache.org/axis2/mtomsample/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.apache.org/axis2/mtomsample/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">
-  <types>
+  <types>
-    <xsd:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://ws.apache.org/axis2/mtomsample/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <xsd:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://ws.apache.org/axis2/mtomsample/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-            <xsd:import namespace="http://www.w3.org/2005/05/xmlmime"/>
+            <xsd:import namespace="http://www.w3.org/2005/05/xmlmime"/>
-            <xsd:complexType name="AttachmentType">
+            <xsd:complexType name="AttachmentType">
-                <xsd:sequence>
+                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="fileName" type="xsd:string"/>
+                    <xsd:element minOccurs="0" name="fileName" type="xsd:string"/>
-                    <xsd:element minOccurs="0" name="binaryData" type="xmime:base64Binary"/>
+                    <xsd:element minOccurs="0" name="binaryData" type="xmime:base64Binary"/>
-                </xsd:sequence>
+                </xsd:sequence>
-            </xsd:complexType>
+            </xsd:complexType>
-            <xsd:element name="AttachmentRequest" type="tns:AttachmentType"/>
+            <xsd:element name="AttachmentRequest" type="tns:AttachmentType"/>
-            <xsd:element name="AttachmentResponse" type="xsd:string"/>
+            <xsd:element name="AttachmentResponse" type="xsd:string"/>
-        </xsd:schema>
+        </xsd:schema>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.w3.org/2005/05/xmlmime">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.w3.org/2005/05/xmlmime">
-<xs:attribute name="contentType">
+<xs:attribute name="contentType">
-<xs:simpleType>
+<xs:simpleType>
-<xs:restriction base="xs:string">
+<xs:restriction base="xs:string">
-<xs:minLength value="3"/>
+<xs:minLength value="3"/>
-</xs:restriction>
+</xs:restriction>
-</xs:simpleType>
+</xs:simpleType>
-</xs:attribute>
+</xs:attribute>
-<xs:attribute name="expectedContentTypes" type="xs:string"/>
+<xs:attribute name="expectedContentTypes" type="xs:string"/>
-<xs:complexType name="base64Binary">
+<xs:complexType name="base64Binary">
-<xs:simpleContent>
+<xs:simpleContent>
-<xs:extension base="xs:base64Binary">
+<xs:extension base="xs:base64Binary">
-<xs:attribute ref="xmime:contentType"/>
+<xs:attribute ref="xmime:contentType"/>
-</xs:extension>
+</xs:extension>
-</xs:simpleContent>
+</xs:simpleContent>
-</xs:complexType>
+</xs:complexType>
-<xs:complexType name="hexBinary">
+<xs:complexType name="hexBinary">
-<xs:simpleContent>
+<xs:simpleContent>
-<xs:extension base="xs:hexBinary">
+<xs:extension base="xs:hexBinary">
-<xs:attribute ref="xmime:contentType"/>
+<xs:attribute ref="xmime:contentType"/>
-</xs:extension>
+</xs:extension>
-</xs:simpleContent>
+</xs:simpleContent>
-</xs:complexType>
+</xs:complexType>
-</xs:schema>
+</xs:schema>
-
+
-  </types>
+  </types>
-  <message name="AttachmentResponse">
+  <message name="AttachmentResponse">
-    <part name="part1" element="tns:AttachmentResponse">
+    <part name="part1" element="tns:AttachmentResponse">
-    </part>
+    </part>
-  </message>
+  </message>
-  <message name="AttachmentRequest">
+  <message name="AttachmentRequest">
-    <part name="part1" element="tns:AttachmentRequest">
+    <part name="part1" element="tns:AttachmentRequest">
-    </part>
+    </part>
-  </message>
+  </message>
-  <portType name="MTOMServicePortType">
+  <portType name="MTOMServicePortType">
-    <operation name="attachment">
+    <operation name="attachment">
-      <input message="tns:AttachmentRequest" wsaw:Action="attachment">
+      <input message="tns:AttachmentRequest" wsaw:Action="attachment">
-    </input>
+    </input>
-      <output message="tns:AttachmentResponse" wsaw:Action="http://schemas.xmlsoap.org/wsdl/MTOMServicePortType/AttachmentResponse">
+      <output message="tns:AttachmentResponse" wsaw:Action="http://schemas.xmlsoap.org/wsdl/MTOMServicePortType/AttachmentResponse">
-    </output>
+    </output>
-    </operation>
+    </operation>
-  </portType>
+  </portType>
-  <binding name="MTOMServiceSOAP11Binding" type="tns:MTOMServicePortType">
+  <binding name="MTOMServiceSOAP11Binding" type="tns:MTOMServicePortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="attachment">
+    <operation name="attachment">
-      <soap:operation soapAction="attachment" style="document"/>
+      <soap:operation soapAction="attachment" style="document"/>
-      <input>
+      <input>
-        <soap:body use="literal"/>
+        <soap:body use="literal"/>
-      </input>
+      </input>
-      <output>
+      <output>
-        <soap:body use="literal"/>
+        <soap:body use="literal"/>
-      </output>
+      </output>
-    </operation>
+    </operation>
-  </binding>
+  </binding>
-  <binding name="MTOMServiceSOAP12Binding" type="tns:MTOMServicePortType">
+  <binding name="MTOMServiceSOAP12Binding" type="tns:MTOMServicePortType">
-    <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="attachment">
+    <operation name="attachment">
-      <soap12:operation soapAction="attachment" style="document"/>
+      <soap12:operation soapAction="attachment" style="document"/>
-      <input>
+      <input>
-        <soap12:body use="literal"/>
+        <soap12:body use="literal"/>
-      </input>
+      </input>
-      <output>
+      <output>
-        <soap12:body use="literal"/>
+        <soap12:body use="literal"/>
-      </output>
+      </output>
-    </operation>
+    </operation>
-  </binding>
+  </binding>
-  <service name="MTOMSample">
+  <service name="MTOMSample">
-    <port name="MTOMSampleSOAP12port_http" binding="tns:MTOMServiceSOAP12Binding">
+    <port name="MTOMSampleSOAP12port_http" binding="tns:MTOMServiceSOAP12Binding">
-      <soap12:address location="http://localhost:8080/axis2/services/MTOMSample.MTOMSampleSOAP12port_http/"/>
+      <soap12:address location="http://localhost:8080/axis2/services/MTOMSample.MTOMSampleSOAP12port_http/"/>
-    </port>
+    </port>
-    <port name="MTOMSampleSOAP11port_http" binding="tns:MTOMServiceSOAP11Binding">
+    <port name="MTOMSampleSOAP11port_http" binding="tns:MTOMServiceSOAP11Binding">
-      <soap:address location="http://localhost:8080/axis2/services/MTOMSample.MTOMSampleSOAP11port_http/"/>
+      <soap:address location="http://localhost:8080/axis2/services/MTOMSample.MTOMSampleSOAP11port_http/"/>
-    </port>
+    </port>
-  </service>
+  </service>
-</definitions>
+</definitions>

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

@@ -1,52 +0,0 @@
-<?php
-
-/*
-* Deploy "axis_services/sample-mtom.aar" to Apache Axis2 to get this
-* example to work.
-*
-* Apache Axis2 MTOM example.
-*
-*/
-
-use BeSimple\SoapCommon\Helper as BeSimpleSoapHelper;
-use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
-
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\AttachmentRequest;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\AttachmentType;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\base64Binary;
-
-use BeSimple\SoapClient\Tests\AxisInterop\TestCase;
-
-class MtomAxisInteropTest extends TestCase
-{
-    private $options = array(
-        'soap_version'    => SOAP_1_1,
-        'features'        => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1
-        'attachment_type' => BeSimpleSoapHelper::ATTACHMENTS_TYPE_MTOM,
-        'cache_wsdl'      => WSDL_CACHE_NONE,
-        'classmap'        => array(
-            'base64Binary'      => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\base64Binary',
-            'AttachmentRequest' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\AttachmentRequest',
-        ),
-        'proxy_host' => false,
-    );
-
-    public function testAttachment()
-    {
-        $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/MTOM.wsdl', $this->options);
-
-        $b64 = new base64Binary();
-        $b64->_ = 'This is a test. :)';
-        $b64->contentType = 'text/plain';
-
-        $attachment = new AttachmentRequest();
-        $attachment->fileName = 'test123.txt';
-        $attachment->binaryData = $b64;
-
-        $this->assertEquals('File saved succesfully.', $sc->attachment($attachment));
-
-//         $fileCreatedByServer = __DIR__.'/'.$attachment->fileName;
-//         $this->assertEquals($b64->_, file_get_contents($fileCreatedByServer));
-//         unlink($fileCreatedByServer);
-    }
-}

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

@@ -0,0 +1,84 @@
+<?php
+
+use BeSimple\SoapCommon\Helper as BeSimpleSoapHelper;
+use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
+
+require '../bootstrap.php';
+
+$options = array(
+    'soap_version'    => SOAP_1_1,
+    'features'        => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1
+    'trace'           => true, // enables use of the methods  SoapClient->__getLastRequest,  SoapClient->__getLastRequestHeaders,  SoapClient->__getLastResponse and  SoapClient->__getLastResponseHeaders
+    'attachment_type' => BeSimpleSoapHelper::ATTACHMENTS_TYPE_SWA,
+    'cache_wsdl'      => WSDL_CACHE_NONE,
+);
+
+/*
+ * Deploy "axis_services/besimple-swa.aar" to Apache Axis2 to get this
+ * example to work.
+ *
+ * Run ant to rebuild aar.
+ *
+ * Example based on:
+ * http://axis.apache.org/axis2/java/core/docs/mtom-guide.html#a3
+ * http://wso2.org/library/1675
+ *
+ * Doesn't work directly with ?wsdl served by Apache Axis!
+ *
+ */
+
+$sc = new BeSimpleSoapClient('SwA.wsdl', $options);
+
+//var_dump($sc->__getFunctions());
+//var_dump($sc->__getTypes());
+
+try {
+    $file = new stdClass();
+    $file->name = 'upload.txt';
+    $file->data = 'This is a test text!';
+    $result = $sc->uploadFile($file);
+
+    var_dump(
+        $result->return
+    );
+
+    $file = new stdClass();
+    $file->name = 'upload.txt';
+    $result = $sc->downloadFile($file);
+
+    var_dump(
+        $result->data
+    );
+
+    $file = new stdClass();
+    $file->name = 'image.jpg'; // source: http://www.freeimageslive.com/galleries/light/pics/swirl3768.jpg
+    $file->data = file_get_contents('image.jpg');
+    $result = $sc->uploadFile($file);
+
+    var_dump(
+        $result->return
+    );
+
+    $crc32 = crc32($file->data);
+
+    $file = new stdClass();
+    $file->name = 'image.jpg';
+    $result = $sc->downloadFile($file);
+
+    file_put_contents('image2.jpg', $result->data);
+
+
+    var_dump(
+        crc32($result->data) === $crc32
+    );
+
+} catch (Exception $e) {
+    var_dump($e);
+}
+
+// var_dump(
+//     $sc->__getLastRequestHeaders(),
+//     $sc->__getLastRequest(),
+//     $sc->__getLastResponseHeaders(),
+//     $sc->__getLastResponse()
+// );

src/BeSimple/SoapClient/Tests/AxisInterop/SwA.wsdl

@@ -1,162 +1,162 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://service.besimple" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://service.besimple">
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://service.besimple" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://service.besimple">
-    <wsdl:documentation>BeSimpleSwaService</wsdl:documentation>
+    <wsdl:documentation>BeSimpleSwaService</wsdl:documentation>
-    <wsdl:types>
+    <wsdl:types>
-        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://service.besimple">
+        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://service.besimple">
-            <xs:complexType name="Exception">
+            <xs:complexType name="Exception">
-                <xs:sequence>
+                <xs:sequence>
-                    <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType"/>
+                    <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType"/>
-                </xs:sequence>
+                </xs:sequence>
-            </xs:complexType>
+            </xs:complexType>
-            <xs:element name="Exception">
+            <xs:element name="Exception">
-                <xs:complexType>
+                <xs:complexType>
-                    <xs:sequence>
+                    <xs:sequence>
-                        <xs:element minOccurs="0" name="Exception" nillable="true" type="ns:Exception"/>
+                        <xs:element minOccurs="0" name="Exception" nillable="true" type="ns:Exception"/>
-                    </xs:sequence>
+                    </xs:sequence>
-                </xs:complexType>
+                </xs:complexType>
-            </xs:element>
+            </xs:element>
-            <xs:element name="uploadFile">
+            <xs:element name="uploadFile">
-                <xs:complexType>
+                <xs:complexType>
-                    <xs:sequence>
+                    <xs:sequence>
-                        <xs:element minOccurs="0" name="data" nillable="true" type="xs:base64Binary"/>
+                        <xs:element minOccurs="0" name="data" nillable="true" type="xs:base64Binary"/>
-                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
-                    </xs:sequence>
+                    </xs:sequence>
-                </xs:complexType>
+                </xs:complexType>
-            </xs:element>
+            </xs:element>
-            <xs:element name="uploadFileResponse">
+            <xs:element name="uploadFileResponse">
-                <xs:complexType>
+                <xs:complexType>
-                    <xs:sequence>
+                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
-                    </xs:sequence>
+                    </xs:sequence>
-                </xs:complexType>
+                </xs:complexType>
-            </xs:element>
+            </xs:element>
-            <xs:element name="downloadFile">
+            <xs:element name="downloadFile">
-                <xs:complexType>
+                <xs:complexType>
-                    <xs:sequence>
+                    <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
-                    </xs:sequence>
+                    </xs:sequence>
-                </xs:complexType>
+                </xs:complexType>
-            </xs:element>
+            </xs:element>
-            <xs:element name="downloadFileResponse">
+            <xs:element name="downloadFileResponse">
-                <xs:complexType>
+                <xs:complexType>
-                    <xs:sequence>
+                    <xs:sequence>
-                        <xs:element minOccurs="0" name="data" nillable="true" type="xs:base64Binary"/>
+                        <xs:element minOccurs="0" name="data" nillable="true" type="xs:base64Binary"/>
-                    </xs:sequence>
+                    </xs:sequence>
-                </xs:complexType>
+                </xs:complexType>
-            </xs:element>
+            </xs:element>
-        </xs:schema>
+        </xs:schema>
-    </wsdl:types>
+    </wsdl:types>
-    <wsdl:message name="downloadFileRequest">
+    <wsdl:message name="downloadFileRequest">
-        <wsdl:part name="parameters" element="ns:downloadFile"/>
+        <wsdl:part name="parameters" element="ns:downloadFile"/>
-    </wsdl:message>
+    </wsdl:message>
-    <wsdl:message name="downloadFileResponse">
+    <wsdl:message name="downloadFileResponse">
-        <wsdl:part name="parameters" element="ns:downloadFileResponse"/>
+        <wsdl:part name="parameters" element="ns:downloadFileResponse"/>
-    </wsdl:message>
+    </wsdl:message>
-    <wsdl:message name="Exception">
+    <wsdl:message name="Exception">
-        <wsdl:part name="parameters" element="ns:Exception"/>
+        <wsdl:part name="parameters" element="ns:Exception"/>
-    </wsdl:message>
+    </wsdl:message>
-    <wsdl:message name="uploadFileRequest">
+    <wsdl:message name="uploadFileRequest">
-        <wsdl:part name="parameters" element="ns:uploadFile"/>
+        <wsdl:part name="parameters" element="ns:uploadFile"/>
-    </wsdl:message>
+    </wsdl:message>
-    <wsdl:message name="uploadFileResponse">
+    <wsdl:message name="uploadFileResponse">
-        <wsdl:part name="parameters" element="ns:uploadFileResponse"/>
+        <wsdl:part name="parameters" element="ns:uploadFileResponse"/>
-    </wsdl:message>
+    </wsdl:message>
-    <wsdl:portType name="BeSimpleSwaServicePortType">
+    <wsdl:portType name="BeSimpleSwaServicePortType">
-        <wsdl:operation name="downloadFile">
+        <wsdl:operation name="downloadFile">
-            <wsdl:input message="ns:downloadFileRequest" wsaw:Action="urn:downloadFile"/>
+            <wsdl:input message="ns:downloadFileRequest" wsaw:Action="urn:downloadFile"/>
-            <wsdl:output message="ns:downloadFileResponse" wsaw:Action="urn:downloadFileResponse"/>
+            <wsdl:output message="ns:downloadFileResponse" wsaw:Action="urn:downloadFileResponse"/>
-            <wsdl:fault message="ns:Exception" name="Exception" wsaw:Action="urn:downloadFileException"/>
+            <wsdl:fault message="ns:Exception" name="Exception" wsaw:Action="urn:downloadFileException"/>
-        </wsdl:operation>
+        </wsdl:operation>
-        <wsdl:operation name="uploadFile">
+        <wsdl:operation name="uploadFile">
-            <wsdl:input message="ns:uploadFileRequest" wsaw:Action="urn:uploadFile"/>
+            <wsdl:input message="ns:uploadFileRequest" wsaw:Action="urn:uploadFile"/>
-            <wsdl:output message="ns:uploadFileResponse" wsaw:Action="urn:uploadFileResponse"/>
+            <wsdl:output message="ns:uploadFileResponse" wsaw:Action="urn:uploadFileResponse"/>
-            <wsdl:fault message="ns:Exception" name="Exception" wsaw:Action="urn:uploadFileException"/>
+            <wsdl:fault message="ns:Exception" name="Exception" wsaw:Action="urn:uploadFileException"/>
-        </wsdl:operation>
+        </wsdl:operation>
-    </wsdl:portType>
+    </wsdl:portType>
-    <wsdl:binding name="BeSimpleSwaServiceSoap11Binding" type="ns:BeSimpleSwaServicePortType">
+    <wsdl:binding name="BeSimpleSwaServiceSoap11Binding" type="ns:BeSimpleSwaServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <wsdl:operation name="downloadFile">
+        <wsdl:operation name="downloadFile">
-            <soap:operation soapAction="urn:downloadFile" style="document"/>
+            <soap:operation soapAction="urn:downloadFile" style="document"/>
-            <wsdl:input>
+            <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"/>
-            </wsdl:input>
+            </wsdl:input>
-            <wsdl:output>
+            <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"/>
-            </wsdl:output>
+            </wsdl:output>
-            <wsdl:fault name="Exception">
+            <wsdl:fault name="Exception">
-                <soap:fault use="literal" name="Exception"/>
+                <soap:fault use="literal" name="Exception"/>
-            </wsdl:fault>
+            </wsdl:fault>
-        </wsdl:operation>
+        </wsdl:operation>
-        <wsdl:operation name="uploadFile">
+        <wsdl:operation name="uploadFile">
-            <soap:operation soapAction="urn:uploadFile" style="document"/>
+            <soap:operation soapAction="urn:uploadFile" style="document"/>
-            <wsdl:input>
+            <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"/>
-            </wsdl:input>
+            </wsdl:input>
-            <wsdl:output>
+            <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"/>
-            </wsdl:output>
+            </wsdl:output>
-            <wsdl:fault name="Exception">
+            <wsdl:fault name="Exception">
-                <soap:fault use="literal" name="Exception"/>
+                <soap:fault use="literal" name="Exception"/>
-            </wsdl:fault>
+            </wsdl:fault>
-        </wsdl:operation>
+        </wsdl:operation>
-    </wsdl:binding>
+    </wsdl:binding>
-    <wsdl:binding name="BeSimpleSwaServiceSoap12Binding" type="ns:BeSimpleSwaServicePortType">
+    <wsdl:binding name="BeSimpleSwaServiceSoap12Binding" type="ns:BeSimpleSwaServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <wsdl:operation name="downloadFile">
+        <wsdl:operation name="downloadFile">
-            <soap12:operation soapAction="urn:downloadFile" style="document"/>
+            <soap12:operation soapAction="urn:downloadFile" style="document"/>
-            <wsdl:input>
+            <wsdl:input>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"/>
-            </wsdl:input>
+            </wsdl:input>
-            <wsdl:output>
+            <wsdl:output>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"/>
-            </wsdl:output>
+            </wsdl:output>
-            <wsdl:fault name="Exception">
+            <wsdl:fault name="Exception">
-                <soap12:fault use="literal" name="Exception"/>
+                <soap12:fault use="literal" name="Exception"/>
-            </wsdl:fault>
+            </wsdl:fault>
-        </wsdl:operation>
+        </wsdl:operation>
-        <wsdl:operation name="uploadFile">
+        <wsdl:operation name="uploadFile">
-            <soap12:operation soapAction="urn:uploadFile" style="document"/>
+            <soap12:operation soapAction="urn:uploadFile" style="document"/>
-            <wsdl:input>
+            <wsdl:input>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"/>
-            </wsdl:input>
+            </wsdl:input>
-            <wsdl:output>
+            <wsdl:output>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"/>
-            </wsdl:output>
+            </wsdl:output>
-            <wsdl:fault name="Exception">
+            <wsdl:fault name="Exception">
-                <soap12:fault use="literal" name="Exception"/>
+                <soap12:fault use="literal" name="Exception"/>
-            </wsdl:fault>
+            </wsdl:fault>
-        </wsdl:operation>
+        </wsdl:operation>
-    </wsdl:binding>
+    </wsdl:binding>
-    <wsdl:binding name="BeSimpleSwaServiceHttpBinding" type="ns:BeSimpleSwaServicePortType">
+    <wsdl:binding name="BeSimpleSwaServiceHttpBinding" type="ns:BeSimpleSwaServicePortType">
-        <http:binding verb="POST"/>
+        <http:binding verb="POST"/>
-        <wsdl:operation name="downloadFile">
+        <wsdl:operation name="downloadFile">
-            <http:operation location="BeSimpleSwaService/downloadFile"/>
+            <http:operation location="BeSimpleSwaService/downloadFile"/>
-            <wsdl:input>
+            <wsdl:input>
-                <mime:content type="text/xml" part="downloadFile"/>
+                <mime:content type="text/xml" part="downloadFile"/>
-            </wsdl:input>
+            </wsdl:input>
-            <wsdl:output>
+            <wsdl:output>
-                <mime:content type="text/xml" part="downloadFile"/>
+                <mime:content type="text/xml" part="downloadFile"/>
-            </wsdl:output>
+            </wsdl:output>
-        </wsdl:operation>
+        </wsdl:operation>
-        <wsdl:operation name="uploadFile">
+        <wsdl:operation name="uploadFile">
-            <http:operation location="BeSimpleSwaService/uploadFile"/>
+            <http:operation location="BeSimpleSwaService/uploadFile"/>
-            <wsdl:input>
+            <wsdl:input>
-                <mime:content type="text/xml" part="uploadFile"/>
+                <mime:content type="text/xml" part="uploadFile"/>
-            </wsdl:input>
+            </wsdl:input>
-            <wsdl:output>
+            <wsdl:output>
-                <mime:content type="text/xml" part="uploadFile"/>
+                <mime:content type="text/xml" part="uploadFile"/>
-            </wsdl:output>
+            </wsdl:output>
-        </wsdl:operation>
+        </wsdl:operation>
-    </wsdl:binding>
+    </wsdl:binding>
-    <wsdl:service name="BeSimpleSwaService">
+    <wsdl:service name="BeSimpleSwaService">
-        <wsdl:port name="BeSimpleSwaServiceHttpSoap11Endpoint" binding="ns:BeSimpleSwaServiceSoap11Binding">
+        <wsdl:port name="BeSimpleSwaServiceHttpSoap11Endpoint" binding="ns:BeSimpleSwaServiceSoap11Binding">
-            <soap:address location="http://localhost:8080/axis2/services/BeSimpleSwaService.BeSimpleSwaServiceHttpSoap11Endpoint/"/>
+            <soap:address location="http://localhost:8080/axis2/services/BeSimpleSwaService.BeSimpleSwaServiceHttpSoap11Endpoint/"/>
-        </wsdl:port>
+        </wsdl:port>
-        <wsdl:port name="BeSimpleSwaServiceHttpSoap12Endpoint" binding="ns:BeSimpleSwaServiceSoap12Binding">
+        <wsdl:port name="BeSimpleSwaServiceHttpSoap12Endpoint" binding="ns:BeSimpleSwaServiceSoap12Binding">
-            <soap12:address location="http://localhost:8080/axis2/services/BeSimpleSwaService.BeSimpleSwaServiceHttpSoap12Endpoint/"/>
+            <soap12:address location="http://localhost:8080/axis2/services/BeSimpleSwaService.BeSimpleSwaServiceHttpSoap12Endpoint/"/>
-        </wsdl:port>
+        </wsdl:port>
-        <wsdl:port name="BeSimpleSwaServiceHttpEndpoint" binding="ns:BeSimpleSwaServiceHttpBinding">
+        <wsdl:port name="BeSimpleSwaServiceHttpEndpoint" binding="ns:BeSimpleSwaServiceHttpBinding">
-            <http:address location="http://localhost:8080/axis2/services/BeSimpleSwaService.BeSimpleSwaServiceHttpEndpoint/"/>
+            <http:address location="http://localhost:8080/axis2/services/BeSimpleSwaService.BeSimpleSwaServiceHttpEndpoint/"/>
-        </wsdl:port>
+        </wsdl:port>
-    </wsdl:service>
+    </wsdl:service>
-</wsdl:definitions>
+</wsdl:definitions>

src/BeSimple/SoapClient/Tests/AxisInterop/SwA/build.xml

@@ -1,38 +1,38 @@
-<project name="BeSimpleSwaService" default="generate.service">
+<project name="BeSimpleSwaService" default="generate.service">
-    <property environment="env" />
+    <property environment="env" />
-    <property name="axis2.home" value="C:/axis2" />
+    <property name="axis2.home" value="C:/axis2" />
-    <property name="axis2.repo" value="${axis2.home}/repository" />
+    <property name="axis2.repo" value="${axis2.home}/repository" />
-    <property name="build.dir" value="build" />
+    <property name="build.dir" value="build" />
-    <property name="filename" value="besimple-swa.aar" />
+    <property name="filename" value="besimple-swa.aar" />
-
+
-    <path id="axis.classpath">
+    <path id="axis.classpath">
-        <fileset dir="${axis2.home}/lib">
+        <fileset dir="${axis2.home}/lib">
-            <include name="*.jar" />
+            <include name="*.jar" />
-        </fileset>
+        </fileset>
-    </path>
+    </path>
-
+
-    <target name="generate.service" depends="compile">
+    <target name="generate.service" depends="compile">
-        <jar destfile="${build.dir}/${filename}">
+        <jar destfile="${build.dir}/${filename}">
-            <fileset dir="resources/">
+            <fileset dir="resources/">
-                <include name="META-INF/services.xml" />
+                <include name="META-INF/services.xml" />
-            </fileset>
+            </fileset>
-            <fileset dir="${build.dir}/classes">
+            <fileset dir="${build.dir}/classes">
-                <include name="besimple/service/**/*.class" />
+                <include name="besimple/service/**/*.class" />
-            </fileset>
+            </fileset>
-        </jar>
+        </jar>
-        <copy file="${build.dir}/${filename}" tofile="../axis_services/${filename}" overwrite="true" />
+        <copy file="${build.dir}/${filename}" tofile="../axis_services/${filename}" overwrite="true" />
-        <copy file="${build.dir}/${filename}" tofile="${axis2.repo}/services/${filename}" overwrite="true" />
+        <copy file="${build.dir}/${filename}" tofile="${axis2.repo}/services/${filename}" overwrite="true" />
-        <antcall target="clean" />
+        <antcall target="clean" />
-    </target>
+    </target>
-
+
-    <target name="compile">
+    <target name="compile">
-        <mkdir dir="${build.dir}/classes" />
+        <mkdir dir="${build.dir}/classes" />
-        <javac debug="on" srcdir="src" destdir="${build.dir}/classes">
+        <javac debug="on" srcdir="src" destdir="${build.dir}/classes">
-            <classpath refid="axis.classpath" />
+            <classpath refid="axis.classpath" />
-        </javac>
+        </javac>
-    </target>
+    </target>
-
+
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${build.dir}" />
+        <delete dir="${build.dir}" />
-    </target>
+    </target>
-</project>
+</project>

src/BeSimple/SoapClient/Tests/AxisInterop/SwA/resources/META-INF/services.xml

@@ -1,15 +1,15 @@
-<serviceGroup>
+<serviceGroup>
-    <service name="BeSimpleSwaService">
+    <service name="BeSimpleSwaService">
         <description>BeSimple test service for SwA.</description>
-        <parameter name="enableSwA">true</parameter>
+        <parameter name="enableSwA">true</parameter>
-        <parameter name="ServiceClass" locked="false">besimple.service.BeSimpleSwaService</parameter>
+        <parameter name="ServiceClass" locked="false">besimple.service.BeSimpleSwaService</parameter>
-        <operation name="uploadFile">
+        <operation name="uploadFile">
-            <actionMapping>urn:uploadFile</actionMapping>
+            <actionMapping>urn:uploadFile</actionMapping>
-            <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+            <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-        </operation>
+        </operation>
-        <operation name="downloadFile">
+        <operation name="downloadFile">
-            <actionMapping>urn:downloadFile</actionMapping>
+            <actionMapping>urn:downloadFile</actionMapping>
-            <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+            <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-        </operation>
+        </operation>
-    </service>
+    </service>
-</serviceGroup>
+</serviceGroup>

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

@@ -1,78 +0,0 @@
-<?php
-
-/*
-* Deploy "axis_services/besimple-swa.aar" to Apache Axis2 to get this
-* example to work.
-*
-* Run ant to rebuild aar.
-*
-* Example based on:
-* http://axis.apache.org/axis2/java/core/docs/mtom-guide.html#a3
-* http://wso2.org/library/1675
-*
-* Doesn't work directly with ?wsdl served by Apache Axis!
-*
-*/
-
-use BeSimple\SoapCommon\Helper as BeSimpleSoapHelper;
-use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
-
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\uploadFile;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\uploadFileResponse;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\downloadFile;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\downloadFileResponse;
-
-use BeSimple\SoapClient\Tests\AxisInterop\TestCase;
-
-class SwaAxisInteropTest extends TestCase
-{
-    private $options = array(
-        'soap_version'    => SOAP_1_1,
-        'features'        => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1
-        'attachment_type' => BeSimpleSoapHelper::ATTACHMENTS_TYPE_SWA,
-        'cache_wsdl'      => WSDL_CACHE_NONE,
-        'classmap'        => array(
-            'downloadFile'         => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\downloadFile',
-            'downloadFileResponse' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\downloadFileResponse',
-            'uploadFile'           => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\uploadFile',
-            'uploadFileResponse'   => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\uploadFileResponse',
-        ),
-        'proxy_host' => false,
-    );
-
-    public function testUploadDownloadText()
-    {
-        $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/SwA.wsdl', $this->options);
-
-        $upload = new uploadFile();
-        $upload->name = 'upload.txt';
-        $upload->data = 'This is a test. :)';
-        $result = $sc->uploadFile($upload);
-
-        $this->assertEquals('File saved succesfully.', $result->return);
-
-        $download = new downloadFile();
-        $download->name = 'upload.txt';
-        $result = $sc->downloadFile($download);
-
-        $this->assertEquals($upload->data, $result->data);
-    }
-
-    public function testUploadDownloadImage()
-    {
-        $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/SwA.wsdl', $this->options);
-
-        $upload = new uploadFile();
-        $upload->name = 'image.jpg';
-        $upload->data = file_get_contents(__DIR__.'/Fixtures/image.jpg'); // source: http://www.freeimageslive.com/galleries/light/pics/swirl3768.jpg;
-        $result = $sc->uploadFile($upload);
-
-        $this->assertEquals('File saved succesfully.', $result->return);
-
-        $download = new downloadFile();
-        $download->name = 'image.jpg';
-        $result = $sc->downloadFile($download);
-
-        $this->assertEquals($upload->data, $result->data);
-    }
-}

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace BeSimple\SoapClient\Tests\AxisInterop;
-
-class TestCase extends \PHPUnit_Framework_TestCase
-{
-    protected function setUp()
-    {
-        $ch = curl_init('http://localhost:8080/');
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-        curl_setopt($ch, CURLOPT_HEADER, true);
-        curl_setopt($ch, CURLOPT_NOBODY, true);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-        if (curl_exec($ch) === false) {
-            $this->markTestSkipped(
-                'The Axis server is not started on port 8080.'
-            );
-        }
-
-        curl_close($ch);
-    }
-}

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

@@ -0,0 +1,73 @@
+<?php
+
+use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
+use BeSimple\SoapClient\WsAddressingFilter as BeSimpleWsAddressingFilter;
+
+require '../bootstrap.php';
+
+$options = array(
+    'soap_version' => SOAP_1_2,
+    'features'     => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1
+    'trace'        => true, // enables use of the methods  SoapClient->__getLastRequest,  SoapClient->__getLastRequestHeaders,  SoapClient->__getLastResponse and  SoapClient->__getLastResponseHeaders
+);
+
+/*
+ * Deploy "axis_services/version2.aar" to Apache Axis2 to get this example to
+ * work.
+ *
+ * To rebuild the "axis_services/version2.aar" the following steps need to be
+ * done to build a working Apache Axis2 version service with SOAP session
+ * enabled.
+ *
+ * 1) Go to $AXIS_HOME/samples/version and edit the following files:
+ *
+ * resources/META-INF/services.xml:
+ * <service name="Version2" scope="soapsession">
+ * ...
+ * </service>
+ *
+ * build.xml:
+ * replace version.aar with version2.aar
+ *
+ * 2) Run ant build.xml in "$AXIS_HOME/samples/version"
+ *
+ */
+
+$sc = new BeSimpleSoapClient('http://localhost:8080/axis2/services/Version2?wsdl', $options);
+$soapKernel = $sc->getSoapKernel();
+$wsaFilter = new BeSimpleWsAddressingFilter();
+$soapKernel->registerFilter($wsaFilter);
+
+//var_dump($sc->__getFunctions());
+//var_dump($sc->__getTypes());
+
+try {
+    $wsaFilter->setReplyTo(BeSimpleWsAddressingFilter::ENDPOINT_REFERENCE_ANONYMOUS);
+    $wsaFilter->setMessageId();
+
+    var_dump($sc->getVersion());
+
+    $soapSessionId1 = $wsaFilter->getReferenceParameter('http://ws.apache.org/namespaces/axis2', 'ServiceGroupId');
+    echo 'ID1: ' .$soapSessionId1 . PHP_EOL;
+
+    $wsaFilter->addReferenceParameter('http://ws.apache.org/namespaces/axis2', 'axis2', 'ServiceGroupId', $soapSessionId1);
+
+    var_dump($sc->getVersion());
+
+    $soapSessionId2 = $wsaFilter->getReferenceParameter('http://ws.apache.org/namespaces/axis2', 'ServiceGroupId');
+    echo 'ID2: ' . $soapSessionId2 . PHP_EOL;
+
+    if ($soapSessionId1 == $soapSessionId2) {
+        echo PHP_EOL;
+        echo 'SOAP session worked :)';
+    }
+} catch (Exception $e) {
+    var_dump($e);
+}
+
+// var_dump(
+//     $sc->__getLastRequestHeaders(),
+//     $sc->__getLastRequest(),
+//     $sc->__getLastResponseHeaders(),
+//     $sc->__getLastResponse()
+// );

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

@@ -1,60 +0,0 @@
-<?php
-
-/*
- * Deploy "axis_services/version2.aar" to Apache Axis2 to get this example to
- * work.
- *
- * To rebuild the "axis_services/version2.aar" the following steps need to be
- * done to build a working Apache Axis2 version service with SOAP session
- * enabled.
- *
- * 1) Go to $AXIS_HOME/samples/version and edit the following files:
- *
- * resources/META-INF/services.xml:
- * <service name="Version2" scope="soapsession">
- * ...
- * </service>
- *
- * build.xml:
- * replace version.aar with version2.aar
- *
- * 2) Run ant build.xml in "$AXIS_HOME/samples/version"
- *
- */
-
-use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
-use BeSimple\SoapClient\WsAddressingFilter as BeSimpleWsAddressingFilter;
-
-use BeSimple\SoapClient\Tests\AxisInterop\TestCase;
-
-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()
-    {
-        $sc = new BeSimpleSoapClient('http://localhost:8080/axis2/services/Version2?wsdl', $this->options);
-        $soapKernel = $sc->getSoapKernel();
-        $wsaFilter = new BeSimpleWsAddressingFilter();
-        $soapKernel->registerFilter($wsaFilter);
-
-        $wsaFilter->setReplyTo(BeSimpleWsAddressingFilter::ENDPOINT_REFERENCE_ANONYMOUS);
-        $wsaFilter->setMessageId();
-
-        $version = $sc->getVersion();
-
-        $soapSessionId1 = $wsaFilter->getReferenceParameter('http://ws.apache.org/namespaces/axis2', 'ServiceGroupId');
-
-        $wsaFilter->addReferenceParameter('http://ws.apache.org/namespaces/axis2', 'axis2', 'ServiceGroupId', $soapSessionId1);
-
-        $version = $sc->getVersion();
-
-        $soapSessionId2 = $wsaFilter->getReferenceParameter('http://ws.apache.org/namespaces/axis2', 'ServiceGroupId');
-
-        $this->assertEquals($soapSessionId1, $soapSessionId2);
-    }
-}

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

@@ -0,0 +1,116 @@
+<?php
+
+use ass\XmlSecurity\Key as XmlSecurityKey;
+
+use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
+use BeSimple\SoapClient\WsSecurityFilter as BeSimpleWsSecurityFilter;
+use BeSimple\SoapCommon\WsSecurityKey as BeSimpleWsSecurityKey;
+
+require '../bootstrap.php';
+
+echo '<pre>';
+
+$options = array(
+    'soap_version' => SOAP_1_2,
+    'features'     => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1
+    'trace'        => true, // enables use of the methods  SoapClient->__getLastRequest,  SoapClient->__getLastRequestHeaders,  SoapClient->__getLastResponse and  SoapClient->__getLastResponseHeaders
+);
+
+/*
+ * Deploy "axis_services/library-signencr.aar" to Apache Axis2 to get this
+ * example to work.
+ *
+ * Links:
+ * http://www.dcc.uchile.cl/~pcamacho/tutorial/web/xmlsec/xmlsec.html
+ * http://www.aleksey.com/xmlsec/xmldsig-verifier.html
+ *
+ * Using code from axis example:
+ * http://www.ibm.com/developerworks/java/library/j-jws5/index.html
+ *
+ * Download key tool to export private key
+ * http://couchpotato.net/pkeytool/
+ *
+ * keytool -export -alias serverkey -keystore server.keystore -storepass nosecret -file servercert.cer
+ * openssl x509 -out servercert.pem -outform pem -in servercert.pem -inform der
+ *
+ * keytool -export -alias clientkey -keystore client.keystore -storepass nosecret -file clientcert.cer
+ * openssl x509 -out clientcert.pem -outform pem -in clientcert.pem -inform der
+ * java -jar pkeytool.jar -exportkey -keystore client.keystore -storepass nosecret -keypass clientpass -rfc -alias clientkey -file clientkey.pem
+ *
+ * C:\Program Files\Java\jre6\bin\keytool -export -alias serverkey -keystore server.keystore -storepass nosecret -file servercert.cer
+ * C:\xampp\apache\bin\openssl x509 -out servercert.pem -outform pem -in servercert.cer -inform der
+ *
+ * C:\Program Files\Java\jre6\bin\keytool -export -alias clientkey -keystore client.keystore -storepass nosecret -file clientcert.cer
+ * C:\xampp\apache\bin\openssl x509 -out clientcert.pem -outform pem -in clientcert.cer -inform der
+ * java -jar C:\axis2\pkeytool\pkeytool.jar -exportkey -keystore client.keystore -storepass nosecret -keypass clientpass -rfc -alias clientkey -file clientkey.pem
+ *
+ * build.properties:
+ * server-policy=hash-policy-server.xml
+ *
+ * allows both text and digest!
+ */
+
+class getBook {}
+class getBookResponse {}
+class getBooksByType {}
+class getBooksByTypeResponse {}
+class addBook {}
+class addBookResponse {}
+class BookInformation {}
+
+$options['classmap'] = array(
+    'getBook' => 'getBook',
+    'getBookResponse' => 'getBookResponse',
+    'getBooksByType' => 'getBooksByType',
+    'getBooksByTypeResponse' => 'getBooksByTypeResponse',
+    'addBook' => 'addBook',
+    'addBookResponse' => 'addBookResponse',
+    'BookInformation' => 'BookInformation',
+);
+
+$sc = new BeSimpleSoapClient('WsSecuritySigEnc.wsdl', $options);
+
+$wssFilter = new BeSimpleWsSecurityFilter();
+// user key for signature and encryption
+$securityKeyUser = new BeSimpleWsSecurityKey();
+$securityKeyUser->addPrivateKey(XmlSecurityKey::RSA_SHA1, 'clientkey.pem', true);
+$securityKeyUser->addPublicKey(XmlSecurityKey::RSA_SHA1, 'clientcert.pem', true);
+$wssFilter->setUserSecurityKeyObject($securityKeyUser);
+// service key for encryption
+$securityKeyService = new BeSimpleWsSecurityKey();
+$securityKeyService->addPrivateKey(XmlSecurityKey::TRIPLEDES_CBC);
+$securityKeyService->addPublicKey(XmlSecurityKey::RSA_1_5, 'servercert.pem', true);
+$wssFilter->setServiceSecurityKeyObject($securityKeyService);
+// TOKEN_REFERENCE_SUBJECT_KEY_IDENTIFIER | TOKEN_REFERENCE_SECURITY_TOKEN | TOKEN_REFERENCE_THUMBPRINT_SHA1
+$wssFilter->setSecurityOptionsSignature(BeSimpleWsSecurityFilter::TOKEN_REFERENCE_SECURITY_TOKEN);
+$wssFilter->setSecurityOptionsEncryption(BeSimpleWsSecurityFilter::TOKEN_REFERENCE_THUMBPRINT_SHA1);
+
+$soapKernel = $sc->getSoapKernel();
+$soapKernel->registerFilter($wssFilter);
+
+//var_dump($sc->__getFunctions());
+//var_dump($sc->__getTypes());
+
+try {
+    $gb = new getBook();
+    $gb->isbn = '0061020052';
+    var_dump($sc->getBook($gb));
+
+    $ab = new addBook();
+    $ab->isbn = '0445203498';
+    $ab->title = 'The Dragon Never Sleeps';
+    $ab->author = 'Cook, Glen';
+    $ab->type = 'scifi';
+    var_dump($sc->addBook($ab));
+
+    // getBooksByType("scifi");
+} catch (Exception $e) {
+    var_dump($e);
+}
+
+//var_dump(
+//    $sc->__getLastRequestHeaders(),
+//    $sc->__getLastRequest(),
+//    $sc->__getLastResponseHeaders(),
+//    $sc->__getLastResponse()
+//);

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

@@ -1,107 +0,0 @@
-<?php
-
-/*
-* Deploy "axis_services/library-signencr.aar" to Apache Axis2 to get this
-* example to work.
-*
-* Links:
-* http://www.dcc.uchile.cl/~pcamacho/tutorial/web/xmlsec/xmlsec.html
-* http://www.aleksey.com/xmlsec/xmldsig-verifier.html
-*
-* Using code from axis example:
-* http://www.ibm.com/developerworks/java/library/j-jws5/index.html
-*
-* Download key tool to export private key
-* http://couchpotato.net/pkeytool/
-*
-* keytool -export -alias serverkey -keystore server.keystore -storepass nosecret -file servercert.cer
-* openssl x509 -out servercert.pem -outform pem -in servercert.pem -inform der
-*
-* keytool -export -alias clientkey -keystore client.keystore -storepass nosecret -file clientcert.cer
-* openssl x509 -out clientcert.pem -outform pem -in clientcert.pem -inform der
-* java -jar pkeytool.jar -exportkey -keystore client.keystore -storepass nosecret -keypass clientpass -rfc -alias clientkey -file clientkey.pem
-*
-* C:\Program Files\Java\jre6\bin\keytool -export -alias serverkey -keystore server.keystore -storepass nosecret -file servercert.cer
-* C:\xampp\apache\bin\openssl x509 -out servercert.pem -outform pem -in servercert.cer -inform der
-*
-* C:\Program Files\Java\jre6\bin\keytool -export -alias clientkey -keystore client.keystore -storepass nosecret -file clientcert.cer
-* C:\xampp\apache\bin\openssl x509 -out clientcert.pem -outform pem -in clientcert.cer -inform der
-* java -jar C:\axis2\pkeytool\pkeytool.jar -exportkey -keystore client.keystore -storepass nosecret -keypass clientpass -rfc -alias clientkey -file clientkey.pem
-*
-* build.properties:
-* server-policy=hash-policy-server.xml
-*
-* allows both text and digest!
-*/
-
-use ass\XmlSecurity\Key as XmlSecurityKey;
-
-use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
-use BeSimple\SoapClient\WsSecurityFilter as BeSimpleWsSecurityFilter;
-use BeSimple\SoapCommon\WsSecurityKey as BeSimpleWsSecurityKey;
-
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\getBook;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\getBookResponse;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\getBooksByType;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\getBooksByTypeResponse;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\addBook;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\addBookResponse;
-use BeSimple\SoapClient\Tests\AxisInterop\Fixtures\BookInformation;
-
-use BeSimple\SoapClient\Tests\AxisInterop\TestCase;
-
-class WsSecuritySigEncAxisInteropTest extends TestCase
-{
-    private $options = array(
-        'soap_version' => SOAP_1_2,
-        'features'     => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1
-        'classmap'        => array(
-            'getBook'                => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\getBook',
-            'getBookResponse'        => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\getBookResponse',
-            'getBooksByType'         => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\getBooksByType',
-            'getBooksByTypeResponse' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\getBooksByTypeResponse',
-            'addBook'                => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\addBook',
-            'addBookResponse'        => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\addBookResponse',
-            'BookInformation'        => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\BookInformation',
-        ),
-        'proxy_host' => false,
-    );
-
-    public function testSigEnc()
-    {
-        $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecuritySigEnc.wsdl', $this->options);
-
-        $wssFilter = new BeSimpleWsSecurityFilter();
-        // user key for signature and encryption
-        $securityKeyUser = new BeSimpleWsSecurityKey();
-        $securityKeyUser->addPrivateKey(XmlSecurityKey::RSA_SHA1, __DIR__.'/Fixtures/clientkey.pem', true);
-        $securityKeyUser->addPublicKey(XmlSecurityKey::RSA_SHA1, __DIR__.'/Fixtures/clientcert.pem', true);
-        $wssFilter->setUserSecurityKeyObject($securityKeyUser);
-        // service key for encryption
-        $securityKeyService = new BeSimpleWsSecurityKey();
-        $securityKeyService->addPrivateKey(XmlSecurityKey::TRIPLEDES_CBC);
-        $securityKeyService->addPublicKey(XmlSecurityKey::RSA_1_5, __DIR__.'/Fixtures/servercert.pem', true);
-        $wssFilter->setServiceSecurityKeyObject($securityKeyService);
-        // TOKEN_REFERENCE_SUBJECT_KEY_IDENTIFIER | TOKEN_REFERENCE_SECURITY_TOKEN | TOKEN_REFERENCE_THUMBPRINT_SHA1
-        $wssFilter->setSecurityOptionsSignature(BeSimpleWsSecurityFilter::TOKEN_REFERENCE_SECURITY_TOKEN);
-        $wssFilter->setSecurityOptionsEncryption(BeSimpleWsSecurityFilter::TOKEN_REFERENCE_THUMBPRINT_SHA1);
-
-        $soapKernel = $sc->getSoapKernel();
-        $soapKernel->registerFilter($wssFilter);
-
-        $gb = new getBook();
-        $gb->isbn = '0061020052';
-        $result = $sc->getBook($gb);
-        $this->assertInstanceOf('BeSimple\SoapClient\Tests\AxisInterop\Fixtures\BookInformation', $result->getBookReturn);
-
-        $ab = new addBook();
-        $ab->isbn = '0445203498';
-        $ab->title = 'The Dragon Never Sleeps';
-        $ab->author = 'Cook, Glen';
-        $ab->type = 'scifi';
-
-        $this->assertTrue((bool) $sc->addBook($ab));
-
-        // getBooksByType("scifi");
-    }
-}