Short circuit strings in deserialization. Fixes #14

Author: StringEpsilon

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.7.3:
+- Fixed an issue with empty string deserialization, caused by the `EmptyStringToDefault` code in 0.7.2.
+
 # 0.7.2:
 - Added `EmptyStringToDefault` deserialization option, defaults to true.
 	- When true, empty strings will be deserialized into the default value of the target IConvertible.

PhpSerializerNET.Test/TestStrings.cs

@@ -33,6 +33,15 @@ public void SerializeEmptyString() {
 				PhpSerialization.Serialize("")
 			);
 		}
+		
+		[TestMethod]
+		public void DeserializeEmptyStringExplicit() {
+			Assert.AreEqual(
+				"",
+				PhpSerialization.Deserialize<string>("s:0:\"\";")
+			);
+		}
+
 		[TestMethod]
 		public void SerializeUmlauts() {
 			Assert.AreEqual(

PhpSerializerNET/PhpDeserializer.cs

@@ -132,6 +132,11 @@ private object DeserializeToken(Type targetType, PhpSerializeToken token) {
 				case PhpSerializerType.Integer:
 				case PhpSerializerType.Floating:
 				case PhpSerializerType.String:
+					// Short-circuit strings:
+					if (targetType == typeof(string)) {
+						return token.Value;
+					}
+
 					if (targetType.IsEnum){
 						if (token.Type != PhpSerializerType.String){
 							return ((IConvertible)token.Value).ToType(targetType.GetEnumUnderlyingType(), CultureInfo.InvariantCulture);