Support enums. Fixes #7

Author: StringEpsilon

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.7.0:
+- Support de/serialization of enums
+- Added serialization option `NumericEnums`:
+	Whether or not to serialize enums as integer values
+	Defaults to true. If set to false, the enum.ToString() representation will be used.
+
 # 0.6.0:
 
 - Allow more (valid) characters in object class names.

PhpSerializerNET.Test/TestEnum.cs

@@ -0,0 +1,49 @@
+
+/**
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+**/
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace PhpSerializerNET.Test {
+	public enum IntEnum : int {
+		A = 1,
+		B,
+	}
+	public enum LongEnum : long {
+		A = 1,
+		B,
+	}
+
+	[TestClass]
+	public class TestEnum {
+
+		[TestMethod]
+		public void DeserializeEnums() {
+			Assert.AreEqual(
+				IntEnum.A,
+				PhpSerialization.Deserialize<IntEnum>("i:1;")
+			);
+
+			Assert.AreEqual(
+				LongEnum.A,
+				PhpSerialization.Deserialize<LongEnum>("i:1;")
+			);
+
+			Assert.AreEqual(
+				LongEnum.A,
+				PhpSerialization.Deserialize<LongEnum>("s:1:\"A\";")
+			);
+		}
+
+		[TestMethod]
+		public void SerializeOne() {
+			Assert.AreEqual(
+				"i:1;",
+				PhpSerialization.Serialize(IntEnum.A)
+			);
+		}
+	}
+}

PhpSerializerNET/Extensions/TypeExtensions.cs

@@ -4,6 +4,7 @@ This Source Code Form is subject to the terms of the Mozilla Public
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 **/
 using System;
+using System.Globalization;
 using System.Reflection;
 
 namespace PhpSerializerNET {
@@ -26,5 +27,11 @@ internal static object GetValue(this MemberInfo member, object input) {
 			}
 			return null;
 		}
+
+		internal static string GetNumericString(this Enum enumValue) {
+			return ((IConvertible)enumValue)
+				.ToType(enumValue.GetType().GetEnumUnderlyingType(), CultureInfo.InvariantCulture)
+				.ToString();
+		}
 	}
 }

PhpSerializerNET/PhpDeserializer.cs

@@ -132,6 +132,16 @@ private object DeserializeToken(Type targetType, PhpSerializeToken token) {
 				case PhpSerializerType.Integer:
 				case PhpSerializerType.Floating:
 				case PhpSerializerType.String:
+					if (targetType.IsEnum){
+						if (token.Type != PhpSerializerType.String){
+							return ((IConvertible)token.Value).ToType(targetType.GetEnumUnderlyingType(), CultureInfo.InvariantCulture);
+						} else {
+							return targetType
+								.GetFields()
+								.FirstOrDefault(y => y.Name == token.Value)
+								.GetRawConstantValue();
+						}
+					}
 					if (targetType.IsIConvertible()) {
 						if (targetType == typeof(bool)) {
 							if (_options.NumberStringToBool && (token.Value == "0" || token.Value == "1")) {

PhpSerializerNET/PhpSerializer.cs

@@ -27,6 +27,13 @@ public PhpSerializer(PhpSerializiationOptions options = null) {
 		public string Serialize(object input) {
 			StringBuilder output = new StringBuilder();
 			switch (input) {
+				case Enum enumValue: {
+					if (this._options.NumericEnums) {
+						return $"i:{enumValue.GetNumericString()};";
+					} else {
+						return $"i:{enumValue.ToString()};";
+					}
+				}
 				case long longValue: {
 						return $"i:{longValue.ToString()};";
 					}

PhpSerializerNET/PhpSerializiationOptions.cs

@@ -3,6 +3,7 @@ This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 **/
+using System;
 
 namespace PhpSerializerNET {
 
@@ -16,6 +17,12 @@ public class PhpSerializiationOptions {
 		/// </summary>
 		public bool ThrowOnCircularReferences { get; set; } = false;
 
+		/// <summary>
+		/// Whether to serialize enums as numeric values (integers) or using their string representation 
+		/// (via <see cref="Enum.ToString()"/>)
+		/// </summary>
+		public bool NumericEnums { get; set; } = true;
+
 		internal static PhpSerializiationOptions DefaultOptions = new();
 	}
 }