WS client request working

Author: goetas

phpunit.xml.dist

@@ -22,12 +22,14 @@
         </testsuite>
     </testsuites>
 
-<filter>
-  <whitelist>
-    <directory>src</directory>
-  </whitelist>
-  </filter>
-
+    <filter>
+        <whitelist>
+            <directory>src</directory>
+            <exclude>
+                <directory>src/WssWsSecurity/XmlSign</directory>
+            </exclude>
+        </whitelist>
+    </filter>
 </phpunit>
 
 

src/Arguments/Headers/Handler/HeaderHandler.php

@@ -12,9 +12,6 @@
 
 class HeaderHandler implements SubscribingHandlerInterface
 {
-    const SOAP = 'http://schemas.xmlsoap.org/soap/envelope/';
-    const SOAP_12 = 'http://www.w3.org/2003/05/soap-envelope';
-
     protected $headerData = [];
 
     public static function getSubscribingMethods()
@@ -66,7 +63,7 @@ public function serializeHeader(XmlSerializationVisitor $visitor, HeaderPlacehol
 
             $metadata = new StaticPropertyMetadata($classMetadata->name, $classMetadata->xmlRootName, $header->getData());
             $metadata->xmlNamespace = $classMetadata->xmlRootNamespace;
-            $metadata->serializedName = $classMetadata->xmlRootName;
+            $metadata->serializedName = $classMetadata->xmlRootName ?: 'header';
 
             $visitor->visitProperty($metadata, $header->getData(), $context);
 
@@ -87,12 +84,7 @@ private function handleOptions(XmlSerializationVisitor $visitor, $header)
         foreach ($options as $option => $value) {
             if (in_array($option, ['mustUnderstand', 'required', 'role', 'actor'])) {
 
-                if ($currentNode->ownerDocument->documentElement->namespaceURI === self::SOAP_12) {
-                    $envelopeNS = self::SOAP_12;
-                } else {
-                    $envelopeNS = self::SOAP;
-                }
-                $this->setAttributeOnNode($currentNode->lastChild, $option, $value, $envelopeNS);
+                $this->setAttributeOnNode($currentNode->lastChild, $option, $value, $currentNode->ownerDocument->documentElement->namespaceURI);
             }
         }
     }

src/DependencyInjection/Configuration.php

@@ -83,7 +83,12 @@ public function getConfigTreeBuilder()
                     ->prototype('scalar')->end()
                 ->end()
 
-
+                ->scalarNode('any_element')
+                    ->defaultValue(false)
+                ->end()
+                ->scalarNode('any_attribute')
+                    ->defaultValue(false)
+                ->end()
 
 
 

src/DependencyInjection/SoapClientExtension.php

@@ -42,7 +42,17 @@ public function load(array $configs, ContainerBuilder $container)
 
 
         foreach (['php', 'jms'] as $type) {
+
             $converter = $container->getDefinition('goetas_webservices.xsd2php.converter.' . $type);
+
+            $converter->addMethodCall('setOutputAnyAttribute', [$config['any_attribute']]);
+            $converter->addMethodCall('setOutputAnyElement', [$config['any_element']]);
+
+            $converterWsdl = $container->getDefinition('goetas_webservices.wsdl2php.converter.' . $type);
+
+            $converterWsdl->addMethodCall('setOutputAnyAttribute', [$config['any_attribute']]);
+            $converterWsdl->addMethodCall('setOutputAnyElement', [$config['any_element']]);
+
             foreach ($config['namespaces'] as $xml => $php) {
                 $converter->addMethodCall('addNamespace', [$xml, self::sanitizePhp($php)]);
             }
@@ -53,6 +63,11 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
+        $schemaReader = $container->getDefinition('goetas_webservices.xsd2php.schema_reader');
+        foreach ($config['known_locations'] as $namespace => $location) {
+            $schemaReader->addMethodCall('addKnownSchemaLocation', [$namespace, $location]);
+        }
+
 
         $definition = $container->getDefinition('goetas_webservices.xsd2php.naming_convention.' . $config['naming_strategy']);
         $container->setDefinition('goetas_webservices.xsd2php.naming_convention', $definition);