修复其他不兼容的类型数组

phpserialize/encoder.go → encoder.go

@@ -54,7 +54,7 @@ func encodeValue(buf *bytes.Buffer, value interface{}) (err error) {
 		buf.WriteRune(TYPE_VALUE_SEPARATOR)
 		encodeString(buf, t)
 		buf.WriteRune(VALUES_SEPARATOR)
-	case map[interface{}]interface{}:
+	case map[string]interface{}, []interface{}, map[interface{}]interface{}:
 		buf.WriteString("a")
 		buf.WriteRune(TYPE_VALUE_SEPARATOR)
 		err = encodeArrayCore(buf, t)
@@ -77,26 +77,77 @@ func encodeString(buf *bytes.Buffer, strValue string) {
 	buf.WriteRune('"')
 }
 
-func encodeArrayCore(buf *bytes.Buffer, arrValue map[interface{}]interface{}) (err error) {
-	valLen := strconv.Itoa(len(arrValue))
-	buf.WriteString(valLen)
-	buf.WriteRune(TYPE_VALUE_SEPARATOR)
+func rangeArrayCore(buf *bytes.Buffer, arrValue interface{}) (err error) {
 
-	buf.WriteRune('{')
-	for k, v := range arrValue {
-		if intKey, _err := strconv.Atoi(fmt.Sprintf("%v", k)); _err == nil {
-			if err = encodeValue(buf, intKey); err != nil {
+	if arrVal, ok := arrValue.([]interface{}); ok {
+		for k, v := range arrVal {
+			if intKey, _err := strconv.Atoi(fmt.Sprintf("%v", k)); _err == nil {
+				if err = encodeValue(buf, intKey); err != nil {
+					break
+				}
+			} else {
+				if err = encodeValue(buf, k); err != nil {
+					break
+				}
+			}
+			if err = encodeValue(buf, v); err != nil {
 				break
 			}
-		} else {
-			if err = encodeValue(buf, k); err != nil {
+		}
+	} else if arrVal, ok := arrValue.(map[interface{}]interface{}); ok {
+		for k, v := range arrVal {
+			if intKey, _err := strconv.Atoi(fmt.Sprintf("%v", k)); _err == nil {
+				if err = encodeValue(buf, intKey); err != nil {
+					break
+				}
+			} else {
+				if err = encodeValue(buf, k); err != nil {
+					break
+				}
+			}
+			if err = encodeValue(buf, v); err != nil {
 				break
 			}
 		}
-		if err = encodeValue(buf, v); err != nil {
-			break
+	} else if arrVal, ok := arrValue.(map[string]interface{}); ok {
+		for k, v := range arrVal {
+			if intKey, _err := strconv.Atoi(fmt.Sprintf("%v", k)); _err == nil {
+				if err = encodeValue(buf, intKey); err != nil {
+					break
+				}
+			} else {
+				if err = encodeValue(buf, k); err != nil {
+					break
+				}
+			}
+			if err = encodeValue(buf, v); err != nil {
+				break
+			}
 		}
 	}
+
+	return err
+}
+
+func encodeArrayCore(buf *bytes.Buffer, arrValue interface{}) (err error) {
+	valLen := ""
+	if arr, ok := arrValue.([]interface{}); ok {
+		valLen = strconv.Itoa(len(arr))
+	} else if arr, ok := arrValue.(map[interface{}]interface{}); ok {
+		valLen = strconv.Itoa(len(arr))
+	} else if arr, ok := arrValue.(map[string]interface{}); ok {
+		valLen = strconv.Itoa(len(arr))
+	}
+
+	if "" == valLen {
+		return fmt.Errorf("Unexpected type of array %T", arrValue)
+	}
+
+	buf.WriteString(valLen)
+	buf.WriteRune(TYPE_VALUE_SEPARATOR)
+
+	buf.WriteRune('{')
+	err = rangeArrayCore(buf, arrValue)
 	buf.WriteRune('}')
 	return err
 }