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

Timestamp:

2011/10/31 13:54:41 (12 years ago)

Author:

kotani

Message:

#1521 (PEAR::SOAP 配布と異なる部分がある)

• 新しいバージョンの配布ファイルを上書きすることで解決
• →2.11.4には含めないため一旦コミットキャンセル

#1522 (PEAR::SOAP をバージョンアップ)

• 0.11.0 -> 0.12.0
• →2.11.4には含めないため一旦コミットキャンセル

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 . '[]';
                         }