Explorar el Código

ZF-11993
- Added xsd:double as possible return value for Zend_Soap_Wsdl->getType()


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24602 44c647ce-9c0f-0410-b52a-842ac1e357ba

ralph hace 14 años
padre
commit
05b6a0fcdc
Se han modificado 2 ficheros con 5 adiciones y 4 borrados
  1. 2 1
      library/Zend/Soap/Wsdl.php
  2. 3 3
      tests/Zend/Soap/WsdlTest.php

+ 2 - 1
library/Zend/Soap/Wsdl.php

@@ -549,8 +549,9 @@ class Zend_Soap_Wsdl
             case 'integer':
                 return 'xsd:int';
             case 'float':
-            case 'double':
                 return 'xsd:float';
+            case 'double':
+                return 'xsd:double';
             case 'boolean':
             case 'bool':
                 return 'xsd:boolean';

+ 3 - 3
tests/Zend/Soap/WsdlTest.php

@@ -517,7 +517,7 @@ class Zend_Soap_WsdlTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('xsd:int',          $wsdl->getType('int'),     'xsd:int detection failed.');
         $this->assertEquals('xsd:int',          $wsdl->getType('integer'), 'xsd:int detection failed.');
         $this->assertEquals('xsd:float',        $wsdl->getType('float'),   'xsd:float detection failed.');
-        $this->assertEquals('xsd:float',        $wsdl->getType('double'),  'xsd:float detection failed.');
+        $this->assertEquals('xsd:double',       $wsdl->getType('double'),  'xsd:double detection failed.');
         $this->assertEquals('xsd:boolean',      $wsdl->getType('boolean'), 'xsd:boolean detection failed.');
         $this->assertEquals('xsd:boolean',      $wsdl->getType('bool'),    'xsd:boolean detection failed.');
         $this->assertEquals('soap-enc:Array',   $wsdl->getType('array'),   'soap-enc:Array detection failed.');
@@ -533,7 +533,7 @@ class Zend_Soap_WsdlTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($wsdl->getComplexTypeStrategy() instanceof Zend_Soap_Wsdl_Strategy_DefaultComplexType);
 
         $wsdl2 = new Zend_Soap_Wsdl('MyService', 'http://localhost/MyService.php', false);
-        $this->assertEquals('xsd:anyType',             $wsdl2->getType('Zend_Soap_Wsdl_Test'));
+        $this->assertEquals('xsd:anyType', $wsdl2->getType('Zend_Soap_Wsdl_Test'));
         $this->assertTrue($wsdl2->getComplexTypeStrategy() instanceof Zend_Soap_Wsdl_Strategy_AnyType);
     }
 
@@ -633,7 +633,7 @@ class Zend_Soap_WsdlTest extends PHPUnit_Framework_TestCase
         $this->assertEquals("xsd:int", $wsdl->getType("iNt"));
         $this->assertEquals("xsd:int", $wsdl->getType("INTEGER"));
         $this->assertEquals("xsd:float", $wsdl->getType("FLOAT"));
-        $this->assertEquals("xsd:float", $wsdl->getType("douBLE"));
+        $this->assertEquals("xsd:double", $wsdl->getType("douBLE"));
     }
 
     /**