Changeset 21410 for branches/version-2_11-dev/data/module/SOAP/Disco.php

Timestamp:

2012/01/17 16:32:25 (14 years ago)

Author:

Seasoft

Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21326 #1536
r21325 #1528
r21324 #1547,#1546
r21323 #1546
r21322 #1543
r21321 #1536
r21320 #1536
r21319 #1544
r21318 #1521,#1522
r21317 #1431

File:

• branches/version-2_11-dev/data/module/SOAP/Disco.php (modified) (3 diffs)

branches/version-2_11-dev/data/module/SOAP/Disco.php

@@ -23 +23 @@
  */
 
-/** SOAP_Base */
 require_once 'SOAP/Base.php';
 
-/**
- * @package SOAP
- */
 class SOAP_DISCO_Server extends SOAP_Base_Object {
 
@@ -95 +91 @@
             $this->namespaces[$this->_service_ns] = 'tns';
             $this->namespaces[$flipped['xsd']] = 'xsd';
-            $this->namespaces[$flipped[SOAP_BASE::SOAPENCPrefix()]] = SOAP_BASE::SOAPENCPrefix();
+            $this->namespaces[$flipped['SOAP-ENC']] = 'SOAP-ENC';
         }
 
@@ -213 +209 @@
                     } else {
                         $ctype['complexContent']['attr'] = '';
-                        $ctype['complexContent']['restriction']['attr']['base'] = SOAP_BASE::SOAPENCPrefix().':Array';
+                        $ctype['complexContent']['restriction']['attr']['base'] = 'SOAP-ENC:Array';
                         foreach ($_vartype as $array_type) {
                             list($_vartypens, $_vartype) = $this->_getTypeNs($array_type);
-                            $ctype['complexContent']['restriction']['attribute']['attr']['ref'] = SOAP_BASE::SOAPENCPrefix().':arrayType';
+                            $ctype['complexContent']['restriction']['attribute']['attr']['ref'] = 'SOAP-ENC:arrayType';
                             $ctype['complexContent']['restriction']['attribute']['attr']['wsdl:arrayType'] = $_vartypens . ':' . $_vartype . '[]';
                         }