Merge pull request #14 from tmirks/enable-symfony-bundle

Get basic bundle configuration working for SoapClient with Symfony 3.x.

.travis.yml

@@ -1,16 +1,14 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
   - 7.0
   - 7.1
 
 before_script:
   - composer self-update
   - composer install
+  - cp phpunit.xml.dist phpunit.xml
+  - php -S localhost:8000 > /dev/null 2>&1 &
 
 script:
   - vendor/phing/phing/bin/phing -f build.xml

README.md

@@ -145,3 +145,11 @@ See a simplified implementation of ``dummyServiceMethod`` to get a clue:
 ```
 
 For further information and getting inspiration for your implementation, see the unit tests in ``tests`` dir. 
+
+# Contribute
+
+[![Build Status](https://travis-ci.org/tuscanicz/BeSimpleSoap.svg?branch=master)](https://travis-ci.org/tuscanicz/BeSimpleSoap)
+
+Feel free to contribute! Please, run the tests via Phing ``php phing -f build.xml``.
+
+**Warning:** Unit tests may fail under Windows OS, tested under Linux, MacOS.

phpunit.xml.dist

@@ -21,6 +21,16 @@
         </testsuite>
     </testsuites>
 
+    <filter>
+        <whitelist>
+            <directory>src</directory>
+            <exclude>
+                <directory>src/BeSimple/SoapBundle</directory>
+                <directory>src/BeSimple/SoapCommon/Type</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+
     <logging>
         <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" showOnlySummary="true"/>
         <log type="coverage-clover" target="cache/clover.xml"/>

src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php

@@ -14,6 +14,8 @@ namespace BeSimple\SoapBundle\DependencyInjection;
 
 use BeSimple\SoapCommon\Cache;
 
+use BeSimple\SoapCommon\SoapOptions\SoapOptions;
+use Carpages\Core\Entity\ContactPhone;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -41,6 +43,7 @@ class BeSimpleSoapExtension extends Extension
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
         $loader->load('request.xml');
+        $loader->load('soap.xml');
 
         $loader->load('loaders.xml');
         $loader->load('converters.xml');
@@ -53,8 +56,8 @@ class BeSimpleSoapExtension extends Extension
 
         $this->registerCacheConfiguration($config['cache'], $container, $loader);
 
-        if (!empty($config['clients'])) {
-            $this->registerClientConfiguration($config['clients'], $container, $loader);
+        if ( ! empty($config['clients'])) {
+            $this->registerClientConfiguration($config, $container, $loader);
         }
 
         $container->setParameter('besimple.soap.definition.dumper.options.stylesheet', $config['wsdl_dumper']['stylesheet']);
@@ -69,11 +72,9 @@ class BeSimpleSoapExtension extends Extension
 
     private function registerCacheConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
-        $loader->load('soap.xml');
-
         $config['type'] = $this->getCacheType($config['type']);
 
-        foreach (array('type', 'lifetime', 'limit') as $key) {
+        foreach (array('type', 'file') as $key) {
             $container->setParameter('besimple.soap.cache.'.$key, $config[$key]);
         }
     }
@@ -82,22 +83,33 @@ class BeSimpleSoapExtension extends Extension
     {
         $loader->load('client.xml');
 
-        foreach ($config as $client => $options) {
-            $definition = new DefinitionDecorator('besimple.soap.client.builder');
-            $container->setDefinition(sprintf('besimple.soap.client.builder.%s', $client), $definition);
+        foreach ($config['clients'] as $client => $options) {
+            $soapClientOpts = new DefinitionDecorator('besimple.soap.client_options');
+            $soapOpts       = new DefinitionDecorator('besimple.soap.options');
 
-            $definition->replaceArgument(0, $options['wsdl']);
+            $soapClientOptsService = sprintf('besimple.soap.client_options.%s', $client);
+            $soapOptsService       = sprintf('besimple.soap.options.%s', $client);
 
-            $defOptions = $container
-                    ->getDefinition('besimple.soap.client.builder')
-                    ->getArgument(1);
+            // configure SoapClient
+            $definition     = new DefinitionDecorator('besimple.soap.client');
 
-            foreach (array('cache_type', 'user_agent') as $key) {
-                if (isset($options[$key])) {
-                    $defOptions[$key] = $options[$key];
-                }
-            }
+            $container->setDefinition(
+                sprintf('besimple.soap.client.%s', $client),
+                $definition
+            );
+            $container->setDefinition(
+                $soapClientOptsService,
+                $soapClientOpts
+            );
+            $container->setDefinition(
+                $soapOptsService,
+                $soapOpts
+            );
 
+            $definition->replaceArgument(0, new Reference($soapClientOptsService));
+            $definition->replaceArgument(1, new Reference($soapOptsService));
+
+            // configure proxy
             $proxy = $options['proxy'];
             if (false !== $proxy['host']) {
                 if (null !== $proxy['auth']) {
@@ -108,49 +120,58 @@ class BeSimpleSoapExtension extends Extension
                     }
                 }
 
-                $definition->addMethodCall('withProxy', array(
-                    $proxy['host'], $proxy['port'],
-                    $proxy['login'], $proxy['password'],
-                    $proxy['auth']
-                ));
+                $proxy = $this->createClientProxy($client, $proxy, $container);
+                $soapClientOpts->setFactory([
+                    '%besimple.soap.client_options_builder.class%',
+                    'createWithProxy'
+                ]);
+                $soapClientOpts->setArgument(0, new Reference($proxy));
             }
 
-            if (isset($defOptions['cache_type'])) {
-                $defOptions['cache_type'] = $this->getCacheType($defOptions['cache_type']);
+            // configure SoapOptions for client
+            $classMap = $this->createClientClassMap($client, $options['classmap'], $container);
+
+            $soapOpts->replaceArgument(0, $config['cache']['file']);
+            $soapOpts->replaceArgument(1, new Reference($classMap));
+            $soapOpts->replaceArgument(2, $this->getCacheType($config['cache']['type']));
+
+            if ($config['cache']['version'] == SoapOptions::SOAP_VERSION_1_1) {
+                $soapOpts->setFactory([
+                    '%besimple.soap.options_builder.class%',
+                    'createWithClassMapV11'
+                ]);
             }
-
-            $definition->replaceArgument(1, $defOptions);
-
-            $classmap = $this->createClientClassmap($client, $options['classmap'], $container);
-            $definition->replaceArgument(2, new Reference($classmap));
-
-            $this->createClient($client, $container);
         }
     }
 
-    private function createClientClassmap($client, array $classmap, ContainerBuilder $container)
+    private function createClientClassMap($client, array $classmap, ContainerBuilder $container)
     {
         $definition = new DefinitionDecorator('besimple.soap.classmap');
         $container->setDefinition(sprintf('besimple.soap.classmap.%s', $client), $definition);
 
-        if (!empty($classmap)) {
+        if ( ! empty($classmap)) {
             $definition->setMethodCalls(array(
-                array('set', array($classmap)),
+                array('__construct', array($classmap)),
             ));
         }
 
         return sprintf('besimple.soap.classmap.%s', $client);
     }
 
-    private function createClient($client, ContainerBuilder $container)
+    private function createClientProxy($client, array $proxy, ContainerBuilder $container)
     {
-        $definition = new DefinitionDecorator('besimple.soap.client');
-        $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
+        $definition = new DefinitionDecorator('besimple.soap.client.proxy');
+        $container->setDefinition(sprintf('besimple.soap.client.proxy.%s', $client), $definition);
 
-        $definition->setFactory(array(
-            new Reference(sprintf('besimple.soap.client.builder.%s', $client)),
-            'build'
-        ));
+        if ( ! empty($proxy)) {
+            $definition->replaceArgument(0, $proxy['host']);
+            $definition->replaceArgument(1, $proxy['port']);
+            $definition->replaceArgument(2, $proxy['login']);
+            $definition->replaceArgument(3, $proxy['password']);
+            $definition->replaceArgument(4, $proxy['auth']);
+        }
+
+        return sprintf('besimple.soap.client.proxy.%s', $client);
     }
 
     private function createWebServiceContext(array $config, ContainerBuilder $container)

src/BeSimple/SoapBundle/DependencyInjection/Configuration.php

@@ -64,6 +64,10 @@ class Configuration
                                     ->thenInvalid(sprintf('The cache type has to be either %s', implode(', ', $this->cacheTypes)))
                                 ->end()
                             ->end()
+                            ->scalarNode('version')->defaultNull()->end()
+                            ->scalarNode('encoding')->defaultNull()->end()
+                            ->scalarNode('keepalive')->defaultNull()->end()
+                            ->scalarNode('file')->defaultNull()->end()
                             ->scalarNode('lifetime')->defaultNull()->end()
                             ->scalarNode('limit')->defaultNull()->end()
                         ->end()

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

@@ -4,26 +4,26 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="besimple.soap.client.builder.class">BeSimple\SoapBundle\Soap\SoapClientBuilder</parameter>
-        <parameter key="besimple.soap.classmap.class">BeSimple\SoapCommon\Classmap</parameter>
+        <parameter key="besimple.soap.client.builder.class">BeSimple\SoapClient\SoapClientBuilder</parameter>
+        <parameter key="besimple.soap.client.class">BeSimple\SoapClient\SoapClient</parameter>
+        <parameter key="besimple.soap.client.proxy.class">BeSimple\SoapClient\SoapServerProxy\SoapServerProxy</parameter>
     </parameters>
 
     <services>
-        <service id="besimple.soap.client.builder" class="%besimple.soap.client.builder.class%" abstract="true">
-            <argument /> <!-- wsdl URI -->
-            <argument type="collection">
-                <argument key="debug">%kernel.debug%</argument>
-            </argument>
-            <argument type="service" id="besimple.soap.classmap" />
-            <argument type="service" id="besimple.soap.converter.collection" />
-            <argument type="service" id="besimple.soap.cache" /> <!-- hack to load besimple cache configuration -->
+
+        <service id="besimple.soap.client" class="%besimple.soap.client.class%" abstract="true">
+            <factory class="%besimple.soap.client.builder.class%" method="build" />
+            <argument type="service" id="besimple.soap.client_options" />
+            <argument type="service" id="besimple.soap.options" /> <!-- hack to load besimple cache configuration -->
         </service>
 
-        <service id="besimple.soap.client" class="%besimple.soap.client.builder.class%" abstract="true">
-            <factory class="besimple.soap.client.builder" method="build" />
+        <service id="besimple.soap.client.proxy" class="%besimple.soap.client.proxy.class%" abstract="true">
+            <argument id="$host" />
+            <argument id="$port" />
+            <argument id="$login" />
+            <argument id="$password" />
+            <argument id="$authenticationType" />
         </service>
-
-        <service id="besimple.soap.classmap" class="%besimple.soap.classmap.class%" abstract="true" />
     </services>
 
 </container>

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

@@ -1,20 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="besimple.soap.cache.class">BeSimple\SoapBundle\Cache</parameter>
-        <parameter key="besimple.soap.cache.dir">%kernel.cache_dir%/besimple/soap</parameter>
+        <parameter key="besimple.soap.classmap.class">BeSimple\SoapCommon\ClassMap</parameter>
+        <parameter key="besimple.soap.client_options.class">BeSimple\SoapClient\SoapOptions\SoapClientOptions</parameter>
+        <parameter key="besimple.soap.client_options_builder.class">BeSimple\SoapClient\SoapClientOptionsBuilder</parameter>
+        <parameter key="besimple.soap.options.class">BeSimple\SoapCommon\SoapOptions\SoapOptions</parameter>
+        <parameter key="besimple.soap.options_builder.class">BeSimple\SoapCommon\SoapOptionsBuilder</parameter>
+        <parameter key="besimple.soap.cache.dir">%kernel.cache_dir%</parameter>
     </parameters>
 
     <services>
-        <service id="besimple.soap.cache" class="%besimple.soap.cache.class%">
-            <argument>%kernel.debug%</argument>
+        <service id="besimple.soap.client_options" class="%besimple.soap.client_options.class%" abstract="true">
+            <!-- call the static method -->
+            <factory class="%besimple.soap.client_options_builder.class%" method="createWithDefaults" />
+        </service>
+
+        <service id="besimple.soap.classmap" class="%besimple.soap.classmap.class%" abstract="true" />
+
+        <service id="besimple.soap.options" class="%besimple.soap.options.class%" abstract="true">
+            <factory class="%besimple.soap.options_builder.class%" method="createWithClassMap" />
+            <argument>%besimple.soap.cache.file%</argument>
+            <argument type="service" id="besimple.soap.classmap" />
             <argument>%besimple.soap.cache.type%</argument>
-            <argument>%besimple.soap.cache.dir%/cache</argument>
-            <argument>%besimple.soap.cache.lifetime%</argument>
-            <argument>%besimple.soap.cache.limit%</argument>
+            <argument>%besimple.soap.cache.dir%</argument>
         </service>
     </services>
 

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

@@ -15,7 +15,7 @@
         <parameter key="besimple.soap.binder.request_header.documentwrapped.class">BeSimple\SoapBundle\ServiceBinding\DocumentLiteralWrappedRequestHeaderMessageBinder</parameter>
         <parameter key="besimple.soap.binder.response.documentwrapped.class">BeSimple\SoapBundle\ServiceBinding\DocumentLiteralWrappedResponseMessageBinder</parameter>
         <parameter key="besimple.soap.type.repository.class">BeSimple\SoapCommon\Definition\Type\TypeRepository</parameter>
-        <parameter key="besimple.soap.server.classmap.class">BeSimple\SoapServer\Classmap</parameter>
+        <parameter key="besimple.soap.server.classmap.class">BeSimple\SoapCommon\ClassMap</parameter>
     </parameters>
 
     <services>

src/BeSimple/SoapClient/Curl/Curl.php

@@ -4,7 +4,6 @@ namespace BeSimple\SoapClient\Curl;
 
 use BeSimple\SoapClient\Curl\Http\HttpAuthenticationBasicOptions;
 use BeSimple\SoapClient\Curl\Http\HttpAuthenticationDigestOptions;
-use BeSimple\SoapClient\Curl\Http\SslCertificateOptions;
 use Exception;
 
 class Curl
@@ -141,6 +140,11 @@ class Curl
                 curl_setopt($curlSession, CURLOPT_CAPATH, $sslCertificateOptions->hasCertificateAuthorityPath());
             }
         }
+
+        if ($options->hasSslVersion()) {
+            curl_setopt($curlSession, CURLOPT_SSLVERSION, $options->getSslVersion());
+        }
+
         $executeSoapCallResponse = $this->executeHttpCall($curlSession, $options);
 
         $httpRequestHeadersAsString = curl_getinfo($curlSession, CURLINFO_HEADER_OUT);
@@ -159,7 +163,7 @@ class Curl
             $httpResponseCode
         );
 
-        if (!is_integer($httpResponseCode) || $httpResponseCode >= 400 || $httpResponseCode === 0) {
+        if (!is_int($httpResponseCode) || $httpResponseCode >= 400 || $httpResponseCode === 0) {
 
             return new CurlResponse(
                 $this->normalizeStringOrFalse($httpRequestHeadersAsString),

src/BeSimple/SoapClient/Curl/CurlOptions.php

@@ -2,9 +2,9 @@
 
 namespace BeSimple\SoapClient\Curl;
 
+use BeSimple\SoapClient\Curl\Http\HttpAuthenticationBasicOptions;
 use BeSimple\SoapClient\Curl\Http\HttpAuthenticationDigestOptions;
 use BeSimple\SoapClient\Curl\Http\HttpAuthenticationInterface;
-use BeSimple\SoapClient\Curl\Http\HttpAuthenticationBasicOptions;
 use BeSimple\SoapClient\Curl\Http\SslCertificateOptions;
 use BeSimple\SoapClient\SoapServerProxy\SoapServerProxy;
 
@@ -22,6 +22,7 @@ class CurlOptions
     private $proxy;
     private $httpAuthentication;
     private $sslCertificateOptions;
+    private $sslVersion;
 
     /**
      * @param string $userAgent
@@ -31,6 +32,7 @@ class CurlOptions
      * @param SoapServerProxy|null $proxy
      * @param HttpAuthenticationInterface|null $httpAuthentication
      * @param SslCertificateOptions|null $sslCertificateOptions
+     * @param int $sslVersion
      */
     public function __construct(
         $userAgent,
@@ -39,7 +41,8 @@ class CurlOptions
         $connectionTimeout,
         SoapServerProxy $proxy = null,
         HttpAuthenticationInterface $httpAuthentication = null,
-        SslCertificateOptions $sslCertificateOptions = null
+        SslCertificateOptions $sslCertificateOptions = null,
+        $sslVersion = null
     ) {
         $this->userAgent = $userAgent;
         $this->followLocationMaxRedirects = $followLocationMaxRedirects;
@@ -48,6 +51,7 @@ class CurlOptions
         $this->proxy = $proxy;
         $this->httpAuthentication = $httpAuthentication;
         $this->sslCertificateOptions = $sslCertificateOptions;
+        $this->sslVersion = $sslVersion;
     }
 
     public function getUserAgent()
@@ -123,4 +127,14 @@ class CurlOptions
 
         return false;
     }
+
+    public function hasSslVersion()
+    {
+        return $this->sslVersion !== null;
+    }
+
+    public function getSslVersion()
+    {
+        return $this->sslVersion;
+    }
 }

src/BeSimple/SoapClient/Curl/CurlOptionsBuilder.php

@@ -34,7 +34,8 @@ class CurlOptionsBuilder
             self::DEFAULT_CONNECTION_TIMEOUT,
             $soapClientOptions->getProxy(),
             self::getHttpAuthOptions($soapClientOptions),
-            self::getSslCertificateOptions($soapClientOptions)
+            self::getSslCertificateOptions($soapClientOptions),
+            $soapClientOptions->getSslVersion()
         );
     }
 

src/BeSimple/SoapClient/SoapClient.php

@@ -61,7 +61,7 @@ class SoapClient extends \SoapClient
                 $this->curl,
                 $soapOptions->getWsdlFile(),
                 $soapOptions->getWsdlCacheType(),
-                false
+                $soapClientOptions->isResolveRemoteIncludes()
             );
         } catch (Exception $e) {
             throw new SoapFault(
@@ -95,7 +95,7 @@ class SoapClient extends \SoapClient
 
         } catch (SoapFault $soapFault) {
             if (SoapFaultSourceGetter::isNativeSoapFault($soapFault)) {
-                $soapFault = $this->decorateNativeSoapFault($soapFault);
+                $soapFault = $this->decorateNativeSoapFaultWithSoapResponseTracingData($soapFault);
             }
 
             throw $soapFault;
@@ -257,6 +257,23 @@ class SoapClient extends \SoapClient
         return $loadedWsdlFilePath;
     }
 
+    private function getHttpHeadersBySoapVersion(SoapRequest $soapRequest)
+    {
+        if ($soapRequest->getVersion() === SOAP_1_1) {
+
+            return [
+                'Content-Type: ' . $soapRequest->getContentType(),
+                'SOAPAction: "' . $soapRequest->getAction() . '"',
+                'Connection: ' . ($this->soapOptions->isConnectionKeepAlive() ? 'Keep-Alive' : 'close'),
+            ];
+        }
+
+        return [
+            'Content-Type: ' . $soapRequest->getContentType() . '; action="' . $soapRequest->getAction() . '"',
+            'Connection: ' . ($this->soapOptions->isConnectionKeepAlive() ? 'Keep-Alive' : 'close'),
+        ];
+    }
+
     private function getAttachmentFilters()
     {
         $filters = [];
@@ -277,7 +294,6 @@ class SoapClient extends \SoapClient
         array $soapAttachments = []
     ) {
         if ($this->soapClientOptions->getTrace() === true) {
-
             return SoapResponseFactory::createWithTracingData(
                 $soapRequest,
                 $curlResponse->getResponseBody(),
@@ -288,10 +304,8 @@ class SoapClient extends \SoapClient
         }
 
         return SoapResponseFactory::create(
+            $soapRequest,
             $curlResponse->getResponseBody(),
-            $soapRequest->getLocation(),
-            $soapRequest->getAction(),
-            $soapRequest->getVersion(),
             $curlResponse->getHttpResponseContentType(),
             $soapAttachments
         );
@@ -320,68 +334,43 @@ class SoapClient extends \SoapClient
         );
     }
 
-    private function decorateNativeSoapFault(SoapFault $nativePhpSoapFault)
+    private function decorateNativeSoapFaultWithSoapResponseTracingData(SoapFault $nativePhpSoapFault)
     {
-        $soapResponse = $this->getSoapResponseFromStorage();
-        if ($soapResponse instanceof SoapResponse) {
-            $soapFault = $this->throwSoapFaultByTracing(
-                SoapFaultPrefixEnum::PREFIX_PHP . '-' . $nativePhpSoapFault->getCode(),
-                $nativePhpSoapFault->getMessage(),
-                $this->getSoapResponseTracingDataFromNativeSoapFault(
-                    $nativePhpSoapFault,
-                    new SoapResponseTracingData(
-                        'Content-Type: '.$soapResponse->getRequest()->getContentType(),
-                        $soapResponse->getRequest()->getContent(),
-                        'Content-Type: '.$soapResponse->getContentType(),
-                        $soapResponse->getResponseContent()
-                    )
-                )
-            );
-        } else {
-            $soapFault = $this->throwSoapFaultByTracing(
-                $nativePhpSoapFault->faultcode,
-                $nativePhpSoapFault->getMessage(),
-                $this->getSoapResponseTracingDataFromNativeSoapFault(
-                    $nativePhpSoapFault,
-                    new SoapResponseTracingData(
-                        null,
-                        null,
-                        null,
-                        null
-                    )
-                )
-            );
-        }
-
-        return $soapFault;
+        return $this->throwSoapFaultByTracing(
+            $nativePhpSoapFault->faultcode,
+            $nativePhpSoapFault->getMessage(),
+            $this->getSoapResponseTracingDataFromNativeSoapFaultOrStorage($nativePhpSoapFault)
+        );
     }
 
-    private function getSoapResponseTracingDataFromNativeSoapFault(
-        SoapFault $nativePhpSoapFault,
-        SoapResponseTracingData $defaultSoapFaultTracingData
-    ) {
+    private function getSoapResponseTracingDataFromNativeSoapFaultOrStorage(SoapFault $nativePhpSoapFault)
+    {
         if ($nativePhpSoapFault instanceof SoapFaultWithTracingData) {
-
             return $nativePhpSoapFault->getSoapResponseTracingData();
         }
 
-        return $defaultSoapFaultTracingData;
+        return $this->getSoapResponseTracingDataFromRequestStorage();
     }
 
-    private function getHttpHeadersBySoapVersion(SoapRequest $soapRequest)
+    private function getSoapResponseTracingDataFromRequestStorage()
     {
-        if ($soapRequest->getVersion() === SOAP_1_1) {
+        $lastResponseHeaders = $lastResponse = $lastRequestHeaders = $lastRequest = null;
+        $soapResponse = $this->getSoapResponseFromStorage();
+        if ($soapResponse instanceof SoapResponse) {
+            $lastResponseHeaders = 'Content-Type: ' . $soapResponse->getContentType();
+            $lastResponse = $soapResponse->getResponseContent();
 
-            return [
-                'Content-Type: ' . $soapRequest->getContentType(),
-                'SOAPAction: "' . $soapRequest->getAction() . '"',
-                'Connection: ' . ($this->soapOptions->isConnectionKeepAlive() ? 'Keep-Alive' : 'close'),
-            ];
+            if ($soapResponse->hasRequest() === true) {
+                $lastRequestHeaders = 'Content-Type: ' . $soapResponse->getRequest()->getContentType();
+                $lastRequest = $soapResponse->getRequest()->getContent();
+            }
         }
 
-        return [
-            'Content-Type: ' . $soapRequest->getContentType() . '; action="' . $soapRequest->getAction() . '"',
-            'Connection: ' . ($this->soapOptions->isConnectionKeepAlive() ? 'Keep-Alive' : 'close'),
-        ];
+        return new SoapResponseTracingData(
+            $lastRequestHeaders,
+            $lastRequest,
+            $lastResponseHeaders,
+            $lastResponse
+        );
     }
 }

src/BeSimple/SoapClient/SoapClientOptionsBuilder.php

@@ -28,7 +28,7 @@ class SoapClientOptionsBuilder
     public static function createWithDefaults()
     {
         return new SoapClientOptions(
-            SoapClientOptions::SOAP_CLIENT_TRACE_OFF,
+            SoapClientOptions::SOAP_CLIENT_TRACE_ON,
             SoapClientOptions::SOAP_CLIENT_EXCEPTIONS_ON,
             CurlOptions::DEFAULT_USER_AGENT,
             SoapClientOptions::SOAP_CLIENT_COMPRESSION_NONE
@@ -45,6 +45,18 @@ class SoapClientOptionsBuilder
         );
     }
 
+    public static function createWithProxy($proxy)
+    {
+        return new SoapClientOptions(
+            SoapClientOptions::SOAP_CLIENT_TRACE_ON,
+            SoapClientOptions::SOAP_CLIENT_EXCEPTIONS_ON,
+            CurlOptions::DEFAULT_USER_AGENT,
+            SoapClientOptions::SOAP_CLIENT_COMPRESSION_NONE,
+            SoapClientOptions::SOAP_CLIENT_AUTHENTICATION_NONE,
+            $proxy
+        );
+    }
+
     public static function createWithEndpointLocation($endpointLocation)
     {
         return new SoapClientOptions(
@@ -81,4 +93,47 @@ class SoapClientOptionsBuilder
             $endpointLocation
         );
     }
+
+    /**
+     * @param $endpointLocation
+     * @param SoapServerAuthenticationInterface $authentication
+     * @return SoapClientOptions
+     */
+    public static function createWithAuthenticationAndEndpointLocationAndSslVersionV3(
+        $endpointLocation,
+        SoapServerAuthenticationInterface $authentication
+    ) {
+        return new SoapClientOptions(
+            SoapClientOptions::SOAP_CLIENT_TRACE_ON,
+            SoapClientOptions::SOAP_CLIENT_EXCEPTIONS_ON,
+            CurlOptions::DEFAULT_USER_AGENT,
+            SoapClientOptions::SOAP_CLIENT_COMPRESSION_NONE,
+            $authentication,
+            SoapClientOptions::SOAP_CLIENT_PROXY_NONE,
+            $endpointLocation,
+            false,
+            CURL_SSLVERSION_SSLv3
+        );
+    }
+
+    /**
+     * @param SoapServerAuthenticationInterface $authentication
+     * @param bool $resolveRemoteIncludes
+     * @return SoapClientOptions
+     */
+    public static function createWithAuthenticationAndResolveRemoteIncludes(
+        SoapServerAuthenticationInterface $authentication,
+        $resolveRemoteIncludes
+    ) {
+        return new SoapClientOptions(
+            SoapClientOptions::SOAP_CLIENT_TRACE_ON,
+            SoapClientOptions::SOAP_CLIENT_EXCEPTIONS_ON,
+            CurlOptions::DEFAULT_USER_AGENT,
+            SoapClientOptions::SOAP_CLIENT_COMPRESSION_NONE,
+            $authentication,
+            SoapClientOptions::SOAP_CLIENT_PROXY_NONE,
+            SoapClientOptions::SOAP_CLIENT_ENDPOINT_LOCATION_NONE,
+            $resolveRemoteIncludes
+        );
+    }
 }

src/BeSimple/SoapClient/SoapOptions/SoapClientOptions.php

@@ -19,6 +19,9 @@ class SoapClientOptions
     const SOAP_CLIENT_COMPRESSION_DEFLATE = CurlOptions::SOAP_COMPRESSION_DEFLATE;
     const SOAP_CLIENT_AUTHENTICATION_NONE = null;
     const SOAP_CLIENT_PROXY_NONE = null;
+    const SOAP_CLIENT_ENDPOINT_LOCATION_NONE = null;
+    const SOAP_CLIENT_RESOLVE_REMOTE_INCLUDES_ON = true;
+    const SOAP_CLIENT_RESOLVE_REMOTE_INCLUDES_OFF = false;
 
     private $trace;
     private $exceptions;
@@ -27,15 +30,19 @@ class SoapClientOptions
     private $authentication;
     private $proxy;
     private $location;
+    private $resolveRemoteIncludes;
+    private $sslVersion;
 
     /**
-     * @param bool $trace = SoapClientOptions::SOAP_CLIENT_TRACE_ON|SoapClientOptions::SOAP_CLIENT_TRACE_OFF
-     * @param bool $exceptions = SoapClientOptions::SOAP_CLIENT_EXCEPTIONS_ON|SoapClientOptions::SOAP_CLIENT_EXCEPTIONS_OFF
+     * @param bool $trace = self::SOAP_CLIENT_TRACE_ON|self::SOAP_CLIENT_TRACE_OFF
+     * @param bool $exceptions = self::SOAP_CLIENT_EXCEPTIONS_ON|self::SOAP_CLIENT_EXCEPTIONS_OFF
      * @param string $userAgent
-     * @param int|null $compression = SoapClientOptions::SOAP_CLIENT_COMPRESSION_NONE|SoapClientOptions::SOAP_CLIENT_COMPRESSION_GZIP|SoapClientOptions::SOAP_CLIENT_COMPRESSION_DEFLATE
+     * @param int|null $compression = self::SOAP_CLIENT_COMPRESSION_NONE|self::SOAP_CLIENT_COMPRESSION_GZIP|self::SOAP_CLIENT_COMPRESSION_DEFLATE
      * @param SoapServerAuthenticationInterface|null $authentication
      * @param SoapServerProxy|null $proxy
      * @param string|null $location
+     * @param bool $resolveRemoteIncludes = self::SOAP_CLIENT_RESOLVE_REMOTE_INCLUDES_ON|self::SOAP_CLIENT_RESOLVE_REMOTE_INCLUDES_OFF
+     * @param int $sslVersion
      */
     public function __construct(
         $trace,
@@ -44,7 +51,9 @@ class SoapClientOptions
         $compression = null,
         SoapServerAuthenticationInterface $authentication = null,
         SoapServerProxy $proxy = null,
-        $location = null
+        $location = null,
+        $resolveRemoteIncludes = false,
+        $sslVersion = null
     ) {
         $this->trace = $trace;
         $this->exceptions = $exceptions;
@@ -53,6 +62,8 @@ class SoapClientOptions
         $this->authentication = $authentication;
         $this->proxy = $proxy;
         $this->location = $location;
+        $this->resolveRemoteIncludes = $resolveRemoteIncludes;
+        $this->sslVersion = $sslVersion;
     }
 
     public function getTrace()
@@ -120,6 +131,11 @@ class SoapClientOptions
         return $this->location;
     }
 
+    public function isResolveRemoteIncludes()
+    {
+        return $this->resolveRemoteIncludes;
+    }
+
     public function toArray()
     {
         $optionsAsArray = [
@@ -142,4 +158,9 @@ class SoapClientOptions
 
         return $optionsAsArray;
     }
+
+    public function getSslVersion()
+    {
+        return $this->sslVersion;
+    }
 }

src/BeSimple/SoapClient/SoapResponse.php

@@ -44,6 +44,11 @@ class SoapResponse extends CommonSoapResponse
         $this->tracingData = $tracingData;
     }
 
+    public function hasRequest()
+    {
+        return $this->request !== null;
+    }
+
     public function setRequest(SoapRequest $request)
     {
         $this->request = $request;

src/BeSimple/SoapClient/SoapResponseFactory.php

@@ -27,27 +27,24 @@ class SoapResponseFactory
     /**
      * Factory method for SoapClient\SoapResponse.
      *
+     * @param SoapRequest               $soapRequest    related request object
      * @param string                    $content        Content
-     * @param string                    $location       Location
-     * @param string                    $action         SOAP action
-     * @param string                    $version        SOAP version
      * @param string                    $contentType    Content type header
      * @param SoapAttachment[]          $attachments    SOAP attachments
      * @return SoapResponse
      */
     public static function create(
+        SoapRequest $soapRequest,
         $content,
-        $location,
-        $action,
-        $version,
         $contentType,
         array $attachments = []
     ) {
         $response = new SoapResponse();
+        $response->setRequest($soapRequest);
         $response->setContent($content);
-        $response->setLocation($location);
-        $response->setAction($action);
-        $response->setVersion($version);
+        $response->setLocation($soapRequest->getLocation());
+        $response->setAction($soapRequest->getAction());
+        $response->setVersion($soapRequest->getVersion());
         $response->setContentType($contentType);
         if (count($attachments) > 0) {
             $response->setAttachments(
@@ -82,9 +79,7 @@ class SoapResponseFactory
         $response->setAction($soapRequest->getAction());
         $response->setVersion($soapRequest->getVersion());
         $response->setContentType($contentType);
-        if ($tracingData !== null) {
-            $response->setTracingData($tracingData);
-        }
+        $response->setTracingData($tracingData);
         if (count($attachments) > 0) {
             $response->setAttachments(
                 PartFactory::createAttachmentParts($attachments)

src/BeSimple/SoapClient/WsdlDownloader.php

@@ -13,6 +13,8 @@
 namespace BeSimple\SoapClient;
 
 use BeSimple\SoapClient\Curl\Curl;
+use BeSimple\SoapClient\Xml\RemoteFileResolver;
+use BeSimple\SoapClient\Xml\XmlFileDomDocumentProcessor;
 use BeSimple\SoapCommon\Cache;
 use BeSimple\SoapCommon\Helper;
 use DOMDocument;
@@ -30,6 +32,11 @@ use Exception;
  */
 class WsdlDownloader
 {
+    public static function instantiateDownloader()
+    {
+        return new self();
+    }
+
     /**
      * @param Curl $curl
      * @param string $wsdlPath WSDL file URL/path
@@ -39,10 +46,10 @@ class WsdlDownloader
      */
     public function getWsdlPath(Curl $curl, $wsdlPath, $wsdCacheType, $resolveRemoteIncludes = true)
     {
-        $isRemoteFile = $this->isRemoteFile($wsdlPath);
+        $isRemoteFile = RemoteFileResolver::instantiateResolver()->isRemoteFile($wsdlPath);
         $isCacheEnabled = $wsdCacheType === Cache::TYPE_NONE ? false : Cache::isEnabled();
         if ($isCacheEnabled === true) {
-            $cacheFilePath = Cache::getDirectory().DIRECTORY_SEPARATOR.'wsdl_'.md5($wsdlPath).'.cache';
+            $cacheFilePath = Cache::getDirectory() . DIRECTORY_SEPARATOR . 'wsdl_' . md5($wsdlPath) . '.cache';
             $isCacheExisting = file_exists($cacheFilePath);
             if ($isCacheExisting) {
                 $fileModificationTime = filemtime($cacheFilePath);
@@ -54,46 +61,17 @@ class WsdlDownloader
                 $isCacheExisting = $isCacheValid = false;
             }
             if ($isCacheExisting === false || $isCacheValid === false) {
-                $this->writeCacheFile($curl, $wsdCacheType, $wsdlPath, $cacheFilePath, $resolveRemoteIncludes, $isRemoteFile);
+                XmlFileDomDocumentProcessor::writeCacheFile($curl, $wsdCacheType, $wsdlPath, $cacheFilePath, $resolveRemoteIncludes, $isRemoteFile);
             }
 
             return $this->getLocalWsdlPath($cacheFilePath);
 
-        } else {
-
-            if ($isRemoteFile === true) {
-                return $wsdlPath;
-            }
-
-            return $this->getLocalWsdlPath($wsdlPath);
         }
-    }
-
-    private function writeCacheFile(Curl $curl, $cacheType, $wsdlPath, $cacheFilePath, $resolveRemoteIncludes, $isRemoteFile)
-    {
         if ($isRemoteFile === true) {
-            $curlResponse = $curl->executeCurlWithCachedSession($wsdlPath);
-            if ($curlResponse->curlStatusSuccess()) {
-                if (mb_strlen($curlResponse->getResponseBody()) === 0) {
-                    throw new Exception('Could not write WSDL cache file: empty curl response from: '.$wsdlPath);
-                }
-                if ($resolveRemoteIncludes === true) {
-                    $document = $this->getXmlFileDomDocument($curl, $cacheType, $curlResponse->getResponseBody(), $wsdlPath);
-                    $this->saveXmlDomDocument($document, $cacheFilePath);
-                } else {
-                    file_put_contents($cacheFilePath, $curlResponse->getResponseBody());
-                }
-            } else {
-                throw new Exception('Could not write WSDL cache file: Download failed with message: '.$curlResponse->getCurlErrorMessage());
-            }
-        } else {
-            if (file_exists($wsdlPath)) {
-                $document = $this->getXmlFileDomDocument($curl, $cacheType, file_get_contents($wsdlPath));
-                $this->saveXmlDomDocument($document, $cacheFilePath);
-            } else {
-                throw new Exception('Could write WSDL cache file: local file does not exist: '.$wsdlPath);
-            }
+            return $wsdlPath;
         }
+
+        return $this->getLocalWsdlPath($wsdlPath);
     }
 
     private function getLocalWsdlPath($wsdlPath)
@@ -104,164 +82,6 @@ class WsdlDownloader
 
         }
 
-        throw new Exception('Could not download WSDL: local file does not exist: '.$wsdlPath);
-    }
-
-    /**
-     * @param string $wsdlPath File URL/path
-     * @return boolean
-     */
-    private function isRemoteFile($wsdlPath)
-    {
-        $parsedUrlOrFalse = @parse_url($wsdlPath);
-        if ($parsedUrlOrFalse !== false) {
-            if (isset($parsedUrlOrFalse['scheme']) && substr($parsedUrlOrFalse['scheme'], 0, 4) === 'http') {
-
-                return true;
-            }
-
-            return false;
-        }
-
-        throw new Exception('Could not determine wsdlPath is remote: '.$wsdlPath);
-    }
-
-    /**
-     * Resolves remote WSDL/XSD includes within the WSDL files.
-     *
-     * @param Curl $curl
-     * @param int $cacheType
-     * @param string  $xmlFileSource  XML file contents
-     * @param boolean $parentFilePath Parent file name
-     * @return DOMDocument
-     */
-    private function getXmlFileDomDocument(Curl $curl, $cacheType, $xmlFileSource, $parentFilePath = null)
-    {
-        $document = new DOMDocument('1.0', 'utf-8');
-        if ($document->loadXML($xmlFileSource) === false) {
-            throw new Exception('Could not save downloaded WSDL cache: '.$xmlFileSource);
-        }
-
-        $xpath = new DOMXPath($document);
-        $this->updateXmlDocument($curl, $cacheType, $xpath, Helper::PFX_WSDL, Helper::NS_WSDL, 'location', $parentFilePath);
-        $this->updateXmlDocument($curl, $cacheType, $xpath, Helper::PFX_XML_SCHEMA, Helper::NS_XML_SCHEMA, 'schemaLocation', $parentFilePath);
-
-        return $document;
-    }
-
-    private function saveXmlDomDocument(DOMDocument $document, $cacheFilePath)
-    {
-        try {
-            $xmlContents = $document->saveXML();
-            if ($xmlContents === '') {
-                throw new Exception('Could not write WSDL cache file: DOMDocument returned empty XML file');
-            }
-            file_put_contents($cacheFilePath, $xmlContents);
-        } catch (Exception $e) {
-            unlink($cacheFilePath);
-            throw new Exception('Could not write WSDL cache file: save method returned error: ' . $e->getMessage());
-        }
-    }
-
-    private function updateXmlDocument(
-        Curl $curl,
-        $cacheType,
-        DOMXPath $xpath,
-        $schemaPrefix,
-        $schemaUrl,
-        $locationAttributeName,
-        $parentFilePath = null
-    ) {
-        $xpath->registerNamespace($schemaPrefix, $schemaUrl);
-        $nodes = $xpath->query('.//'.$schemaPrefix.':include | .//'.$schemaPrefix.':import');
-        if ($nodes->length > 0) {
-            foreach ($nodes as $node) {
-                /** @var DOMElement $node */
-                $locationPath = $node->getAttribute($locationAttributeName);
-                if ($locationPath !== '') {
-                    if ($this->isRemoteFile($locationPath)) {
-                        $node->setAttribute(
-                            $locationAttributeName,
-                            $this->getWsdlPath(
-                                $curl,
-                                $locationPath,
-                                $cacheType,
-                                true
-                            )
-                        );
-                    } elseif ($parentFilePath !== null) {
-                        $node->setAttribute(
-                            $locationAttributeName,
-                            $this->getWsdlPath(
-                                $curl,
-                                $this->resolveRelativePathInUrl($parentFilePath, $locationPath),
-                                $cacheType,
-                                true
-                            )
-                        );
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Resolves the relative path to base into an absolute.
-     *
-     * @param string $base     Base path
-     * @param string $relative Relative path
-     *
-     * @return string
-     */
-    private function resolveRelativePathInUrl($base, $relative)
-    {
-        $urlParts = parse_url($base);
-
-        // combine base path with relative path
-        if (isset($urlParts['path']) && mb_strlen($relative) > 0 && '/' === $relative{0}) {
-            // $relative is absolute path from domain (starts with /)
-            $path = $relative;
-        } elseif (isset($urlParts['path']) && strrpos($urlParts['path'], '/') === (strlen($urlParts['path']) )) {
-            // base path is directory
-            $path = $urlParts['path'].$relative;
-        } elseif (isset($urlParts['path'])) {
-            // strip filename from base path
-            $path = substr($urlParts['path'], 0, strrpos($urlParts['path'], '/')).'/'.$relative;
-        } else {
-            // no base path
-            $path = '/'.$relative;
-        }
-
-        // foo/./bar ==> foo/bar
-        // remove double slashes
-        $path = preg_replace(array('#/\./#', '#/+#'), '/', $path);
-
-        // split path by '/'
-        $parts = explode('/', $path);
-
-        // resolve /../
-        foreach ($parts as $key => $part) {
-            if ($part === '..') {
-                $keyToDelete = $key - 1;
-                while ($keyToDelete > 0) {
-                    if (isset($parts[$keyToDelete])) {
-                        unset($parts[$keyToDelete]);
-
-                        break;
-                    }
-
-                    $keyToDelete--;
-                }
-
-                unset($parts[$key]);
-            }
-        }
-
-        $hostname = $urlParts['scheme'].'://'.$urlParts['host'];
-        if (isset($urlParts['port'])) {
-            $hostname .= ':'.$urlParts['port'];
-        }
-
-        return $hostname.implode('/', $parts);
+        throw new Exception('Could not download WSDL: local file does not exist: ' . $wsdlPath);
     }
 }

src/BeSimple/SoapClient/Xml/Path/RelativePathResolver.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace BeSimple\SoapClient\Xml\Path;
+
+class RelativePathResolver
+{
+    public static function instantiateResolver()
+    {
+        return new self();
+    }
+
+    /**
+     * Resolves the relative path to base into an absolute.
+     *
+     * @param string $base     Base path
+     * @param string $relative Relative path
+     * @return string
+     */
+    public function resolveRelativePathInUrl($base, $relative)
+    {
+        $urlParts = parse_url($base);
+        $pathIsSet = true === isset($urlParts['path']);
+
+        // combine base path with relative path
+        if (true === $pathIsSet && 0 < mb_strlen($relative) && 0 === strpos($relative, '/')) {
+            // $relative is absolute path from domain (starts with /)
+            $path = $relative;
+        } elseif (true === $pathIsSet && strrpos($urlParts['path'], '/') === strlen($urlParts['path'])) {
+            // base path is directory
+            $path = $urlParts['path'].$relative;
+        } elseif (true === $pathIsSet) {
+            // strip filename from base path
+            $path = substr($urlParts['path'], 0, strrpos($urlParts['path'], '/')).'/'.$relative;
+        } else {
+            // no base path
+            $path = '/'.$relative;
+        }
+
+        // foo/./bar ==> foo/bar
+        // remove double slashes
+        $path = preg_replace(array('#/\./#', '#/+#'), '/', $path);
+
+        // split path by '/'
+        $parts = explode('/', $path);
+
+        // resolve /../
+        foreach ($parts as $key => $part) {
+            if ($part === '..') {
+                $keyToDelete = $key - 1;
+                while ($keyToDelete > 0) {
+                    if (isset($parts[$keyToDelete])) {
+                        unset($parts[$keyToDelete]);
+
+                        break;
+                    }
+
+                    $keyToDelete--;
+                }
+
+                unset($parts[$key]);
+            }
+        }
+
+        $hostname = $urlParts['scheme'].'://'.$urlParts['host'];
+        if (isset($urlParts['port'])) {
+            $hostname .= ':'.$urlParts['port'];
+        }
+        $implodedParts = implode('/', $parts);
+        if (substr($implodedParts, 0, 1) !== '/') {
+            $implodedParts = '/'.$implodedParts;
+        }
+
+        return $hostname.$implodedParts;
+    }
+}

src/BeSimple/SoapClient/Xml/RemoteFileResolver.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace BeSimple\SoapClient\Xml;
+
+use Exception;
+
+class RemoteFileResolver
+{
+    public static function instantiateResolver()
+    {
+        return new self();
+    }
+
+    /**
+     * @param string $wsdlPath File URL/path
+     * @return boolean
+     */
+    public function isRemoteFile($wsdlPath)
+    {
+        $parsedUrlOrFalse = @parse_url($wsdlPath);
+        if ($parsedUrlOrFalse !== false) {
+            if (isset($parsedUrlOrFalse['scheme']) && strpos($parsedUrlOrFalse['scheme'], 'http') === 0) {
+
+                return true;
+            }
+
+            return false;
+        }
+
+        throw new Exception('Could not determine wsdlPath is remote: '.$wsdlPath);
+    }
+}

src/BeSimple/SoapClient/Xml/XmlDomDocumentImportReplacer.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace BeSimple\SoapClient\Xml;
+
+use BeSimple\SoapClient\Curl\Curl;
+use BeSimple\SoapClient\WsdlDownloader;
+use BeSimple\SoapClient\Xml\Path\RelativePathResolver;
+use DOMElement;
+use DOMXPath;
+
+class XmlDomDocumentImportReplacer
+{
+    public static function instantiateReplacer()
+    {
+        return new self();
+    }
+
+    public function updateXmlDocument(
+        Curl $curl,
+        $cacheType,
+        DOMXPath $xpath,
+        $schemaPrefix,
+        $schemaUrl,
+        $locationAttributeName,
+        $parentFilePath = null
+    ) {
+        $xpath->registerNamespace($schemaPrefix, $schemaUrl);
+        $nodes = $xpath->query('.//'.$schemaPrefix.':include | .//'.$schemaPrefix.':import');
+        if ($nodes->length > 0) {
+            foreach ($nodes as $node) {
+                /** @var DOMElement $node */
+                $locationPath = $node->getAttribute($locationAttributeName);
+                if ($locationPath !== '') {
+                    if (RemoteFileResolver::instantiateResolver()->isRemoteFile($locationPath)) {
+                        $node->setAttribute(
+                            $locationAttributeName,
+                            WsdlDownloader::instantiateDownloader()->getWsdlPath(
+                                $curl,
+                                $locationPath,
+                                $cacheType,
+                                true
+                            )
+                        );
+                    } elseif ($parentFilePath !== null) {
+                        $node->setAttribute(
+                            $locationAttributeName,
+                            WsdlDownloader::instantiateDownloader()->getWsdlPath(
+                                $curl,
+                                RelativePathResolver::instantiateResolver()
+                                    ->resolveRelativePathInUrl($parentFilePath, $locationPath),
+                                $cacheType,
+                                true
+                            )
+                        );
+                    }
+                }
+            }
+        }
+    }
+}

src/BeSimple/SoapClient/Xml/XmlFileDomDocumentProcessor.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace BeSimple\SoapClient\Xml;
+
+use BeSimple\SoapClient\Curl\Curl;
+use BeSimple\SoapCommon\Helper;
+use DOMDocument;
+use DOMXPath;
+use Exception;
+
+class XmlFileDomDocumentProcessor
+{
+    public static function writeCacheFile(Curl $curl, $cacheType, $wsdlPath, $cacheFilePath, $resolveRemoteIncludes, $isRemoteFile)
+    {
+        if ($isRemoteFile === true) {
+            $curlResponse = $curl->executeCurlWithCachedSession($wsdlPath);
+            if ($curlResponse->curlStatusSuccess()) {
+                if (mb_strlen($curlResponse->getResponseBody()) === 0) {
+                    throw new Exception('Could not write WSDL cache file: empty curl response from: '.$wsdlPath);
+                }
+                if ($resolveRemoteIncludes === true) {
+                    $document = self::getXmlFileDomDocument($curl, $cacheType, $curlResponse->getResponseBody(), $wsdlPath);
+                    self::saveXmlDomDocument($document, $cacheFilePath);
+                } else {
+                    file_put_contents($cacheFilePath, $curlResponse->getResponseBody());
+                }
+            } else {
+                throw new Exception('Could not write WSDL cache file: Download failed with message: '.$curlResponse->getCurlErrorMessage());
+            }
+        } else {
+            if (file_exists($wsdlPath)) {
+                $document = self::getXmlFileDomDocument($curl, $cacheType, file_get_contents($wsdlPath));
+                self::saveXmlDomDocument($document, $cacheFilePath);
+            } else {
+                throw new Exception('Could write WSDL cache file: local file does not exist: '.$wsdlPath);
+            }
+        }
+    }
+
+    /**
+     * Resolves remote WSDL/XSD includes within the WSDL files.
+     *
+     * @param Curl $curl
+     * @param int $cacheType
+     * @param string  $xmlFileSource  XML file contents
+     * @param boolean $parentFilePath Parent file name
+     * @return DOMDocument
+     */
+    private static function getXmlFileDomDocument(Curl $curl, $cacheType, $xmlFileSource, $parentFilePath = null)
+    {
+        $document = new DOMDocument('1.0', 'utf-8');
+        if ($document->loadXML($xmlFileSource) === false) {
+            throw new Exception('Could not save downloaded WSDL cache: '.$xmlFileSource);
+        }
+
+        $xpath = new DOMXPath($document);
+        $xmlDomDocumentImportReplacer = XmlDomDocumentImportReplacer::instantiateReplacer();
+        $xmlDomDocumentImportReplacer->updateXmlDocument($curl, $cacheType, $xpath, Helper::PFX_WSDL, Helper::NS_WSDL, 'location', $parentFilePath);
+        $xmlDomDocumentImportReplacer->updateXmlDocument($curl, $cacheType, $xpath, Helper::PFX_XML_SCHEMA, Helper::NS_XML_SCHEMA, 'schemaLocation', $parentFilePath);
+
+        return $document;
+    }
+
+    private static function saveXmlDomDocument(DOMDocument $document, $cacheFilePath)
+    {
+        try {
+            $xmlContents = $document->saveXML();
+            if ($xmlContents === '') {
+                throw new Exception('Could not write WSDL cache file: DOMDocument returned empty XML file');
+            }
+            file_put_contents($cacheFilePath, $xmlContents);
+        } catch (Exception $e) {
+            unlink($cacheFilePath);
+            throw new Exception('Could not write WSDL cache file: save method returned error: ' . $e->getMessage());
+        }
+    }
+}

src/BeSimple/SoapCommon/Definition/Type/TypeRepository.php

@@ -12,7 +12,7 @@
 
 namespace BeSimple\SoapCommon\Definition\Type;
 
-use BeSimple\SoapCommon\Classmap;
+use BeSimple\SoapCommon\ClassMap;
 
 /**
  * @author Christian Kerl <christian-kerl@web.de>
@@ -27,7 +27,7 @@ class TypeRepository
 
     protected $classmap;
 
-    public function __construct(Classmap $classmap = null)
+    public function __construct(ClassMap $classmap = null)
     {
         $this->classmap = $classmap;
     }
@@ -77,7 +77,7 @@ class TypeRepository
         $phpType = $type->getPhpType();
 
         $this->types[$phpType] = $type;
-        $this->addClassmap($type->getXmlType(), $phpType);
+        $this->addClassMap($type->getXmlType(), $phpType);
     }
 
     public function hasType($type)
@@ -119,12 +119,12 @@ class TypeRepository
         return $match[1];
     }
 
-    public function getClassmap()
+    public function getClassMap()
     {
         return $this->classmap;
     }
 
-    protected function addClassmap($xmlType, $phpType)
+    protected function addClassMap($xmlType, $phpType)
     {
         if (!$this->classmap) {
             return;

src/BeSimple/SoapCommon/Mime/Boundary/MimeBoundaryAnalyser.php

@@ -27,7 +27,7 @@ class MimeBoundaryAnalyser
      */
     public static function isMessageLineBoundary($mimeMessageLine)
     {
-        return strlen($mimeMessageLine) > 0 && $mimeMessageLine[0] === "-";
+        return preg_match('/^--[0-9A-Za-z\s\'\/\+\_\,\-\.\:\=\?]+/', $mimeMessageLine) === 1;
     }
 
     /**

src/BeSimple/SoapCommon/Mime/CouldNotParseMimeMessageException.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace BeSimple\SoapCommon\Mime;
+
+use Exception;
+
+class CouldNotParseMimeMessageException extends Exception
+{
+    private $mimePartMessage;
+    private $headers;
+
+    public function __construct($message, $mimePartMessage, array $headers)
+    {
+        $this->mimePartMessage = $mimePartMessage;
+        $this->headers = $headers;
+        parent::__construct($message);
+    }
+
+    public function getMimePartMessage()
+    {
+        return $this->mimePartMessage;
+    }
+
+    public function hasHeaders()
+    {
+        return count($this->headers) > 0;
+    }
+
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+}

src/BeSimple/SoapCommon/Mime/MultiPart.php

@@ -31,21 +31,17 @@ class MultiPart extends PartHeader
 {
     /**
      * Content-ID of main part.
-     *
      * @var string
      */
     protected $mainPartContentId;
 
     /**
      * Mime parts.
-     *
      * @var \BeSimple\SoapCommon\Mime\Part[]
      */
-    protected $parts = [];
+    protected $parts;
 
     /**
-     * Construct new mime object.
-     *
      * @param string $boundary
      */
     public function __construct($boundary = null)
@@ -63,7 +59,6 @@ class MultiPart extends PartHeader
      * Get mime message of this object (without headers).
      *
      * @param boolean $withHeaders Returned mime message contains headers
-     *
      * @return string
      */
     public function getMimeMessage($withHeaders = false)
@@ -79,30 +74,6 @@ class MultiPart extends PartHeader
         return $message;
     }
 
-    /**
-     * Get string array with MIME headers for usage in HTTP header (with CURL).
-     * Only 'Content-Type' and 'Content-Description' headers are returned.
-     *
-     * @return string[]
-     */
-    public function getHeadersForHttp()
-    {
-        $allowedHeaders = [
-            'Content-Type',
-            'Content-Description',
-        ];
-        $headers = [];
-        foreach ($this->headers as $fieldName => $value) {
-            if (in_array($fieldName, $allowedHeaders)) {
-                $fieldValue = $this->generateHeaderFieldValue($value);
-                // for http only ISO-8859-1
-                $headers[] = $fieldName . ': '. iconv('utf-8', 'ISO-8859-1//TRANSLIT', $fieldValue);
-            }
-        }
-
-        return $headers;
-    }
-
     /**
      * Add new part to MIME message.
      *

src/BeSimple/SoapCommon/Mime/Parser.php

@@ -16,7 +16,6 @@ use BeSimple\SoapCommon\Mime\Boundary\MimeBoundaryAnalyser;
 use BeSimple\SoapCommon\Mime\Parser\ContentTypeParser;
 use BeSimple\SoapCommon\Mime\Parser\ParsedPartList;
 use BeSimple\SoapCommon\Mime\Parser\ParsedPartsGetter;
-use Exception;
 
 /**
  * Simple Multipart-Mime parser.
@@ -48,12 +47,14 @@ class Parser
         }
         if (MimeBoundaryAnalyser::hasMessageBoundary($mimeMessageLines) === true) {
             if ($mimeMessageLineCount <= 1) {
-                throw new Exception(
+                throw new CouldNotParseMimeMessageException(
                     sprintf(
                         'Cannot parse MultiPart message of %d characters: got unexpectable low number of lines: %s',
                         mb_strlen($mimeMessage),
                         (string)$mimeMessageLineCount
-                    )
+                    ),
+                    $mimeMessage,
+                    $headers
                 );
             }
             $parsedPartList = ParsedPartsGetter::getPartsFromMimeMessageLines(
@@ -62,18 +63,22 @@ class Parser
                 $hasHttpRequestHeaders
             );
             if ($parsedPartList->hasParts() === false) {
-                throw new Exception(
-                    'Could not parse MimeMessage: no Parts for MultiPart given'
+                throw new CouldNotParseMimeMessageException(
+                    'Could not parse MimeMessage: no Parts for MultiPart given',
+                    $mimeMessage,
+                    $headers
                 );
             }
             if ($parsedPartList->hasExactlyOneMainPart() === false) {
-                throw new Exception(
+                throw new CouldNotParseMimeMessageException(
                     sprintf(
                         'Could not parse MimeMessage %s HTTP headers: unexpected count of main ParsedParts: %s (total: %d)',
                         $hasHttpRequestHeaders ? 'with' : 'w/o',
                         implode(', ', $parsedPartList->getPartContentIds()),
                         $parsedPartList->getMainPartCount()
-                    )
+                    ),
+                    $mimeMessage,
+                    $headers
                 );
             }
             self::appendPartsToMultiPart(

src/BeSimple/SoapCommon/Mime/Part.php

@@ -68,9 +68,7 @@ class Part extends PartHeader
     }
 
     /**
-     * __toString.
-     *
-     * @return mixed
+     * @return string
      */
     public function __toString()
     {
@@ -98,11 +96,7 @@ class Part extends PartHeader
     }
 
     /**
-     * Set mime content.
-     *
-     * @param mixed $content Content to set
-     *
-     * @return void
+     * @param string $content
      */
     public function setContent($content)
     {
@@ -111,7 +105,6 @@ class Part extends PartHeader
 
     /**
      * Get complete mime message of this object.
-     *
      * @return string
      */
     public function getMessagePart()
@@ -121,7 +114,6 @@ class Part extends PartHeader
 
     /**
      * Generate body.
-     *
      * @return string
      */
     protected function generateBody()

src/BeSimple/SoapCommon/Mime/PartHeader.php

@@ -19,7 +19,10 @@ namespace BeSimple\SoapCommon\Mime;
  */
 abstract class PartHeader
 {
-    protected $headers = [];
+    /** @var string[] array of headers with lower-cased keys */
+    private $headers;
+    /** @var string[] array of lower-cased keys and their original variants */
+    private $headersOriginalKeys;
 
     /**
      * Add a new header to the mime part.
@@ -32,19 +35,21 @@ abstract class PartHeader
      */
     public function setHeader($name, $value, $subValue = null)
     {
-        if (isset($this->headers[$name]) && !is_null($subValue)) {
-            if (!is_array($this->headers[$name])) {
-                $this->headers[$name] = [
-                    '@'    => $this->headers[$name],
+        $lowerCaseName = mb_strtolower($name);
+        $this->headersOriginalKeys[$lowerCaseName] = $name;
+        if (isset($this->headers[$lowerCaseName]) && !is_null($subValue)) {
+            if (!is_array($this->headers[$lowerCaseName])) {
+                $this->headers[$lowerCaseName] = [
+                    '@'    => $this->headers[$lowerCaseName],
                     $value => $subValue,
                 ];
             } else {
-                $this->headers[$name][$value] = $subValue;
+                $this->headers[$lowerCaseName][$value] = $subValue;
             }
-        } elseif (isset($this->headers[$name]) && is_array($this->headers[$name]) && isset($this->headers[$name]['@'])) {
-            $this->headers[$name]['@'] = $value;
+        } elseif (isset($this->headers[$lowerCaseName]) && is_array($this->headers[$lowerCaseName]) && isset($this->headers[$lowerCaseName]['@'])) {
+            $this->headers[$lowerCaseName]['@'] = $value;
         } else {
-            $this->headers[$name] = $value;
+            $this->headers[$lowerCaseName] = $value;
         }
     }
 
@@ -58,17 +63,18 @@ abstract class PartHeader
      */
     public function getHeader($name, $subValue = null)
     {
-        if (isset($this->headers[$name])) {
+        $lowerCaseName = mb_strtolower($name);
+        if (isset($this->headers[$lowerCaseName])) {
             if (!is_null($subValue)) {
-                if (is_array($this->headers[$name]) && isset($this->headers[$name][$subValue])) {
-                    return $this->headers[$name][$subValue];
+                if (is_array($this->headers[$lowerCaseName]) && isset($this->headers[$lowerCaseName][$subValue])) {
+                    return $this->headers[$lowerCaseName][$subValue];
                 } else {
                     return null;
                 }
-            } elseif (is_array($this->headers[$name]) && isset($this->headers[$name]['@'])) {
-                return $this->headers[$name]['@'];
+            } elseif (is_array($this->headers[$lowerCaseName]) && isset($this->headers[$lowerCaseName]['@'])) {
+                return $this->headers[$lowerCaseName]['@'];
             } else {
-                return $this->headers[$name];
+                return $this->headers[$lowerCaseName];
             }
         }
 
@@ -80,6 +86,30 @@ abstract class PartHeader
         return $this->headers;
     }
 
+    /**
+     * Get string array with MIME headers for usage in HTTP header (with CURL).
+     * Only 'Content-Type' and 'Content-Description' headers are returned.
+     *
+     * @return string[]
+     */
+    public function getHeadersForHttp()
+    {
+        $allowedHeadersLowerCase = [
+            'content-type',
+            'content-description',
+        ];
+        $headers = [];
+        foreach ($this->headers as $fieldName => $value) {
+            if (in_array($fieldName, $allowedHeadersLowerCase)) {
+                $fieldValue = $this->generateHeaderFieldValue($value);
+                // for http only ISO-8859-1
+                $headers[] = $this->headersOriginalKeys[$fieldName] . ': '. iconv('utf-8', 'ISO-8859-1//TRANSLIT', $fieldValue);
+            }
+        }
+
+        return $headers;
+    }
+
     /**
      * Generate headers.
      *
@@ -90,7 +120,7 @@ abstract class PartHeader
         $headers = '';
         foreach ($this->headers as $fieldName => $value) {
             $fieldValue = $this->generateHeaderFieldValue($value);
-            $headers .= $fieldName . ': ' . $fieldValue . "\n";
+            $headers .= $this->headersOriginalKeys[$fieldName] . ': ' . $fieldValue . "\n";
         }
 
         return $headers;
@@ -99,19 +129,18 @@ abstract class PartHeader
     /**
      * Generates a header field value from the given value paramater.
      *
-     * @param array(string=>string)|string $value Header value
-     *
+     * @param string[]|string $value Header value
      * @return string
      */
     protected function generateHeaderFieldValue($value)
     {
         $fieldValue = '';
-        if (is_array($value)) {
+        if (is_array($value) === true) {
             if (isset($value['@'])) {
                 $fieldValue .= $value['@'];
             }
             foreach ($value as $subName => $subValue) {
-                if ($subName != '@') {
+                if ($subName !== '@') {
                     $fieldValue .= '; ' . $subName . '=' . $this->quoteValueString($subValue);
                 }
             }
@@ -134,8 +163,8 @@ abstract class PartHeader
     {
         if (preg_match('~[()<>@,;:\\"/\[\]?=]~', $string)) {
             return '"' . $string . '"';
-        } else {
-            return $string;
         }
+
+        return $string;
     }
 }

tests/BeSimple/SoapClient/SoapClientBuilderTest.php

@@ -4,6 +4,7 @@ namespace BeSimple\SoapClient;
 
 use BeSimple\SoapClient\Curl\CurlOptions;
 use BeSimple\SoapClient\SoapOptions\SoapClientOptions;
+use BeSimple\SoapClient\SoapServerAuthentication\SoapServerAuthenticationBasic;
 use BeSimple\SoapCommon\ClassMap;
 use BeSimple\SoapCommon\SoapOptions\SoapOptions;
 use BeSimple\SoapCommon\SoapOptionsBuilder;
@@ -87,6 +88,27 @@ class SoapClientBuilderTest extends PHPUnit_Framework_TestCase
         self::assertInstanceOf(SoapClient::class, $soapClient);
     }
 
+    public function testCreateOptionsWithAuthenticationAndEndpointLocationAndSslVersionV3()
+    {
+        $authentication = new SoapServerAuthenticationBasic('', '');
+        $soapClientOptions = SoapClientOptionsBuilder::createWithAuthenticationAndEndpointLocationAndSslVersionV3('', $authentication);
+
+        self::assertSame(CURL_SSLVERSION_SSLv3, $soapClientOptions->getSslVersion());
+    }
+
+    public function testConstructSoapClientWithAuthenticationAndEndpointLocationAndSslVersionV3()
+    {
+        $authentication = new SoapServerAuthenticationBasic('', '');
+        $soapOptions = SoapOptionsBuilder::createWithDefaults(self::TEST_LOCAL_WSDL_UK);
+
+        $soapClient = $this->getSoapBuilder()->build(
+            SoapClientOptionsBuilder::createWithAuthenticationAndEndpointLocationAndSslVersionV3('', $authentication),
+            $soapOptions
+        );
+
+        self::assertInstanceOf(SoapClient::class, $soapClient);
+    }
+
     private function getSoapBuilder()
     {
         return new SoapClientBuilder();

tests/BeSimple/SoapClient/SoapClientTest.php

@@ -75,7 +75,7 @@ class SoapClientTest extends PHPUnit_Framework_TestCase
 
     public function testSoapCallWithCustomEndpointInvalidShouldFail()
     {
-        $this->setExpectedException(Exception::class, 'Could not resolve host');
+        $this->setExpectedException(Exception::class, 't resolve host');
 
         $soapClient = $this->getSoapBuilder()->build(
             SoapClientOptionsBuilder::createWithEndpointLocation(self::TEST_REMOTE_ENDPOINT_NOT_WORKING),

tests/BeSimple/SoapClient/Xml/Path/RelativePathResolverTest.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace BeSimple\SoapClient\Xml\Path;
+
+use PHPUnit_Framework_TestCase;
+
+class RelativePathResolverTest extends PHPUnit_Framework_TestCase
+{
+    /** @var RelativePathResolver */
+    private $relativePathResolver;
+
+    public function setUp()
+    {
+        $this->relativePathResolver = new RelativePathResolver();
+    }
+
+    /**
+     * @param string $base
+     * @param string $relative
+     * @param string $assertPath
+     * @dataProvider providePathInfo
+     */
+    public function testResolveRelativePathInUrl($base, $relative, $assertPath)
+    {
+        $path = $this->relativePathResolver->resolveRelativePathInUrl($base, $relative);
+
+        self::assertEquals($assertPath, $path);
+    }
+
+    public function providePathInfo()
+    {
+        return [
+            [
+                'http://anyendpoint.tld:9999/path/to/endpoint.wsdl',
+                '../Schemas/Common/SoapHeader.xsd',
+                'http://anyendpoint.tld:9999/path/Schemas/Common/SoapHeader.xsd',
+            ],
+            [
+                'http://endpoint-location.ltd/',
+                'Document1.xsd',
+                'http://endpoint-location.ltd/Document1.xsd',
+            ],
+            [
+                'http://endpoint-location.ltd:8080/endpoint/',
+                '../Schemas/Common/Document2.xsd',
+                'http://endpoint-location.ltd:8080/Schemas/Common/Document2.xsd',
+            ],
+            [
+                'http://endpoint-location.ltd/',
+                '../Schemas/Common/Document3.xsd',
+                'http://endpoint-location.ltd/Schemas/Common/Document3.xsd',
+            ],
+            [
+                'http://endpoint-location.ltd/',
+                '/Document4.xsd',
+                'http://endpoint-location.ltd/Document4.xsd',
+            ],
+            [
+                'http://endpoint-location.ltd',
+                '/Document5.xsd',
+                'http://endpoint-location.ltd/Document5.xsd',
+            ],
+            [
+                'http://endpoint-location.ltd',
+                'Document6.xsd',
+                'http://endpoint-location.ltd/Document6.xsd',
+            ]
+        ];
+    }
+}

tests/BeSimple/SoapClient/Xml/RemoteFileResolverTest.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace BeSimple\SoapClient\Xml;
+
+use PHPUnit_Framework_TestCase;
+
+class RemoteFileResolverTest extends PHPUnit_Framework_TestCase
+{
+    const FILE_IS_REMOTE = true;
+    const FILE_IS_NOT_REMOTE = false;
+
+    /** @var RemoteFileResolver */
+    private $remoteFileResolver;
+
+    public function setUp()
+    {
+        $this->remoteFileResolver = new RemoteFileResolver();
+    }
+
+    /**
+     * @param string $wsdlPath
+     * @param bool $assertIsRemoteFile
+     * @dataProvider provideWsdlPaths
+     */
+    public function testIsRemoteFile($wsdlPath, $assertIsRemoteFile)
+    {
+        $isRemoteFile = $this->remoteFileResolver->isRemoteFile($wsdlPath);
+
+        self::assertEquals($assertIsRemoteFile, $isRemoteFile);
+    }
+
+    public function provideWsdlPaths()
+    {
+        return [
+            ['http://endpoint.tld/path/to/wsdl.wsdl', self::FILE_IS_REMOTE],
+            ['http://endpoint.tld:1944/path/to/wsdl.wsdl', self::FILE_IS_REMOTE],
+            ['path/to/wsdl.wsdl', self::FILE_IS_NOT_REMOTE],
+            ['../../path/to/wsdl.wsdl', self::FILE_IS_NOT_REMOTE],
+            ['/path/to/wsdl.wsdl', self::FILE_IS_NOT_REMOTE],
+        ];
+    }
+}

tests/BeSimple/SoapClient/Xml/XmlDomDocumentImportReplacerTest.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace BeSimple\SoapClient\Xml;
+
+use BeSimple\SoapClient\Curl\Curl;
+use BeSimple\SoapClient\Curl\CurlOptionsBuilder;
+use BeSimple\SoapCommon\Cache;
+use BeSimple\SoapCommon\Helper;
+use DOMDocument;
+use DOMXPath;
+use PHPUnit_Framework_TestCase;
+
+class XmlDomDocumentImportReplacerTest extends PHPUnit_Framework_TestCase
+{
+    const NO_PARENT_FILE_PATH = null;
+
+    /** @var XmlDomDocumentImportReplacer */
+    private $xmlDomDocumentImportReplacer;
+
+    public function setUp()
+    {
+        $this->xmlDomDocumentImportReplacer = new XmlDomDocumentImportReplacer();
+    }
+
+    /**
+     * @param string $xmlSource
+     * @param Curl $curl
+     * @param string $schemaPrefix
+     * @param string $schemaUrl
+     * @param string $locationAttributeName
+     * @param string|null $parentFilePath
+     * @param string|null $assertImportXmlSource
+     * @dataProvider provideXmlDocumentData
+     */
+    public function testUpdateXmlDocument(
+        $xmlSource,
+        Curl $curl,
+        $schemaPrefix,
+        $schemaUrl,
+        $locationAttributeName,
+        $parentFilePath = null,
+        $assertImportXmlSource = null
+    ) {
+        $wsdl = new DOMDocument();
+        $wsdl->loadXML($xmlSource);
+
+        $this->xmlDomDocumentImportReplacer->updateXmlDocument(
+            $curl,
+            Cache::TYPE_NONE,
+            new DOMXPath($wsdl),
+            $schemaPrefix,
+            $schemaUrl,
+            $locationAttributeName,
+            $parentFilePath
+        );
+        $wsdlSource = $wsdl->saveHTML();
+
+        self::assertContains(
+            $assertImportXmlSource,
+            $wsdlSource
+        );
+    }
+
+    public function provideXmlDocumentData()
+    {
+        return [
+            'wsdlWithoutParentPath' => [
+                file_get_contents(__DIR__.'/testUpdateXmlDocument.wsdl'),
+                new Curl(CurlOptionsBuilder::buildDefault()),
+                Helper::PFX_WSDL,
+                Helper::NS_WSDL,
+                'location',
+                self::NO_PARENT_FILE_PATH,
+                '<xs:include schemaLocation="../Schemas/Common/Document1.xsd"></xs:include>'
+            ],
+            'schemaWithoutParentPath' => [
+                file_get_contents(__DIR__.'/testUpdateXmlDocument.wsdl'),
+                new Curl(CurlOptionsBuilder::buildDefault()),
+                Helper::PFX_XML_SCHEMA,
+                Helper::NS_XML_SCHEMA,
+                'schemaLocation',
+                self::NO_PARENT_FILE_PATH,
+                '<xs:include schemaLocation="../Schemas/Common/Document1.xsd"></xs:include>'
+            ],
+            'wsdlWithParentPath' => [
+                file_get_contents(__DIR__.'/testUpdateXmlDocument.wsdl'),
+                new Curl(CurlOptionsBuilder::buildDefault()),
+                Helper::PFX_WSDL,
+                Helper::NS_WSDL,
+                'location',
+                'http://endpoint-location.ltd:8080/endpoint/',
+                '<xs:include schemaLocation="../Schemas/Common/Document1.xsd"></xs:include>'
+            ],
+            'schemaWithParentPath' => [
+                file_get_contents(__DIR__.'/testUpdateXmlDocument.wsdl'),
+                new Curl(CurlOptionsBuilder::buildDefault()),
+                Helper::PFX_XML_SCHEMA,
+                Helper::NS_XML_SCHEMA,
+                'schemaLocation',
+                'http://endpoint-location.ltd:8080/endpoint/wsdl.wsdl',
+                '<xs:include schemaLocation="http://endpoint-location.ltd:8080/Schemas/Common/Document1.xsd"></xs:include>'
+            ],
+            'schemaWithParentPathAndSubDir' => [
+                file_get_contents(__DIR__.'/testUpdateXmlDocument.wsdl'),
+                new Curl(CurlOptionsBuilder::buildDefault()),
+                Helper::PFX_XML_SCHEMA,
+                Helper::NS_XML_SCHEMA,
+                'schemaLocation',
+                'http://endpoint-location.ltd:8080/endpoint/subdir/wsdl.wsdl',
+                '<xs:include schemaLocation="http://endpoint-location.ltd:8080/endpoint/Schemas/Common/Document1.xsd"></xs:include>'
+            ],
+        ];
+    }
+}

tests/BeSimple/SoapClient/Xml/testUpdateXmlDocument.wsdl

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions
+		xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+		xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+		xmlns:ns="http://location.ltd/namespace1"
+		xmlns:ns2="http://location.ltd/namespace2"
+		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+		xmlns:tns="http://endpoint-location.tld:7654/ws"
+		xmlns:xs="http://www.w3.org/2001/XMLSchema" name="PushServerWSDL"
+		targetNamespace="http://location.ltd/target-namespace">
+	<wsdl:types>
+		<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://location.ltd/namespace1">
+		    <xs:include schemaLocation="../Schemas/Common/Document1.xsd"/>
+		</xs:schema>
+		<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://location.ltd/namespace2">
+		    <xs:include schemaLocation="../Schemas/Common/Document2.xsd"/>
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="ServerHeader">
+		<wsdl:part element="ns:serverHeader" name="serverHeader"/>
+	</wsdl:message>
+
+	<wsdl:portType name="Server">
+		<wsdl:operation name="SendPushMessage">
+			<wsdl:documentation>TEST-OPERATION-1</wsdl:documentation>
+			<wsdl:input message="tns:SendPushMessageRequest" name="SendPushMessageRequest"/>
+			<wsdl:output message="tns:SendPushMessageResponse" name="SendPushMessageResponse"/>
+			<wsdl:fault message="tns:SystemFault" name="systemFault"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="ServerBinding" type="tns:Server">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="DummyMethod">
+			<soap:operation soapAction="http://endpoint-location.tld:7654/ep/v1" style="document"/>
+			<wsdl:input name="DummyMethodRequest">
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output name="DummyMethodResponse">
+				<soap:body use="literal"/>
+			</wsdl:output>
+			<wsdl:fault name="soapServerFault">
+				<soap:fault name="soapServerFault" use="literal"/>
+			</wsdl:fault>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="ServerServices">
+		<wsdl:port binding="tns:ServerBinding" name="ServerServicesEndpoint">
+			<soap:address location="http://endpoint-location.tld:7654/ws/"/>
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>

tests/BeSimple/SoapCommon/Mime/Boundary/MimeBoundaryAnalyserTest.php

@@ -67,6 +67,8 @@ class MimeBoundaryAnalyserTest extends PHPUnit_Framework_TestCase
     {
         return [
             ['-- this line is boundary', self::EXPECTED_IS_BOUNDARY],
+            ['--this line is boundary', self::EXPECTED_IS_BOUNDARY],
+            ['--@ this line is not boundary', self::EXPECTED_IS_NOT_BOUNDARY],
             ['-- this line is also a boundary --', self::EXPECTED_IS_BOUNDARY],
             ['mesage line -- is not boundary', self::EXPECTED_IS_NOT_BOUNDARY],
             [' -- mesage line -- is not boundary', self::EXPECTED_IS_NOT_BOUNDARY],

tests/BeSimple/SoapServer/SoapServerTest.php

@@ -115,6 +115,35 @@ class SoapServerTest extends PHPUnit_Framework_TestCase
         self::assertCount(2, $response->getAttachments());
     }
 
+    public function testHandleRequestWithSwaResponseAndLowerCaseHeaders()
+    {
+        $dummyService = new DummyService();
+        $classMap = new ClassMap();
+        foreach ($dummyService->getClassMap() as $type => $className) {
+            $classMap->add($type, $className);
+        }
+        $soapServerBuilder = new SoapServerBuilder();
+        $soapServerOptions = SoapServerOptionsBuilder::createWithDefaults($dummyService);
+        $soapOptions = SoapOptionsBuilder::createSwaWithClassMap($dummyService->getWsdlPath(), $classMap);
+        $soapServer = $soapServerBuilder->build($soapServerOptions, $soapOptions);
+
+        $request = $soapServer->createRequest(
+            $dummyService->getEndpoint(),
+            'DummyService.dummyServiceMethodWithAttachments',
+            'multipart/related; type="text/xml"; start="<rootpart@soapui.org>"; boundary="----=_Part_6_2094841787.1482231370463"',
+            file_get_contents(self::FIXTURES_DIR.'/Message/Request/dummyServiceMethodWithAttachmentsAndLowerCaseHeaders.request.mimepart.message')
+        );
+        $response = $soapServer->handleRequest($request);
+
+        file_put_contents(self::CACHE_DIR . '/SoapServerTestSwaResponseWithAttachmentsAndLowerCaseHeaders.xml', $response->getContent());
+
+        self::assertNotContains("\r\n", $response->getContent(), 'Response cannot contain CRLF line endings');
+        self::assertContains('dummyServiceMethodWithAttachmentsResponse', $response->getContent());
+        self::assertSame('DummyService.dummyServiceMethodWithAttachments', $response->getAction());
+        self::assertTrue($response->hasAttachments(), 'Response should contain attachments');
+        self::assertCount(2, $response->getAttachments());
+    }
+
     public function getSoapServerBuilder()
     {
         return new SoapServerBuilder();

tests/BeSimple/SoapServerAndSoapClientCommunicationSoapFaultsTest.php

@@ -2,9 +2,11 @@
 
 namespace BeSimple;
 
+use BeSimple\SoapClient\Curl\CurlOptions;
 use BeSimple\SoapClient\SoapClientBuilder;
 use BeSimple\SoapClient\SoapClientOptionsBuilder;
 use BeSimple\SoapClient\SoapFaultWithTracingData;
+use BeSimple\SoapClient\SoapOptions\SoapClientOptions;
 use BeSimple\SoapCommon\ClassMap;
 use BeSimple\SoapCommon\SoapOptions\SoapOptions;
 use BeSimple\SoapCommon\SoapOptionsBuilder;
@@ -34,9 +36,58 @@ class SoapServerAndSoapClientCommunicationSoapFaultsTest extends PHPUnit_Framewo
         pclose($this->localWebServerProcess);
     }
 
+    public function testSoapCallSwaWithLargeSwaResponseWithSoapFaultAndTracingOff()
+    {
+        $soapClient = $this->getSoapClientBuilder()->buildWithSoapHeader(
+            new SoapClientOptions(
+                SoapClientOptions::SOAP_CLIENT_TRACE_OFF,
+                SoapClientOptions::SOAP_CLIENT_EXCEPTIONS_ON,
+                CurlOptions::DEFAULT_USER_AGENT,
+                SoapClientOptions::SOAP_CLIENT_COMPRESSION_NONE,
+                SoapClientOptions::SOAP_CLIENT_AUTHENTICATION_NONE,
+                SoapClientOptions::SOAP_CLIENT_PROXY_NONE,
+                self::TEST_HTTP_URL.'/SwaSenderSoapFaultEndpoint.php'
+            ),
+            SoapOptionsBuilder::createSwaWithClassMap(
+                self::TEST_HTTP_URL.'/SwaSenderEndpoint.php?wsdl',
+                new ClassMap([
+                    'GenerateTestRequest' => GenerateTestRequest::class,
+                ]),
+                SoapOptions::SOAP_CACHE_TYPE_NONE
+            ),
+            new SoapHeader('http://schema.testcase', 'SoapHeader', [
+                'user' => 'admin',
+            ])
+        );
+
+        $this->setExpectedException(SoapFault::class);
+
+        try {
+            $soapClient->soapCall('dummyServiceMethodWithOutgoingLargeSwa', []);
+        } catch (SoapFault $e) {
+            self::assertNotInstanceOf(
+                SoapFaultWithTracingData::class,
+                $e,
+                'SoapClient must not return tracing data when SoapClientOptions::trace is off.'
+            );
+            self::assertEquals(
+                '911',
+                $e->faultcode
+            );
+            self::assertContains(
+                'with HTTP response code 500 with Message: This is a dummy SoapFault. and Code: 911',
+                $e->getMessage()
+            );
+
+            throw $e;
+        }
+
+        self::fail('Expected SoapFault was not thrown');
+    }
+
     public function testSoapCallSwaWithLargeSwaResponseWithSoapFault()
     {
-        $soapClient = $this->getSoapBuilder()->buildWithSoapHeader(
+        $soapClient = $this->getSoapClientBuilder()->buildWithSoapHeader(
             SoapClientOptionsBuilder::createWithEndpointLocation(
                 self::TEST_HTTP_URL.'/SwaSenderSoapFaultEndpoint.php'
             ),
@@ -59,7 +110,8 @@ class SoapServerAndSoapClientCommunicationSoapFaultsTest extends PHPUnit_Framewo
         } catch (SoapFault $e) {
             self::assertInstanceOf(
                 SoapFaultWithTracingData::class,
-                $e
+                $e,
+                'SoapClient must return tracing data when SoapClientOptions::trace is on.'
             );
             /** @var SoapFaultWithTracingData $e */
             self::assertEquals(
@@ -91,7 +143,7 @@ class SoapServerAndSoapClientCommunicationSoapFaultsTest extends PHPUnit_Framewo
 
     public function testSoapCallSwaWithLargeSwaResponseWithNoResponseFromEndpoint()
     {
-        $soapClient = $this->getSoapBuilder()->buildWithSoapHeader(
+        $soapClient = $this->getSoapClientBuilder()->buildWithSoapHeader(
             SoapClientOptionsBuilder::createWithEndpointLocation(
                 self::TEST_HTTP_URL.'/NoSuchEndpointExists'
             ),
@@ -150,7 +202,7 @@ class SoapServerAndSoapClientCommunicationSoapFaultsTest extends PHPUnit_Framewo
 
     public function testSoapCallSwaWithLargeSwaResponseWithNoResponseFromEndpointHost()
     {
-        $soapClient = $this->getSoapBuilder()->buildWithSoapHeader(
+        $soapClient = $this->getSoapClientBuilder()->buildWithSoapHeader(
             SoapClientOptionsBuilder::createWithEndpointLocation(
                 self::TEST_HTTP_URL_INVALID.'/NoSuchEndpointExists'
             ),
@@ -181,7 +233,7 @@ class SoapServerAndSoapClientCommunicationSoapFaultsTest extends PHPUnit_Framewo
                 $e->faultcode
             );
             self::assertContains(
-                'Could not resolve host',
+                't resolve host',
                 $e->getMessage()
             );
             self::assertNull(
@@ -204,7 +256,7 @@ class SoapServerAndSoapClientCommunicationSoapFaultsTest extends PHPUnit_Framewo
         self::fail('Expected SoapFault was not thrown');
     }
 
-    private function getSoapBuilder()
+    private function getSoapClientBuilder()
     {
         return new SoapClientBuilder();
     }

tests/BeSimple/SoapServerAndSoapClientCommunicationTest.php

@@ -3,12 +3,15 @@
 namespace BeSimple;
 
 use BeSimple\SoapBundle\Soap\SoapAttachment;
+use BeSimple\SoapClient\Curl\CurlOptions;
 use BeSimple\SoapClient\SoapClientBuilder;
 use BeSimple\SoapClient\SoapClientOptionsBuilder;
 use BeSimple\SoapClient\SoapFaultWithTracingData;
+use BeSimple\SoapClient\SoapOptions\SoapClientOptions;
 use BeSimple\SoapCommon\ClassMap;
 use BeSimple\SoapCommon\SoapOptions\SoapOptions;
 use BeSimple\SoapCommon\SoapOptionsBuilder;
+use BeSimple\SoapCommon\SoapRequest;
 use BeSimple\SoapServer\SoapServerBuilder;
 use BeSimple\SoapServer\SoapServerOptionsBuilder;
 use Fixtures\DummyService;
@@ -108,6 +111,65 @@ class SoapServerAndSoapClientCommunicationTest extends PHPUnit_Framework_TestCas
         self::assertContains('</dummyServiceReturn>', $soapResponse->getResponseContent());
         self::assertTrue($soapResponse->hasAttachments(), 'Response should contain attachments');
         self::assertCount(3, $attachments);
+        self::assertInstanceOf(
+            SoapRequest::class,
+            $soapResponse->getRequest(),
+            'SoapResponse::request must be SoapRequest for SoapClient calls with enabled tracing'
+        );
+
+        file_put_contents(self::CACHE_DIR . '/multipart-message-soap-client-response.xml', $soapResponse->getContent());
+        foreach ($soapResponse->getAttachments() as $attachment) {
+            $fileName = preg_replace('/\<|\>/', '', $attachment->getContentId());
+            file_put_contents(self::CACHE_DIR . DIRECTORY_SEPARATOR . 'attachment-client-response-' . $fileName, $attachment->getContent());
+
+            self::assertRegExp('/filename\.(docx|html|txt)/', $fileName);
+        }
+
+        self::assertEquals(
+            filesize(self::LARGE_SWA_FILE),
+            filesize(self::CACHE_DIR.'/attachment-client-response-filename.docx'),
+            'File cannot differ after transport from SoapClient to SoapServer'
+        );
+    }
+
+    public function testSoapCallSwaWithLargeSwaResponseAndTracingOff()
+    {
+        $soapClient = $this->getSoapBuilder()->buildWithSoapHeader(
+            new SoapClientOptions(
+                SoapClientOptions::SOAP_CLIENT_TRACE_OFF,
+                SoapClientOptions::SOAP_CLIENT_EXCEPTIONS_ON,
+                CurlOptions::DEFAULT_USER_AGENT,
+                SoapClientOptions::SOAP_CLIENT_COMPRESSION_NONE,
+                SoapClientOptions::SOAP_CLIENT_AUTHENTICATION_NONE,
+                SoapClientOptions::SOAP_CLIENT_PROXY_NONE,
+                self::TEST_HTTP_URL.'/SwaSenderEndpoint.php'
+            ),
+            SoapOptionsBuilder::createSwaWithClassMap(
+                self::TEST_HTTP_URL.'/SwaSenderEndpoint.php?wsdl',
+                new ClassMap([
+                    'GenerateTestRequest' => GenerateTestRequest::class,
+                ]),
+                SoapOptions::SOAP_CACHE_TYPE_NONE
+            ),
+            new SoapHeader('http://schema.testcase', 'SoapHeader', [
+                'user' => 'admin',
+            ])
+        );
+
+        $request = new DummyServiceMethodWithOutgoingLargeSwaRequest();
+        $request->dummyAttribute = 1;
+
+        $soapResponse = $soapClient->soapCall('dummyServiceMethodWithOutgoingLargeSwa', [$request]);
+        $attachments = $soapResponse->getAttachments();
+
+        self::assertContains('</dummyServiceReturn>', $soapResponse->getResponseContent());
+        self::assertTrue($soapResponse->hasAttachments(), 'Response should contain attachments');
+        self::assertCount(3, $attachments);
+        self::assertInstanceOf(
+            SoapRequest::class,
+            $soapResponse->getRequest(),
+            'SoapResponse::request must be SoapRequest for SoapClient calls with disabled tracing'
+        );
 
         file_put_contents(self::CACHE_DIR . '/multipart-message-soap-client-response.xml', $soapResponse->getContent());
         foreach ($soapResponse->getAttachments() as $attachment) {
@@ -164,6 +226,7 @@ class SoapServerAndSoapClientCommunicationTest extends PHPUnit_Framework_TestCas
             self::assertContains('</dummyServiceReturn>', $soapResponse->getResponseContent());
             self::assertTrue($soapResponse->getRequest()->hasAttachments(), 'Response MUST contain attachments');
             self::assertFalse($soapResponse->hasAttachments(), 'Response MUST NOT contain attachments');
+            self::assertInstanceOf(SoapRequest::class, $soapResponse->getRequest());
 
             foreach ($soapResponse->getRequest()->getAttachments() as $attachment) {
                 file_put_contents(self::CACHE_DIR . '/attachment-client-request-'.trim($attachment->getContentId(), '<>'), $attachment->getContent());

tests/Fixtures/Message/Request/dummyServiceMethodWithAttachmentsAndLowerCaseHeaders.request.mimepart.message

@@ -0,0 +1,62 @@
+
+------=_Part_6_2094841787.1482231370463
+Content-type: text/xml; charset=UTF-8
+Content-transfer-Encoding: 8bit
+Content-id: <rootpart@soapui.org>
+
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:sch="http://schema.testcase">
+   <soapenv:Header>
+      <sch:SoapHeader>
+         <user>admin</user>
+      </sch:SoapHeader>
+   </soapenv:Header>
+   <soapenv:Body>
+      <sch:dummyServiceMethodWithAttachments>
+         <request>
+            <dummyAttribute>3</dummyAttribute>
+            <includeAttachments>true</includeAttachments>
+         </request>
+      </sch:dummyServiceMethodWithAttachments>
+   </soapenv:Body>
+</soapenv:Envelope>
+------=_Part_6_2094841787.1482231370463
+Content-type: text/html; charset=us-ascii; name=test-page.html
+Content-transfer-Encoding: 7bit
+Content-id: <test-page.html>
+Content-disposition: attachment; name="test-page.html"; filename="test-page.html"
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+   <title>Test file page</title>
+   <style type="text/css">
+      <!--
+      h1 {
+         font-family: Arial, Helvetica, sans-serif;
+         font-size: 11pt;
+      }
+      -->
+   </style>
+</head>
+
+<body>
+    <h1>Hello World!</h1>
+</body>
+</html>
+
+------=_Part_6_2094841787.1482231370463
+Content-type: application/x-sh; name=testscript.sh
+Content-transfer-Encoding: binary
+Content-id: <testscript.sh>
+Content-disposition: attachment; name="testscript.sh"; filename="testscript.sh"
+
+#!/bin/sh
+### ====================================================================== ###
+##                                                                          ##
+##  Test Script                                                             ##
+##                                                                          ##
+### ====================================================================== ###
+
+------=_Part_6_2094841787.1482231370463--