Merge remote-tracking branch 'origin/master' into request_headers

Conflicts: DependencyInjection/BeSimpleSoapExtension.php Resources/config/webservice.xml WebServiceContext.php
2011-08-14 21:16:11 +02:00
parent 7fd56b657c 33165ce8d2
commit cce23d8abe
4 changed files with 21 additions and 32 deletions
--- a/DependencyInjection/BeSimpleSoapExtension.php
+++ b/DependencyInjection/BeSimpleSoapExtension.php
@ -60,8 +60,8 @@ class BeSimpleSoapExtension extends Extension

        $options = $container
            ->getDefinition('besimple.soap.context.'.$bindingSuffix)
-            ->getArgument(7);
+            ->getArgument(4);

-        $definition->replaceArgument(7, array_merge($options, $config));
+        $definition->replaceArgument(4, array_merge($options, $config));
    }
 }