Merge branch 'cs/zendframework/zendframework#7029-no-space-before-arg…

…ument-list-comma' into develop Close zendframework/zendframework#7029
zendframework · Dec 16, 2014 · a06b182 · a06b182
2 parents 90015ad + 3041642
commit a06b182
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -984,7 +984,7 @@ public function getLastMethod()
      * @param  int    $oneWay
      * @return mixed
      */
-    public function _doRequest(Client\Common $client, $request, $location,$action, $version, $oneWay = null)
+    public function _doRequest(Client\Common $client, $request, $location, $action, $version, $oneWay = null)
     {
         // Perform request as is
         if ($oneWay === null) {

diff --git a/src/Wsdl.php b/src/Wsdl.php
@@ -713,7 +713,7 @@ public function translateType($type)
             return $this->classMap[$type];
         }
 
-        $type = trim($type,'\\');
+        $type = trim($type, '\\');
 
         // remove namespace,
         $pos = strrpos($type, '\\');

diff --git a/test/WsdlTest.php b/test/WsdlTest.php
@@ -455,7 +455,7 @@ public function testAddBindingOperationWithAmpersandInUrl($actualUrl, $expectedU
             'operation1',
             array('use' => 'encoded', 'encodingStyle' => $actualUrl),
             array('use' => 'encoded', 'encodingStyle' => $actualUrl),
-            array('name' => 'MyFault','use' => 'encoded', 'encodingStyle' => $actualUrl)
+            array('name' => 'MyFault', 'use' => 'encoded', 'encodingStyle' => $actualUrl)
         );
 
         $nodes = $this->xpath->query('//wsdl:binding[@type="myPortType" and @name="MyServiceBinding"]/wsdl:operation[@name="operation1"]/wsdl:input/soap:body');