Fixed invalid output when using PhpSerializiationOptions.NumericEnums = false

And added a few tests.

Author: StringEpsilon

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Future:
 - Improved deserialization performance.
+- Fixed invalid output when using PhpSerializiationOptions.NumericEnums = false
 
 # 0.7.3:
 - Fixed an issue with empty string deserialization, caused by the `EmptyStringToDefault` code in 0.7.2.

PhpSerializerNET.Test/TestEnum.cs

@@ -45,5 +45,13 @@ public void SerializeOne() {
 				PhpSerialization.Serialize(IntEnum.A)
 			);
 		}
+
+		[TestMethod]
+		public void SerializeString() {
+			Assert.AreEqual(
+				"s:1:\"A\";",
+				PhpSerialization.Serialize(IntEnum.A, new PhpSerializiationOptions{NumericEnums = false})
+			);
+		}
 	}
 }

PhpSerializerNET.Test/TestObjects.cs

@@ -73,7 +73,7 @@ public void DeserializesNamedClass() {
 		[TestMethod]
 		public void DeserializesStdClassToDynamic() {
 			var anonymous = new { foo = "foo" };
-			System.Console.WriteLine(anonymous.GetType().Name);
+
 			var result = (dynamic)PhpSerialization.Deserialize(
 				"O:8:\"stdClass\":2:{s:4:\"John\";d:3.14;s:4:\"Jane\";d:2.718;}"
 			);
@@ -85,20 +85,19 @@ public void DeserializesStdClassToDynamic() {
 		[TestMethod]
 		public void DeserializesStdClassToDictionary() {
 			var anonymous = new { foo = "foo" };
-			System.Console.WriteLine(anonymous.GetType().Name);
-			var result = (dynamic)PhpSerialization.Deserialize(
+			dynamic result = (PhpDynamicObject)PhpSerialization.Deserialize(
 				"O:8:\"stdClass\":2:{s:4:\"John\";d:3.14;s:4:\"Jane\";d:2.718;}",
 				new PhpDeserializationOptions() { StdClass = StdClassOption.Dynamic }
 			);
 
 			Assert.AreEqual(3.14, result.John);
 			Assert.AreEqual(2.718, result.Jane);
+			Assert.AreEqual("stdClass",result.GetClassName());
 		}
 
 		[TestMethod]
 		public void DeserializesToSpecificClass() {
 			var anonymous = new { foo = "foo" };
-			System.Console.WriteLine(anonymous.GetType().Name);
 			var result = PhpSerialization.Deserialize<NamedClass>(
 				"O:8:\"stdClass\":2:{s:4:\"John\";d:3.14;s:4:\"Jane\";d:2.718;}",
 				new PhpDeserializationOptions() { StdClass = StdClassOption.Dynamic }
@@ -111,7 +110,6 @@ public void DeserializesToSpecificClass() {
 		[TestMethod]
 		public void DeserializesToSpecificStruct() {
 			var anonymous = new { foo = "foo" };
-			System.Console.WriteLine(anonymous.GetType().Name);
 			var result = PhpSerialization.Deserialize<MyStruct>(
 				"O:8:\"stdClass\":2:{s:4:\"John\";d:3.14;s:4:\"Jane\";d:2.718;}",
 				new PhpDeserializationOptions() { StdClass = StdClassOption.Dynamic }
@@ -124,7 +122,6 @@ public void DeserializesToSpecificStruct() {
 		[TestMethod]
 		public void DeserializesToSpecifiedDictionary() {
 			var anonymous = new { foo = "foo" };
-			System.Console.WriteLine(anonymous.GetType().Name);
 			var result = PhpSerialization.Deserialize<Dictionary<string, object>>(
 				"O:8:\"stdClass\":2:{s:4:\"John\";d:3.14;s:4:\"Jane\";d:2.718;}",
 				new PhpDeserializationOptions() { StdClass = StdClassOption.Dynamic }

PhpSerializerNET.Test/TestPhpDateTime.cs

@@ -0,0 +1,26 @@
+/**
+  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.Collections;
+using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace PhpSerializerNET.Test {
+	[TestClass]
+	public class TestPhpDateTime {
+		[TestMethod]
+		public void DeserializesDictionary() {
+			var result = PhpSerialization.Deserialize(
+				"O:8:\"DateTime\":3:{s:4:\"date\";s:26:\"2021-08-18 09:10:23.441055\";s:13:\"timezone_type\";i:3;s:8:\"timezone\";s:3:\"UTC\";}"
+			);
+
+			Assert.IsInstanceOfType(result, typeof(PhpDateTime));
+			var date = result as PhpDateTime;
+			Assert.AreEqual("UTC", date.Timezone);
+			Assert.AreEqual("2021-08-18 09:10:23.441055", date.Date);
+		}
+	}
+}

PhpSerializerNET/PhpSerializer.cs

@@ -31,7 +31,7 @@ public string Serialize(object input) {
 					if (this._options.NumericEnums) {
 						return $"i:{enumValue.GetNumericString()};";
 					} else {
-						return $"i:{enumValue.ToString()};";
+						return Serialize(enumValue.ToString());
 					}
 				}
 				case long longValue: {