Changeset 21299 for branches/version-2_11-dev/data/module/SOAP/Value.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/Value.php (modified) (8 diffs)

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

@@ -41 +41 @@
 {
     /**
-     * @var string
+     * The actual value.
+     *
+     * @var mixed
      */
     var $value = null;
 
     /**
+     * QName instance representing the value name.
+     *
+     * @var QName
+     */
+    var $nqn;
+
+    /**
+     * The value name, without namespace information.
+     *
      * @var string
      */
@@ -51 +62 @@
 
     /**
+     * The namespace of the value name.
+     *
+     * @var string
+     */
+    var $namespace = '';
+
+    /**
+     * QName instance representing the value type.
+     *
+     * @var QName
+     */
+    var $tqn;
+
+    /**
+     * The value type, without namespace information.
+     *
      * @var string
      */
@@ -56 +83 @@
 
     /**
-     * Namespace
-     *
-     * @var string
-     */
-    var $namespace = '';
+     * The namespace of the value type.
+     *
+     * @var string
+     */
     var $type_namespace = '';
 
+    /**
+     * The type of the array elements, if this value is an array.
+     *
+     * @var string
+     */
+    var $arrayType = '';
+
+    /**
+     * A hash of additional attributes.
+     *
+     * @see SOAP_Value()
+     * @var array
+     */
     var $attributes = array();
 
     /**
-     * @var string
-     */
-    var $arrayType = '';
-
+     * List of encoding and serialization options.
+     *
+     * @see SOAP_Value()
+     * @var array
+     */
     var $options = array();
-
-    var $nqn;
-    var $tqn;
 
     /**
@@ -82 +119 @@
      *                           automatically if not set.
      * @param mixed $value       Value to set.
-     * @param array $attributes  Attributes.
+     * @param array $attributes  A has of additional XML attributes to be
+     *                           added to the serialized value.
+     * @param array $options     A list of encoding and serialization options:
+     *                           - 'attachment': array with information about
+     *                             the attachment
+     *                           - 'soap_encoding': defines encoding for SOAP
+     *                             message part of a MIME encoded SOAP request
+     *                             (default: base64)
+     *                           - 'keep_arrays_flat': use the tag name
+     *                             multiple times for each element when
+     *                             passing in an array in literal mode
+     *                           - 'no_type_prefix': supress adding of the
+     *                             namespace prefix
      */
     function SOAP_Value($name = '', $type = false, $value = null,
-                        $attributes = array())
-    {
-        // Detect type if not passed.
+                        $attributes = array(), $options = array())
+    {
         $this->nqn = new QName($name);
         $this->name = $this->nqn->name;
         $this->namespace = $this->nqn->namespace;
-        $this->tqn = new QName($type);
-        $this->type = $this->tqn->name;
-        $this->type_prefix = $this->tqn->ns;
-        $this->type_namespace = $this->tqn->namespace;
+        if ($type) {
+            $this->tqn = new QName($type);
+            $this->type = $this->tqn->name;
+            $this->type_namespace = $this->tqn->namespace;
+        }
         $this->value = $value;
         $this->attributes = $attributes;
+        $this->options = $options;
     }
 
@@ -110 +160 @@
     {
         return $serializer->_serializeValue($this->value,
-                                            $this->name,
-                                            $this->type,
-                                            $this->namespace,
-                                            $this->type_namespace,
+                                            $this->nqn,
+                                            $this->tqn,
                                             $this->options,
                                             $this->attributes,
@@ -157 +205 @@
 
         if (isset($actor)) {
-            $this->attributes['SOAP-ENV:actor'] = $actor;
-        } elseif (!isset($this->attributes['SOAP-ENV:actor'])) {
-            $this->attributes['SOAP-ENV:actor'] = 'http://schemas.xmlsoap.org/soap/actor/next';
-        }
-        $this->attributes['SOAP-ENV:mustUnderstand'] = (int)$mustunderstand;
+            $this->attributes[SOAP_BASE::SOAPENVPrefix().':actor'] = $actor;
+        } elseif (!isset($this->attributes[SOAP_BASE::SOAPENVPrefix().':actor'])) {
+            $this->attributes[SOAP_BASE::SOAPENVPrefix().':actor'] = 'http://schemas.xmlsoap.org/soap/actor/next';
+        }
+        $this->attributes[SOAP_BASE::SOAPENVPrefix().':mustUnderstand'] = (int)$mustunderstand;
     }
 
@@ -184 +232 @@
      *                          is provide.
      * @param string $file      The attachment data.
+     * @param array $attributes Attributes.
      */
     function SOAP_Attachment($name = '', $type = 'application/octet-stream',
-                             $filename, $file = null)
+                             $filename, $file = null, $attributes = null)
     {
         parent::SOAP_Value($name, null, null);
 
-        $filedata = ($file === null) ? $this->_file2str($filename) : $file;
+        $filedata = $file === null ? $this->_file2str($filename) : $file;
         $filename = basename($filename);
         if (PEAR::isError($filedata)) {
@@ -199 +248 @@
         $cid = md5(uniqid(time()));
 
-        $this->attributes['href'] = 'cid:' . $cid; 
+        $this->attributes = $attributes;
+        $this->attributes['href'] = 'cid:' . $cid;
 
         $this->options['attachment'] = array('body' => $filedata,