Cleaned unused method, property, variable or parameter

Fixed commit c830097430
Fixed issue #22

.travis.yml

@@ -14,6 +14,8 @@ env:
 
 before_script:
   - composer require symfony/http-foundation:${SYMFONY_VERSION} --no-interaction --prefer-source
+  - ./src/BeSimple/SoapClient/Tests/bin/phpwebserver.sh
+  - ./src/BeSimple/SoapClient/Tests/bin/axis.sh
 
 script:
   - phpunit --coverage-text

README.md

@@ -0,0 +1,56 @@
+# BeSimpleSoap
+
+Build SOAP and WSDL based web services
+
+# Components
+
+BeSimpleSoap consists of five components ...
+
+## BeSimpleSoapBundle
+
+The BeSimpleSoapBundle is a Symfony2 bundle to build WSDL and SOAP based web services.
+For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapBundle/README.md).
+
+## BeSimpleSoapClient
+
+The BeSimpleSoapClient is a component that extends the native PHP SoapClient with further features like SwA, MTOM and WS-Security.
+For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapClient/README.md).
+
+## BeSimpleSoapCommon
+
+The BeSimpleSoapCommon component contains functionylity shared by both the server and client implementations.
+For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapCommon/README.md).
+
+
+## BeSimpleSoapServer
+
+The BeSimpleSoapServer is a component that extends the native PHP SoapServer with further features like SwA, MTOM and WS-Security.
+For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapServer/README.md).
+
+## BeSimpleSoapWsdl
+
+For further information see the [README](https://github.com/BeSimple/BeSimpleSoap/blob/master/src/BeSimple/SoapWsdl/README.md).
+
+# 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": "0.2.*@dev"
+    }
+}
+```
+
+Now you are ready to install the library:
+
+```sh
+php /usr/local/bin/composer.phar install
+```

composer.json

@@ -23,17 +23,17 @@
         "php": ">=5.3.0",
         "ext-soap": "*",
         "ext-curl": "*",
-        "ass/xmlsecurity": "dev-master",
+        "ass/xmlsecurity": "~1.0",
         "symfony/framework-bundle": "~2.0",
-        "zendframework/zend-mail": "2.1.*",
-        "zendframework/zend-mime": "2.1.*",
-        "zendframework/zend-soap": "2.1.*"
+        "symfony/twig-bundle": "~2.0",
+        "zendframework/zend-mime": "2.1.*"
     },
     "replace": {
         "besimple/soap-bundle": "self.version",
         "besimple/soap-client": "self.version",
         "besimple/soap-common": "self.version",
-        "besimple/soap-server": "self.version"
+        "besimple/soap-server": "self.version",
+        "besimple/soap-wsdl":   "self.version"
     },
     "require-dev": {
         "ext-mcrypt": "*",
@@ -47,7 +47,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1-dev"
+            "dev-master": "0.2-dev"
         }
     }
 }

src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php

@@ -12,14 +12,16 @@
 
 namespace BeSimple\SoapBundle\Controller;
 
+use BeSimple\SoapBundle\Handler\ExceptionHandler;
 use BeSimple\SoapBundle\Soap\SoapRequest;
 use BeSimple\SoapBundle\Soap\SoapResponse;
-use BeSimple\SoapServer\Exception as SoapException;
-
 use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
@@ -64,6 +66,7 @@ class SoapWebServiceController extends ContainerAware
         $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request'));
         $this->soapServer  = $webServiceContext
             ->getServerBuilder()
+            ->withSoapVersion11()
             ->withHandler($this)
             ->build()
         ;
@@ -99,6 +102,46 @@ class SoapWebServiceController extends ContainerAware
         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 = 'TwigBundle:Exception:'.($this->container->get('kernel')->isDebug() ? 'exception' : 'error').'.txt.twig';
+        $code = $exception->getStatusCode();
+        $details = $this->container->get('templating')->render($view, array(
+            'status_code' => $code,
+            'status_text' => isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '',
+            'exception'   => $exception,
+            'logger'      => $logger,
+        ));
+
+        $server = $this
+            ->container
+            ->get(sprintf('besimple.soap.context.%s', $webservice))
+            ->getServerBuilder()
+            ->withHandler(new ExceptionHandler($exception, $details))
+            ->build()
+        ;
+
+        ob_start();
+        $server->handle($request->getContent());
+
+        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.
@@ -124,13 +167,7 @@ class SoapWebServiceController extends ContainerAware
             );
 
             // forward to controller
-            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);
 

src/BeSimple/SoapBundle/Converter/TypeRepository.php

@@ -12,8 +12,6 @@ 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>
@@ -50,8 +48,6 @@ class TypeRepository
 
     public function fixTypeInformation(ServiceDefinition $definition)
     {
-        $typeMap = $this->defaultTypeMap;
-
         foreach($definition->getAllTypes() as $type) {
             $phpType = $type->getPhpType();
             $xmlType = $type->getXmlType();

src/BeSimple/SoapBundle/Converter/XopIncludeTypeConverter.php

@@ -13,6 +13,7 @@ namespace BeSimple\SoapBundle\Converter;
 use BeSimple\SoapBundle\Soap\SoapRequest;
 use BeSimple\SoapBundle\Soap\SoapResponse;
 use BeSimple\SoapBundle\Util\String;
+use BeSimple\SoapCommon\Converter\TypeConverterInterface;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>

src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php

@@ -63,6 +63,8 @@ class BeSimpleSoapExtension extends Extension
             $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)
@@ -82,7 +84,7 @@ class BeSimpleSoapExtension extends Extension
 
         foreach ($config as $client => $options) {
             $definition = new DefinitionDecorator('besimple.soap.client.builder');
-            $context    = $container->setDefinition(sprintf('besimple.soap.client.builder.%s', $client), $definition);
+            $container->setDefinition(sprintf('besimple.soap.client.builder.%s', $client), $definition);
 
             $definition->replaceArgument(0, $options['wsdl']);
 
@@ -116,7 +118,7 @@ class BeSimpleSoapExtension extends Extension
     private function createClientClassmap($client, array $classmap, ContainerBuilder $container)
     {
         $definition = new DefinitionDecorator('besimple.soap.classmap');
-        $context    = $container->setDefinition(sprintf('besimple.soap.classmap.%s', $client), $definition);
+        $container->setDefinition(sprintf('besimple.soap.classmap.%s', $client), $definition);
 
         $definition->setMethodCalls(array(
             array('set', array($classmap)),
@@ -128,7 +130,7 @@ class BeSimpleSoapExtension extends Extension
     private function createClient($client, ContainerBuilder $container)
     {
         $definition = new DefinitionDecorator('besimple.soap.client');
-        $context    = $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
+        $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
 
         $definition->setFactoryService(sprintf('besimple.soap.client.builder.%s', $client));
     }
@@ -140,7 +142,7 @@ class BeSimpleSoapExtension extends Extension
 
         $contextId  = 'besimple.soap.context.'.$config['name'];
         $definition = new DefinitionDecorator('besimple.soap.context.'.$bindingSuffix);
-        $context    = $container->setDefinition($contextId, $definition);
+        $container->setDefinition($contextId, $definition);
 
         if (isset($config['cache_type'])) {
             $config['cache_type'] = $this->getCacheType($config['cache_type']);
@@ -148,9 +150,9 @@ class BeSimpleSoapExtension extends Extension
 
         $options = $container
             ->getDefinition('besimple.soap.context.'.$bindingSuffix)
-            ->getArgument(5);
+            ->getArgument(2);
 
-        $definition->replaceArgument(5, array_merge($options, $config));
+        $definition->replaceArgument(2, array_merge($options, $config));
     }
 
     private function getCacheType($type)

src/BeSimple/SoapBundle/DependencyInjection/Configuration.php

@@ -40,6 +40,12 @@ class Configuration
         $this->addServicesSection($rootNode);
         $this->addWsdlDumperSection($rootNode);
 
+        $rootNode
+            ->children()
+                ->scalarNode('exception_controller')->defaultValue('BeSimpleSoapBundle:SoapWebService:exception')->end()
+            ->end()
+        ;
+
         return $treeBuilder->buildTree();
     }
 

src/BeSimple/SoapBundle/EventListener/RequestFormatListener.php

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

src/BeSimple/SoapBundle/EventListener/SoapExceptionListener.php

@@ -0,0 +1,79 @@
+<?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 ('soap' !== $request->getRequestFormat()) {
+            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);
+
+        parent::onKernelException($event);
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            KernelEvents::EXCEPTION => array('onKernelException', -64),
+        );
+    }
+}

src/BeSimple/SoapBundle/Handler/ExceptionHandler.php

@@ -0,0 +1,43 @@
+<?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\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\FlattenException;
+
+/**
+ * @author Francis Besset <francis.besset@gmail.com>
+ */
+class ExceptionHandler
+{
+    protected $exception;
+    protected $details;
+
+    public function __construct(FlattenException $exception, $details = null)
+    {
+        $this->exception = $exception;
+        $this->details = $details;
+    }
+
+    public function __call($method, $arguments)
+    {
+        $code = $this->exception->getStatusCode();
+
+        throw new ReceiverSoapFault(
+            isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '',
+            null,
+            $this->details
+        );
+    }
+}

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

@@ -29,10 +29,13 @@
         <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/webservice.xml

@@ -6,6 +6,7 @@
     <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>
@@ -13,8 +14,7 @@
         <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.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.type.repository.class">BeSimple\SoapCommon\Definition\Type\TypeRepository</parameter>
         <parameter key="besimple.soap.server.classmap.class">BeSimple\SoapServer\Classmap</parameter>
     </parameters>
 
@@ -26,11 +26,16 @@
             <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>
@@ -45,9 +50,6 @@
 
         <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>
@@ -60,42 +62,35 @@
             <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="addDefaultTypeMapping">
+            <call method="addType">
                 <argument>string</argument>
                 <argument>xsd:string</argument>
             </call>
-            <call method="addDefaultTypeMapping">
+            <call method="addType">
                 <argument>boolean</argument>
                 <argument>xsd:boolean</argument>
             </call>
-            <call method="addDefaultTypeMapping">
+            <call method="addType">
                 <argument>int</argument>
                 <argument>xsd:int</argument>
             </call>
-            <call method="addDefaultTypeMapping">
+            <call method="addType">
                 <argument>float</argument>
                 <argument>xsd:float</argument>
             </call>
-            <call method="addDefaultTypeMapping">
+            <call method="addType">
                 <argument>date</argument>
                 <argument>xsd:date</argument>
             </call>
-            <call method="addDefaultTypeMapping">
+            <call method="addType">
                 <argument>dateTime</argument>
                 <argument>xsd:dateTime</argument>
             </call>

src/BeSimple/SoapBundle/ServiceBinding/MessageBinderInterface.php

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

src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestHeaderMessageBinder.php

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

src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestMessageBinder.php

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

src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralResponseMessageBinder.php

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

src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php

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

src/BeSimple/SoapBundle/ServiceDefinition/Argument.php

@@ -1,43 +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\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,8 +1,10 @@
 <?php
+
 /*
- * This file is part of the BeSimpleSoapBundle.
+ * 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.

src/BeSimple/SoapBundle/ServiceDefinition/Definition.php

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

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

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

@@ -1,80 +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\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

@@ -1,177 +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\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

@@ -1,95 +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\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

@@ -1,43 +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\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 BeSimpleSoapBundle.
+ * This file is part of the BeSimpleSoap.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
  * (c) Francis Besset <francis.besset@gmail.com>
@@ -14,11 +14,10 @@ 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.
@@ -26,19 +25,23 @@ use Symfony\Component\Config\Loader\LoaderResolverInterface;
  * 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)
+    public function __construct(Reader $reader, TypeRepository $typeRepository)
     {
         $this->reader = $reader;
+        $this->typeRepository = $typeRepository;
     }
 
     /**
@@ -58,39 +61,26 @@ class AnnotationClassLoader extends Loader
         }
 
         $class      = new \ReflectionClass($class);
-        $definition = new Definition\ServiceDefinition();
+        $definition = new Definition\Definition($this->typeRepository);
 
-        $serviceMethodHeaders = array();
+        $sharedHeaders = array();
         foreach ($this->reader->getClassAnnotations($class) as $annotation) {
             if ($annotation instanceof Annotation\Header) {
-                $serviceMethodHeaders[$annotation->getValue()] = $annotation;
+                $sharedHeaders[$annotation->getValue()] = $this->loadType($annotation->getPhpType());
             }
         }
 
         foreach ($class->getMethods() as $method) {
-            $serviceArguments =
-            $serviceHeaders   = array();
+            $serviceHeaders   = $sharedHeaders;
+            $serviceArguments = 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()] = new Definition\Header(
-                        $annotation->getValue(),
-                        $this->getArgumentType($method, $annotation)
-                    );
+                    $serviceHeaders[$annotation->getValue()] = $this->loadType($annotation->getPhpType());
                 } elseif ($annotation instanceof Annotation\Param) {
-                    $serviceArguments[] = new Definition\Argument(
-                        $annotation->getValue(),
-                        $this->getArgumentType($method, $annotation)
-                    );
+                    $serviceArguments[$annotation->getValue()] = $this->loadType($annotation->getPhpType());
                 } elseif ($annotation instanceof Annotation\Method) {
                     if ($serviceMethod) {
                         throw new \LogicException(sprintf('@Soap\Method defined twice for "%s".', $method->getName()));
@@ -98,6 +88,7 @@ class AnnotationClassLoader extends Loader
 
                     $serviceMethod = new Definition\Method(
                         $annotation->getValue(),
+                        $this->typeRepository,
                         $this->getController($class, $method, $annotation)
                     );
                 } elseif ($annotation instanceof Annotation\Result) {
@@ -105,7 +96,7 @@ class AnnotationClassLoader extends Loader
                         throw new \LogicException(sprintf('@Soap\Result defined twice for "%s".', $method->getName()));
                     }
 
-                    $serviceReturn = new Definition\Type($annotation->getPhpType(), $annotation->getXmlType());
+                    $serviceReturn = $annotation->getPhpType();
                 }
             }
 
@@ -114,16 +105,21 @@ class AnnotationClassLoader extends Loader
             }
 
             if ($serviceMethod) {
-                $serviceMethod->setArguments($serviceArguments);
-                $serviceMethod->setHeaders($serviceHeaders);
+                foreach ($serviceHeaders as $name => $type) {
+                    $serviceMethod->addHeader($name, $type);
+                }
+
+                foreach ($serviceArguments as $name => $type) {
+                    $serviceMethod->addInput($name, $type);
+                }
 
                 if (!$serviceReturn) {
                     throw new \LogicException(sprintf('@Soap\Result non-existent for "%s".', $method->getName()));
                 }
 
-                $serviceMethod->setReturn($serviceReturn);
+                $serviceMethod->setOutput($this->loadType($serviceReturn));
 
-                $definition->getMethods()->add($serviceMethod);
+                $definition->addMethod($serviceMethod);
             }
         }
 
@@ -145,28 +141,28 @@ class AnnotationClassLoader extends Loader
         }
     }
 
-    /**
-     * @param \ReflectionMethod $method
-     * @param \BeSimple\SoapBundle\ServiceDefinition\Annotation\Param $annotation
-     *
-     * @return \BeSimple\SoapBundle\ServiceDefinition\Type
-     */
-    private function getArgumentType(\ReflectionMethod $method, Annotation\Param $annotation)
+    private function loadType($phpType)
     {
-        $phpType = $annotation->getPhpType();
-        $xmlType = $annotation->getXmlType();
-
-        if (null === $phpType) {
-            foreach ($method->getParameters() as $param) {
-                if ($param->name === $annotation->getName()) {
-                    $phpType = $param->getClass()->name;
-
-                    break;
-                }
-            }
+        if (false !== $arrayOf = $this->typeRepository->getArrayOf($phpType)) {
+            $this->loadType($arrayOf);
         }
 
-        return new Definition\Type($phpType, $xmlType);
+        if (!$this->typeRepository->hasType($phpType)) {
+            $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());
+            }
+
+            $this->typeRepository->addComplexType($complexType);
+        }
+
+        return $phpType;
     }
 
     /**

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

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the BeSimpleSoapBundle.
+ * This file is part of the BeSimpleSoap.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
  * (c) Francis Besset <francis.besset@gmail.com>
@@ -65,4 +65,17 @@ class AnnotationComplexTypeLoader extends AnnotationClassLoader
 
         return $annotations;
     }
+
+    /**
+     * Returns true if this class supports the given resource.
+     *
+     * @param mixed  $resource A resource
+     * @param string $type     The resource type
+     *
+     * @return Boolean 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 BeSimpleSoapBundle.
+ * This file is part of the BeSimpleSoap.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
  * (c) Francis Besset <francis.besset@gmail.com>
@@ -16,7 +16,6 @@ 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
@@ -62,7 +61,7 @@ class AnnotationFileLoader extends FileLoader
         $path = $this->locator->locate($file);
 
         if ($class = $this->findClass($path)) {
-            return $definition = $this->loader->load($class, $type);
+            return $this->loader->load($class, $type);
         }
 
         return null;

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

@@ -1,145 +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\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,8 +1,10 @@
 <?php
+
 /*
- * This file is part of the BeSimpleSoapBundle.
+ * 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.
@@ -10,36 +12,22 @@
 
 namespace BeSimple\SoapBundle\ServiceDefinition;
 
-use BeSimple\SoapBundle\Util\Collection;
+use BeSimple\SoapCommon\Definition\Method as BaseMethod;
+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 = null, $controller = null, array $headers = array(), array $arguments = array(), Type $return = null)
+    public function __construct($name, TypeRepository $typeRepository, $controller)
     {
-        $this->setName($name);
-        $this->setController($controller);
-        $this->setHeaders($headers);
-        $this->setArguments($arguments);
+        parent::__construct($name, $typeRepository);
 
-        if ($return) {
-            $this->setReturn($return);
-        }
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function setName($name)
-    {
-        $this->name = $name;
+        $this->controller = $controller;
     }
 
     public function getController()
@@ -47,40 +35,8 @@ class Method
         return $this->controller;
     }
 
-    public function setController($controller)
+    public function getVersions()
     {
-        $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;
+        return array(\SOAP_1_1);
     }
 }

src/BeSimple/SoapBundle/ServiceDefinition/ServiceDefinition.php

@@ -1,151 +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\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

@@ -1,89 +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\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

@@ -1,60 +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\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,10 +11,7 @@
 namespace BeSimple\SoapBundle\Soap;
 
 use BeSimple\SoapBundle\Util\Collection;
-
 use Symfony\Component\HttpFoundation\Request;
-
-use Zend\Mime\Mime;
 use Zend\Mime\Message;
 
 /**

src/BeSimple/SoapBundle/WebServiceContext.php

@@ -3,6 +3,7 @@
  * 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.
@@ -10,15 +11,10 @@
 
 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;
 
@@ -26,43 +22,29 @@ 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, DumperInterface $dumper, Classmap $classmap, TypeRepository $typeRepository, TypeConverterCollection $converters, array $options)
+    public function __construct(LoaderInterface $loader, TypeConverterCollection $converters, array $options)
     {
         $this->loader = $loader;
-        $this->wsdlFileDumper = $dumper;
-
-        $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) {
-            $cacheDefinition = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
-            if ($cacheDefinition->isFresh()) {
-                $this->serviceDefinition = include (string) $cacheDefinition;
+            $cache = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
+            if ($cache->isFresh()) {
+                $this->serviceDefinition = include (string) $cache;
             } 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']));
@@ -72,10 +54,7 @@ class WebServiceContext
                 $this->serviceDefinition->setName($this->options['name']);
                 $this->serviceDefinition->setNamespace($this->options['namespace']);
 
-                $this->serviceDefinition->setClassmap($this->classmap);
-                $this->classmap = null;
-
-                $this->typeRepository->fixTypeInformation($this->serviceDefinition);
+                $cache->write('<?php return unserialize('.var_export(serialize($this->serviceDefinition), true).');');
             }
         }
 
@@ -90,18 +69,20 @@ class WebServiceContext
     public function getWsdlFile($endpoint = null)
     {
         $file      = sprintf ('%s/%s.%s.wsdl', $this->options['cache_dir'], $this->options['name'], md5($endpoint));
-        $cacheWsdl = new ConfigCache($file, $this->options['debug']);
+        $cache = new ConfigCache($file, $this->options['debug']);
 
-        if(!$cacheWsdl->isFresh()) {
-            $serviceDefinition = $this->getServiceDefinition();
+        if(!$cache->isFresh()) {
+            $definition = $this->getServiceDefinition();
 
-            $cacheWsdl->write($this->wsdlFileDumper->dumpServiceDefinition($serviceDefinition, $endpoint));
-
-            $cacheDefinition = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
-            $cacheDefinition->write('<?php return unserialize('.var_export(serialize($serviceDefinition), true).');');
+            if ($endpoint) {
+                $definition->setOption('location', $endpoint);
             }
 
-        return (string) $cacheWsdl;
+            $dumper = new Dumper($definition);
+            $cache->write($dumper->dump());
+        }
+
+        return (string) $cache;
     }
 
     public function getServiceBinder()
@@ -123,7 +104,7 @@ class WebServiceContext
         if (null === $this->serverBuilder) {
             $this->serverBuilder = SoapServerBuilder::createWithDefaults()
                 ->withWsdl($this->getWsdlFile())
-                ->withClassmap($this->getServiceDefinition()->getClassmap())
+                ->withClassmap($this->getServiceDefinition()->getTypeRepository()->getClassmap())
                 ->withTypeConverters($this->converters)
             ;
 

src/BeSimple/SoapBundle/composer.json

@@ -22,16 +22,16 @@
     "require": {
         "php": ">=5.3.0",
         "ext-soap": "*",
-        "besimple/soap-common": "0.1.*",
-        "ass/xmlsecurity": "dev-master",
-        "zendframework/zend-mail": "2.1.*",
-        "zendframework/zend-mime": "2.1.*",
-        "zendframework/zend-soap": "2.1.*",
-        "symfony/framework-bundle": "~2.0"
+        "besimple/soap-common": "0.2.*",
+        "besimple/soap-wsdl": "0.2.*",
+        "ass/xmlsecurity": "~1.0",
+        "symfony/framework-bundle": "~2.0",
+        "symfony/twig-bundle": "~2.0",
+        "zendframework/zend-mime": "2.1.*"
     },
     "suggest": {
-        "besimple/soap-client": "0.1.*",
-        "besimple/soap-server": "0.1.*"
+        "besimple/soap-client": "0.2.*",
+        "besimple/soap-server": "0.2.*"
     },
     "autoload": {
         "psr-0": { "BeSimple\\SoapBundle": "" }
@@ -40,7 +40,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1-dev"
+            "dev-master": "0.2-dev"
         }
     }
 }

src/BeSimple/SoapClient/Curl.php

@@ -128,7 +128,7 @@ class Curl
             curl_setopt($this->ch, CURLOPT_HTTPHEADER, $requestHeaders);
         }
 
-        $this->response = $this->execManualRedirect($this->followLocationMaxRedirects);
+        $this->response = $this->execManualRedirect();
 
         return ($this->response === false) ? false : true;
     }

src/BeSimple/SoapClient/MimeFilter.php

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

src/BeSimple/SoapClient/README.md

@@ -0,0 +1,34 @@
+# 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,6 +15,7 @@ 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
@@ -40,6 +41,15 @@ class SoapClient extends \SoapClient
      */
     protected $tracingEnabled = false;
 
+    /**
+     * Work around missing header/php://input access in PHP cli webserver by
+     * setting headers additionally as GET parameters and SOAP request body
+     * explicitly as POST variable.
+     *
+     * @var boolean
+     */
+    private $cliWebserverWorkaround = false;
+
     /**
      * cURL instance.
      *
@@ -98,6 +108,10 @@ class SoapClient extends \SoapClient
         if (isset($options['soap_version'])) {
             $this->soapVersion = $options['soap_version'];
         }
+        // activate cli webserver workaround
+        if (isset($options['cli_webserver_workaround'])) {
+            $this->cliWebserverWorkaround = $options['cli_webserver_workaround'];
+        }
         $this->curl = new Curl($options);
         $wsdlFile = $this->loadWsdl($wsdl, $options);
         // TODO $wsdlHandler = new WsdlHandler($wsdlFile, $this->soapVersion);
@@ -124,14 +138,45 @@ class SoapClient extends \SoapClient
     private function __doHttpRequest(SoapRequest $soapRequest)
     {
         // HTTP headers
+        $soapVersion = $soapRequest->getVersion();
+        $soapAction = $soapRequest->getAction();
+        if (SOAP_1_1 == $soapVersion) {
             $headers = array(
                 'Content-Type:' . $soapRequest->getContentType(),
-            'SOAPAction: "' . $soapRequest->getAction() . '"',
+                'SOAPAction: "' . $soapAction . '"',
             );
+        } else {
+            $headers = array(
+               'Content-Type:' . $soapRequest->getContentType() . '; action="' . $soapAction . '"',
+            );
+        }
+
+        $location = $soapRequest->getLocation();
+        $content = $soapRequest->getContent();
+        /*
+         * Work around missing header/php://input access in PHP cli webserver by
+         * setting headers additionally as GET parameters and SOAP request body
+         * explicitly as POST variable
+         */
+        if ($this->cliWebserverWorkaround === true) {
+            if (strpos($location, '?') === false) {
+                $location .= '?';
+            } else {
+                $location .= '&';
+            }
+            $location .= SoapMessage::CONTENT_TYPE_HEADER.'='.urlencode($soapRequest->getContentType());
+            $location .= '&';
+            $location .= SoapMessage::SOAP_ACTION_HEADER.'='.urlencode($soapRequest->getAction());
+
+            $content = http_build_query(array('request' => $content));
+
+            $headers = array();
+        }
+
         // execute HTTP request with cURL
         $responseSuccessfull = $this->curl->exec(
-            $soapRequest->getLocation(),
-            $soapRequest->getContent(),
+            $location,
+            $content,
             $headers
         );
         // tracing enabled: store last request header and body

src/BeSimple/SoapClient/SoapResponse.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,100 +0,0 @@
-<?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/MtomAxisInteropTest.php

@@ -0,0 +1,51 @@
+<?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',
+        ),
+    );
+
+    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

@@ -1,84 +0,0 @@
-<?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/SwaAxisInteropTest.php

@@ -0,0 +1,77 @@
+<?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',
+        ),
+    );
+
+    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

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

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

@@ -0,0 +1,59 @@
+<?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
+    );
+
+    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

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

@@ -0,0 +1,106 @@
+<?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',
+        ),
+    );
+
+    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");
+    }
+}

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

@@ -1,79 +0,0 @@
-<?php
-
-use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
-use BeSimple\SoapClient\WsSecurityFilter as BeSimpleWsSecurityFilter;
-
-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/library-username-digest.aar" to Apache Axis2 to get
- * this example to work.
- *
- * Using code from axis example:
- * http://www.ibm.com/developerworks/java/library/j-jws4/index.html
- *
- * 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('WsSecurityUserPass.wsdl', $options);
-
-$wssFilter = new BeSimpleWsSecurityFilter(true, 600);
-$wssFilter->addUserData('libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_TEXT);
-//$wssFilter->addUserData( 'libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST );
-
-$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/WsSecurityUserPassAxisInteropTest.php

@@ -0,0 +1,96 @@
+<?php
+
+/*
+* Deploy "axis_services/library-username-digest.aar" to Apache Axis2 to get
+* this example to work.
+*
+* Using code from axis example:
+* http://www.ibm.com/developerworks/java/library/j-jws4/index.html
+*
+* build.properties:
+* server-policy=hash-policy-server.xml
+*
+* allows both text and digest!
+*/
+
+use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
+use BeSimple\SoapClient\WsSecurityFilter as BeSimpleWsSecurityFilter;
+
+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 WsSecurityUserPassAxisInteropTest 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',
+        ),
+    );
+
+    public function testUserPassText()
+    {
+        $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecurityUserPass.wsdl', $this->options);
+
+        $wssFilter = new BeSimpleWsSecurityFilter(true, 600);
+        $wssFilter->addUserData('libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_TEXT);
+
+        $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");
+    }
+
+    public function testUserPassDigest()
+    {
+        $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecurityUserPass.wsdl', $this->options);
+
+        $wssFilter = new BeSimpleWsSecurityFilter(true, 600);
+        $wssFilter->addUserData( 'libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST );
+
+        $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");
+    }
+}

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

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

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

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

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

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

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/MTOM.wsdl

@@ -80,10 +80,10 @@
   </binding>
   <service name="MTOMSample">
     <port name="MTOMSampleSOAP12port_http" binding="tns:MTOMServiceSOAP12Binding">
-      <soap12:address location="http://web/BeSimpleSoapClient/tests/ServerInterop/MTOMServer.php"/>
+      <soap12:address location="http://localhost:8081/ServerInterop/MTOMServer.php"/>
     </port>
     <port name="MTOMSampleSOAP11port_http" binding="tns:MTOMServiceSOAP11Binding">
-      <soap:address location="http://web/BeSimpleSoapClient/tests/ServerInterop/MTOMServer.php"/>
+      <soap:address location="http://localhost:8081/ServerInterop/MTOMServer.php"/>
     </port>
   </service>
 </definitions>

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/SwA.wsdl

@@ -0,0 +1,162 @@
+<?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:documentation>BeSimpleSwaService</wsdl:documentation>
+    <wsdl:types>
+        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://service.besimple">
+            <xs:complexType name="Exception">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType"/>
+                </xs:sequence>
+            </xs:complexType>
+            <xs:element name="Exception">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="Exception" nillable="true" type="ns:Exception"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="uploadFile">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="data" nillable="true" type="xs:base64Binary"/>
+                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="uploadFileResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="downloadFile">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="downloadFileResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="data" nillable="true" type="xs:base64Binary"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="downloadFileRequest">
+        <wsdl:part name="parameters" element="ns:downloadFile"/>
+    </wsdl:message>
+    <wsdl:message name="downloadFileResponse">
+        <wsdl:part name="parameters" element="ns:downloadFileResponse"/>
+    </wsdl:message>
+    <wsdl:message name="Exception">
+        <wsdl:part name="parameters" element="ns:Exception"/>
+    </wsdl:message>
+    <wsdl:message name="uploadFileRequest">
+        <wsdl:part name="parameters" element="ns:uploadFile"/>
+    </wsdl:message>
+    <wsdl:message name="uploadFileResponse">
+        <wsdl:part name="parameters" element="ns:uploadFileResponse"/>
+    </wsdl:message>
+    <wsdl:portType name="BeSimpleSwaServicePortType">
+        <wsdl:operation name="downloadFile">
+            <wsdl:input message="ns:downloadFileRequest" wsaw:Action="urn:downloadFile"/>
+            <wsdl:output message="ns:downloadFileResponse" wsaw:Action="urn:downloadFileResponse"/>
+            <wsdl:fault message="ns:Exception" name="Exception" wsaw:Action="urn:downloadFileException"/>
+        </wsdl:operation>
+        <wsdl:operation name="uploadFile">
+            <wsdl:input message="ns:uploadFileRequest" wsaw:Action="urn:uploadFile"/>
+            <wsdl:output message="ns:uploadFileResponse" wsaw:Action="urn:uploadFileResponse"/>
+            <wsdl:fault message="ns:Exception" name="Exception" wsaw:Action="urn:uploadFileException"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="BeSimpleSwaServiceSoap11Binding" type="ns:BeSimpleSwaServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <wsdl:operation name="downloadFile">
+            <soap:operation soapAction="urn:downloadFile" style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="Exception">
+                <soap:fault use="literal" name="Exception"/>
+            </wsdl:fault>
+        </wsdl:operation>
+        <wsdl:operation name="uploadFile">
+            <soap:operation soapAction="urn:uploadFile" style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="Exception">
+                <soap:fault use="literal" name="Exception"/>
+            </wsdl:fault>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:binding name="BeSimpleSwaServiceSoap12Binding" type="ns:BeSimpleSwaServicePortType">
+        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <wsdl:operation name="downloadFile">
+            <soap12:operation soapAction="urn:downloadFile" style="document"/>
+            <wsdl:input>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="Exception">
+                <soap12:fault use="literal" name="Exception"/>
+            </wsdl:fault>
+        </wsdl:operation>
+        <wsdl:operation name="uploadFile">
+            <soap12:operation soapAction="urn:uploadFile" style="document"/>
+            <wsdl:input>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="Exception">
+                <soap12:fault use="literal" name="Exception"/>
+            </wsdl:fault>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:binding name="BeSimpleSwaServiceHttpBinding" type="ns:BeSimpleSwaServicePortType">
+        <http:binding verb="POST"/>
+        <wsdl:operation name="downloadFile">
+            <http:operation location="BeSimpleSwaService/downloadFile"/>
+            <wsdl:input>
+                <mime:content type="text/xml" part="downloadFile"/>
+            </wsdl:input>
+            <wsdl:output>
+                <mime:content type="text/xml" part="downloadFile"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="uploadFile">
+            <http:operation location="BeSimpleSwaService/uploadFile"/>
+            <wsdl:input>
+                <mime:content type="text/xml" part="uploadFile"/>
+            </wsdl:input>
+            <wsdl:output>
+                <mime:content type="text/xml" part="uploadFile"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="BeSimpleSwaService">
+        <wsdl:port name="BeSimpleSwaServiceHttpSoap11Endpoint" binding="ns:BeSimpleSwaServiceSoap11Binding">
+            <soap:address location="http://localhost:8081/ServerInterop/SwAServer.php"/>
+        </wsdl:port>
+        <wsdl:port name="BeSimpleSwaServiceHttpSoap12Endpoint" binding="ns:BeSimpleSwaServiceSoap12Binding">
+            <soap12:address location="http://localhost:8081/ServerInterop/SwAServer.php"/>
+        </wsdl:port>
+        <wsdl:port name="BeSimpleSwaServiceHttpEndpoint" binding="ns:BeSimpleSwaServiceHttpBinding">
+            <http:address location="http://localhost:8081/ServerInterop/SwAServer.php"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/WsSecuritySigEnc.wsdl

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://ws.sosnoski.com/library/wsdl"
+    xmlns:wns="http://ws.sosnoski.com/library/wsdl"
+    xmlns:tns="http://ws.sosnoski.com/library/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <wsdl:types>
+
+    <schema elementFormDefault="qualified"
+        targetNamespace="http://ws.sosnoski.com/library/wsdl"
+        xmlns="http://www.w3.org/2001/XMLSchema">
+
+      <import namespace="http://ws.sosnoski.com/library/types"/>
+
+      <element name="getBook">
+        <complexType>
+          <sequence>
+            <element name="isbn" type="string"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="getBookResponse">
+        <complexType>
+          <sequence>
+            <element name="getBookReturn" minOccurs="0" type="tns:BookInformation"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="getBooksByType">
+        <complexType>
+          <sequence>
+            <element name="type" type="string"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="getBooksByTypeResponse">
+        <complexType>
+          <sequence>
+            <element name="getBooksByTypeReturn" minOccurs="0" maxOccurs="unbounded" type="tns:BookInformation"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="addBook">
+        <complexType>
+          <sequence>
+            <element name="type" type="string"/>
+            <element name="isbn" type="string"/>
+            <element name="author" minOccurs="0" maxOccurs="unbounded" type="string"/>
+            <element name="title" type="string"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="addBookResponse">
+        <complexType>
+          <sequence>
+            <element name="addBookReturn" type="boolean"/>
+          </sequence>
+        </complexType>
+      </element>
+
+    </schema>
+
+    <schema elementFormDefault="qualified"
+        targetNamespace="http://ws.sosnoski.com/library/types"
+        xmlns="http://www.w3.org/2001/XMLSchema">
+
+      <complexType name="BookInformation">
+        <sequence>
+          <element name="author" minOccurs="0" maxOccurs="unbounded" type="string"/>
+          <element name="title" type="string"/>
+        </sequence>
+        <attribute name="type" use="required" type="string"/>
+        <attribute name="isbn" use="required" type="string"/>
+      </complexType>
+
+    </schema>
+
+  </wsdl:types>
+
+  <wsdl:message name="getBookRequest">
+    <wsdl:part element="wns:getBook" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="getBookResponse">
+    <wsdl:part element="wns:getBookResponse" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="getBooksByTypeRequest">
+    <wsdl:part element="wns:getBooksByType" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="getBooksByTypeResponse">
+    <wsdl:part element="wns:getBooksByTypeResponse" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="addBookRequest">
+    <wsdl:part element="wns:addBook" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="addBookResponse">
+    <wsdl:part element="wns:addBookResponse" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:portType name="Library">
+
+    <wsdl:operation name="getBook">
+      <wsdl:input message="wns:getBookRequest" name="getBookRequest"/>
+      <wsdl:output message="wns:getBookResponse" name="getBookResponse"/>
+    </wsdl:operation>
+
+    <wsdl:operation name="getBooksByType">
+      <wsdl:input message="wns:getBooksByTypeRequest" name="getBooksByTypeRequest"/>
+      <wsdl:output message="wns:getBooksByTypeResponse" name="getBooksByTypeResponse"/>
+    </wsdl:operation>
+
+    <wsdl:operation name="addBook">
+      <wsdl:input message="wns:addBookRequest" name="addBookRequest"/>
+      <wsdl:output message="wns:addBookResponse" name="addBookResponse"/>
+    </wsdl:operation>
+
+  </wsdl:portType>
+
+  <wsdl:binding name="LibrarySoapBinding" type="wns:Library">
+
+    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+    <wsdl:operation name="getBook">
+
+      <wsdlsoap:operation soapAction="urn:getBook"/>
+
+      <wsdl:input name="getBookRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+
+      <wsdl:output name="getBookResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+
+    <wsdl:operation name="getBooksByType">
+
+      <wsdlsoap:operation soapAction="urn:getBooksByType"/>
+
+      <wsdl:input name="getBooksByTypeRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+
+      <wsdl:output name="getBooksByTypeResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+
+    <wsdl:operation name="addBook">
+
+      <wsdlsoap:operation soapAction="urn:addBook"/>
+
+      <wsdl:input name="addBookRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+
+      <wsdl:output name="addBookResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+
+  </wsdl:binding>
+
+  <wsdl:service name="library-signencr">
+
+    <wsdl:port binding="wns:LibrarySoapBinding" name="library">
+      <wsdlsoap:address location="http://localhost:8081/ServerInterop/WsSecuritySigEncServer.php"/>
+    </wsdl:port>
+
+  </wsdl:service>
+
+</wsdl:definitions>

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/WsSecurityUserPass.wsdl

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://ws.sosnoski.com/library/wsdl"
+    xmlns:wns="http://ws.sosnoski.com/library/wsdl"
+    xmlns:tns="http://ws.sosnoski.com/library/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <wsdl:types>
+
+    <schema elementFormDefault="qualified"
+        targetNamespace="http://ws.sosnoski.com/library/wsdl"
+        xmlns="http://www.w3.org/2001/XMLSchema">
+
+      <import namespace="http://ws.sosnoski.com/library/types"/>
+
+      <element name="getBook">
+        <complexType>
+          <sequence>
+            <element name="isbn" type="string"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="getBookResponse">
+        <complexType>
+          <sequence>
+            <element name="getBookReturn" minOccurs="0" type="tns:BookInformation"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="getBooksByType">
+        <complexType>
+          <sequence>
+            <element name="type" type="string"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="getBooksByTypeResponse">
+        <complexType>
+          <sequence>
+            <element name="getBooksByTypeReturn" minOccurs="0" maxOccurs="unbounded" type="tns:BookInformation"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="addBook">
+        <complexType>
+          <sequence>
+            <element name="type" type="string"/>
+            <element name="isbn" type="string"/>
+            <element name="author" minOccurs="0" maxOccurs="unbounded" type="string"/>
+            <element name="title" type="string"/>
+          </sequence>
+        </complexType>
+      </element>
+
+      <element name="addBookResponse">
+        <complexType>
+          <sequence>
+            <element name="addBookReturn" type="boolean"/>
+          </sequence>
+        </complexType>
+      </element>
+
+    </schema>
+
+    <schema elementFormDefault="qualified"
+        targetNamespace="http://ws.sosnoski.com/library/types"
+        xmlns="http://www.w3.org/2001/XMLSchema">
+
+      <complexType name="BookInformation">
+        <sequence>
+          <element name="author" minOccurs="0" maxOccurs="unbounded" type="string"/>
+          <element name="title" type="string"/>
+        </sequence>
+        <attribute name="type" use="required" type="string"/>
+        <attribute name="isbn" use="required" type="string"/>
+      </complexType>
+
+    </schema>
+
+  </wsdl:types>
+
+  <wsdl:message name="getBookRequest">
+    <wsdl:part element="wns:getBook" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="getBookResponse">
+    <wsdl:part element="wns:getBookResponse" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="getBooksByTypeRequest">
+    <wsdl:part element="wns:getBooksByType" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="getBooksByTypeResponse">
+    <wsdl:part element="wns:getBooksByTypeResponse" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="addBookRequest">
+    <wsdl:part element="wns:addBook" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:message name="addBookResponse">
+    <wsdl:part element="wns:addBookResponse" name="parameters"/>
+  </wsdl:message>
+
+  <wsdl:portType name="Library">
+
+    <wsdl:operation name="getBook">
+      <wsdl:input message="wns:getBookRequest" name="getBookRequest"/>
+      <wsdl:output message="wns:getBookResponse" name="getBookResponse"/>
+    </wsdl:operation>
+
+    <wsdl:operation name="getBooksByType">
+      <wsdl:input message="wns:getBooksByTypeRequest" name="getBooksByTypeRequest"/>
+      <wsdl:output message="wns:getBooksByTypeResponse" name="getBooksByTypeResponse"/>
+    </wsdl:operation>
+
+    <wsdl:operation name="addBook">
+      <wsdl:input message="wns:addBookRequest" name="addBookRequest"/>
+      <wsdl:output message="wns:addBookResponse" name="addBookResponse"/>
+    </wsdl:operation>
+
+  </wsdl:portType>
+
+  <wsdl:binding name="LibrarySoapBinding" type="wns:Library">
+
+    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+    <wsdl:operation name="getBook">
+
+      <wsdlsoap:operation soapAction="urn:getBook"/>
+
+      <wsdl:input name="getBookRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+
+      <wsdl:output name="getBookResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+
+    <wsdl:operation name="getBooksByType">
+
+      <wsdlsoap:operation soapAction="urn:getBooksByType"/>
+
+      <wsdl:input name="getBooksByTypeRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+
+      <wsdl:output name="getBooksByTypeResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+
+    <wsdl:operation name="addBook">
+
+      <wsdlsoap:operation soapAction="urn:addBook"/>
+
+      <wsdl:input name="addBookRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+
+      <wsdl:output name="addBookResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+
+  </wsdl:binding>
+
+  <wsdl:service name="library-username">
+
+    <wsdl:port binding="wns:LibrarySoapBinding" name="library">
+      <wsdlsoap:address location="http://localhost:8081/ServerInterop/WsSecurityUserPassServer.php"/>
+    </wsdl:port>
+
+  </wsdl:service>
+
+</wsdl:definitions>

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

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

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

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

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

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

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/clientcert.pem

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICoDCCAgkCBEnhw2IwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNVBAYTAk5aMRMw
+EQYDVQQIEwpXZWxsaW5ndG9uMRowGAYDVQQHExFQYXJhcGFyYXVtdSBCZWFjaDEq
+MCgGA1UEChMhU29zbm9za2kgU29mdHdhcmUgQXNzb2NpYXRlcyBMdGQuMRAwDgYD
+VQQLEwdVbmtub3duMRgwFgYDVQQDEw9EZW5uaXMgU29zbm9za2kwHhcNMDkwNDEy
+MTAzMzA2WhcNMzYwODI3MTAzMzA2WjCBljELMAkGA1UEBhMCTloxEzARBgNVBAgT
+CldlbGxpbmd0b24xGjAYBgNVBAcTEVBhcmFwYXJhdW11IEJlYWNoMSowKAYDVQQK
+EyFTb3Nub3NraSBTb2Z0d2FyZSBBc3NvY2lhdGVzIEx0ZC4xEDAOBgNVBAsTB1Vu
+a25vd24xGDAWBgNVBAMTD0Rlbm5pcyBTb3Nub3NraTCBnzANBgkqhkiG9w0BAQEF
+AAOBjQAwgYkCgYEAhOVyNK8xyxtb4DnKtU6mF9KoiFqCk7eKoLE26+9h410CtTkx
+zWAfgnR+8i+LPbdsPY+yXAo6NYpCCKolXfDLe+AG2GwnMZGrIl6+BLF3hqTmIXBF
+TLGUmC7A7uBTivaWgdH1w3hb33rASoVU67BVtQ3QQi99juZX4vU9o9pScocCAwEA
+ATANBgkqhkiG9w0BAQUFAAOBgQBMNPo1KAGbz8Jl6HGbtAcetieSJ3bEAXmv1tcj
+ysBS67AXzdu1Ac+onHh2EpzBM7kuGbw+trU+AhulooPpewIQRApXP1F0KHRDcbqW
+jwvknS6HnomN9572giLGKn2601bHiRUj35hiA8aLmMUBppIRPFFAoQ0QUBCPx+m8
+/0n33w==
+-----END CERTIFICATE-----

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/clientkey.pem

@@ -0,0 +1,14 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAITlcjSvMcsbW+A5yrVOphfSqIha
+gpO3iqCxNuvvYeNdArU5Mc1gH4J0fvIviz23bD2PslwKOjWKQgiqJV3wy3vgBthsJzGRqyJevgSx
+d4ak5iFwRUyxlJguwO7gU4r2loHR9cN4W996wEqFVOuwVbUN0EIvfY7mV+L1PaPaUnKHAgMBAAEC
+gYAZ6UqtLwN8YGc3fs0hMKZ9upsViuAuwPiMgED/G3twgzAF+ZLWQkmie+hMfCyf6eV200+pVm0n
+Bz/8xH/oowxpX0Kk3szoB4vFghjU84GKUcrbhu/NRIm7l3drnfbzqhQkHDCx6n1CotI4Gs49cDWu
+4uEAuxJkEIVY553unZjZgQJBAOJVIallNKmD0iQlvtWRmRzpmYDjt9vhNY6WBTIOx6SDn9SRaoSA
+fkipQ2HXo04r78TQ674+zfZ1lRTkFG7px6ECQQCWUPHp3pSZOM1oGzJrNvNaw+MizZAZjq34npHm
+9GRquFLG7BlCaI9QNGE7pN2ryYsYCRUMaM2e4GR0tUXxVGknAkAgrxqFU9AfCqI2Bh1gyf3KZxF7
+w2axofwR8ygc6nV6FGfoUneHWubhp0/LuVAj4cRmL6Vbe8ZSaPh2Y9lviuMBAkEAicP8Q+1E4j1m
+PPEYP51oYprANOiUFmhnWEL00+jPk+QFsd03tV6hYs/vAbwzkjuwqMHCMdJoCiH8z95IEUvc5wJA
+MvLOuZdu4dmhOXg/YKsbMSPjFNEVskLQNSXqw6O2wIrpPg1NQvBBAOTbiuZj3vind4VPos1wc4vB
+QocvdUC6dA==
+-----END PRIVATE KEY-----

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

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

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

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

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

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

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

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

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

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

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

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

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/servercert.pem

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICoDCCAgkCBEnhwzMwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNVBAYTAk5aMRMw
+EQYDVQQIEwpXZWxsaW5ndG9uMRowGAYDVQQHExFQYXJhcGFyYXVtdSBCZWFjaDEq
+MCgGA1UEChMhU29zbm9za2kgU29mdHdhcmUgQXNzb2NpYXRlcyBMdGQuMRAwDgYD
+VQQLEwdVbmtub3duMRgwFgYDVQQDEw9EZW5uaXMgU29zbm9za2kwHhcNMDkwNDEy
+MTAzMjE5WhcNMzYwODI3MTAzMjE5WjCBljELMAkGA1UEBhMCTloxEzARBgNVBAgT
+CldlbGxpbmd0b24xGjAYBgNVBAcTEVBhcmFwYXJhdW11IEJlYWNoMSowKAYDVQQK
+EyFTb3Nub3NraSBTb2Z0d2FyZSBBc3NvY2lhdGVzIEx0ZC4xEDAOBgNVBAsTB1Vu
+a25vd24xGDAWBgNVBAMTD0Rlbm5pcyBTb3Nub3NraTCBnzANBgkqhkiG9w0BAQEF
+AAOBjQAwgYkCgYEA1H3mjQCF9uce2jmm/Yq9kE4ytfvkp4c8G90cDfJXJvOiGQds
+p2vDZXKuCkHQ7vsBBXPNTt8J/d8ZbEwyuB9Ccz5pJqi6Ig6Y2/mEsPthDyh5SrJV
+yQ/wxUGwmfSuwdrIMnplMTq+OR9BOfT3CvjSvuy9d6BQNo4wOMkDvmZTtI8CAwEA
+ATANBgkqhkiG9w0BAQUFAAOBgQCqv4475QaqlKcN2QCZJbLVKZEX+76XLQurGkgf
+2fCgesRHjfUfOHyTTlhWQdEKTcBB2XviUyyW6I//fmKfXUIiQqvgh4LHdXRPEXDf
+Y9nr89MjyQpDlnl6AlrvSej30a9iwVRUeVk4d6gxWHMRonKBFgh+TGexxUXHtPkf
+B1Pdtg==
+-----END CERTIFICATE-----

src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/serverkey.pem

@@ -0,0 +1,14 @@
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANR95o0AhfbnHto5pv2KvZBOMrX7
+5KeHPBvdHA3yVybzohkHbKdrw2VyrgpB0O77AQVzzU7fCf3fGWxMMrgfQnM+aSaouiIOmNv5hLD7
+YQ8oeUqyVckP8MVBsJn0rsHayDJ6ZTE6vjkfQTn09wr40r7svXegUDaOMDjJA75mU7SPAgMBAAEC
+gYEAmw+EvkAzggkGKpkHkt07l6J4vvQh116ILo0be9HsZzBCiaExWLr6y3z0I+gDX2ErTZ9Dotp/
+oBK9qpmwKUwmYD3ogbB2AEDtN29qQxzrJR8dD742zAY6s2SrvU+HVvNmp84UutEtMceP9LsqKX3o
+9ZwhY4GefkoJPdumYZa+hYECQQDzNgSE5+bZfWQnd+o59vWpF+ZGWegIW9aEb+O5jnb5msYtJGGx
+SJ1UWV+c/xn2xO/djXCLVh0EFjMLgr/4g45tAkEA36pbTesmnXB4m/9Q87Ljkgo1mRXGfq5na3bU
+k1FrXjxEBaumpssniyy7tT6TWiwGBIelmWCI1dv4shcQFnPBawJBAJwGDFIi3zKpQWYchJOY/bHz
+lhONu9AY8n5VtValsWehRf9RtqZfuiaRi0gRU1u+rU6JXSjWHpkvkKGSyIqqAuUCQG321q8HZtPP
+AS1JKKa4E9SwOkvKfe24l1YpdTf8trn9DUBwdR3aEdYGJz9jxZR2wnqlqlAvOvdSEAKW/izbuoMC
+QBn5SLa7Zk2e9N5bmcV9Wa1VRC8wawKu+qO/Qj4UcmTH8bSrr4/kqh2TpMxSZ99HeCDJkSK0XZME
+y+Vn2DLefIc=
+-----END PRIVATE KEY-----

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

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

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

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

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

@@ -1,25 +1,12 @@
 <?php
 
+require '../../../../../vendor/autoload.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
-{
-}
+use BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary;
+use BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest;
 
 $options = array(
     'soap_version'    => SOAP_1_1,
@@ -28,12 +15,14 @@ $options = array(
     'attachment_type' => BeSimpleSoapHelper::ATTACHMENTS_TYPE_MTOM,
     'cache_wsdl'      => WSDL_CACHE_NONE,
     'classmap'        => array(
-        'base64Binary'      => 'base64Binary',
-        'AttachmentRequest' => 'AttachmentRequest',
+        'base64Binary'      => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary',
+        'AttachmentRequest' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest',
     ),
+    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
+    'connection_timeout' => 1,
 );
 
-$sc = new BeSimpleSoapClient('MTOM.wsdl', $options);
+$sc = new BeSimpleSoapClient('Fixtures/MTOM.wsdl', $options);
 
 //var_dump($sc->__getFunctions());
 //var_dump($sc->__getTypes());

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

@@ -1,25 +1,11 @@
 <?php
 
+require '../../../../../vendor/autoload.php';
+
 use BeSimple\SoapCommon\Helper as BeSimpleSoapHelper;
 use BeSimple\SoapServer\SoapServer as BeSimpleSoapServer;
 
-require '../../../BeSimpleSoapServer/tests/bootstrap.php';
-
-class base64Binary
-{
-    public $_;
-    public $contentType;
-}
-
-class AttachmentType
-{
-    public $fileName;
-    public $binaryData;
-}
-
-class AttachmentRequest extends AttachmentType
-{
-}
+use BeSimple\SoapClient\Tests\ServerInterop\Fixtures;
 
 $options = array(
     'soap_version'    => SOAP_1_1,
@@ -27,8 +13,8 @@ $options = array(
     'attachment_type' => BeSimpleSoapHelper::ATTACHMENTS_TYPE_MTOM,
     'cache_wsdl'      => WSDL_CACHE_NONE,
     'classmap'        => array(
-        'base64Binary'      => 'base64Binary',
-        'AttachmentRequest' => 'AttachmentRequest',
+        'base64Binary'      => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary',
+        'AttachmentRequest' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest',
     ),
 );
 
@@ -38,16 +24,12 @@ class Mtom
     {
         $b64 = $attachment->binaryData;
 
-        file_put_contents('test.txt', var_export(array(
-            $attachment->fileName,
-            $b64->_,
-            $b64->contentType
-        ), true));
+        file_put_contents(__DIR__.'/'.$attachment->fileName, $b64->_);
 
-        return 'done';
+        return 'File saved succesfully.';
     }
 }
 
-$ss = new BeSimpleSoapServer('MTOM.wsdl', $options);
+$ss = new BeSimpleSoapServer(__DIR__.'/Fixtures/MTOM.wsdl', $options);
 $ss->setClass('Mtom');
 $ss->handle();