Changeset 21299 for branches/version-2_11-dev/data/module/SOAP/Parser.php

Timestamp:

2011/10/25 00:02:55 (13 years ago)

Author:

Seasoft

Message:

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

• 新しいバージョンの配布ファイルを上書きすることで解決

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

• 0.11.0 -> 0.12.0

File:

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

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

@@ -221 +221 @@
 
         // Add current node's value.
+        $nqn = new QName($this->message[$pos]['name'],
+                         $this->message[$pos]['namespace']);
+        $tqn = new QName($this->message[$pos]['type'],
+                         $this->message[$pos]['type_namespace']);
         if ($response) {
-            $nqn = new QName($this->message[$pos]['name'],
-                             $this->message[$pos]['namespace']);
-            $tqn = new QName($this->message[$pos]['type'],
-                             $this->message[$pos]['type_namespace']);
-            $response = new SOAP_Value($nqn->fqn(),
-                                       $tqn->fqn(),
-                                       $response,
+            $response = new SOAP_Value($nqn->fqn(), $tqn->fqn(), $response,
                                        $attrs);
             if (isset($this->message[$pos]['arrayType'])) {
@@ -234 +232 @@
             }
         } else {
-            $nqn = new QName($this->message[$pos]['name'],
-                             $this->message[$pos]['namespace']);
-            $tqn = new QName($this->message[$pos]['type'],
-                             $this->message[$pos]['type_namespace']);
             // Check if value is an empty array
             if ($tqn->name == 'Array') {
-                $response =& new SOAP_Value($nqn->fqn(), $tqn->fqn(),
-                                            array(), $attrs);
+                $response = new SOAP_Value($nqn->fqn(), $tqn->fqn(), array(),
+                                           $attrs);
+                //if ($pos == 4) var_dump($this->message[$pos], $response);
             } else {
-                $response = new SOAP_Value($nqn->fqn(),
-                                            $tqn->fqn(),
-                                            $this->message[$pos]['cdata'],
-                                            $attrs);
+                $response = new SOAP_Value($nqn->fqn(), $tqn->fqn(),
+                                           $this->message[$pos]['cdata'],
+                                           $attrs);
             }
         }
@@ -257 +251 @@
             $response->mustunderstand = $this->message[$pos]['mustUnderstand'];
         }
+
         return $response;
     }