Merge remote-tracking branch 'sasezaki/hotfix/ZF-11937'

agiledivider · Jan 2, 2012 · aeee9e1 · aeee9e1
2 parents 0a84a1c + d80e13a
commit aeee9e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/library/Zend/Soap/Wsdl.php b/library/Zend/Soap/Wsdl.php
@@ -540,28 +540,23 @@ public function getType($type)
             case 'string':
             case 'str':
                 return 'xsd:string';
-                break;
+            case 'long':
+                return 'xsd:long';
             case 'int':
             case 'integer':
                 return 'xsd:int';
-                break;
             case 'float':
             case 'double':
                 return 'xsd:float';
-                break;
             case 'boolean':
             case 'bool':
                 return 'xsd:boolean';
-                break;
             case 'array':
                 return 'soap-enc:Array';
-                break;
             case 'object':
                 return 'xsd:struct';
-                break;
             case 'mixed':
                 return 'xsd:anyType';
-                break;
             case 'void':
                 return '';
             default:

diff --git a/tests/Zend/Soap/WsdlTest.php b/tests/Zend/Soap/WsdlTest.php
@@ -622,6 +622,15 @@ function testCaseOfDocBlockParamsDosNotMatterForSoapTypeDetectionZf3910()
         $this->assertEquals("xsd:float", $wsdl->getType("douBLE"));
     }
 
+    /**
+     * @group ZF-11937
+     */
+    public function testWsdlGetTypeWillAllowLongType()
+    {
+        $wsdl = new Wsdl('MyService', 'http://localhost/MyService.php');
+        $this->assertEquals("xsd:long", $wsdl->getType("long"));
+    }
+
     /**
      * @group ZF-5430
      */