Support string to System.Guid deserialization.

Fixes #10

Author: StringEpsilon

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.7.1:
+- Fixed issue with nested array / object validation (issue #11)
+- Added support for System.Guid (issue #10)
+
+
 # 0.7.0:
 - Support de/serialization of enums
 - Added serialization option `NumericEnums`:

PhpSerializerNET.Test/DeserializeObjects.cs

@@ -26,6 +26,8 @@ public class MappedClass {
 
 			[PhpIgnore]
 			public string it { get; set; }
+
+			public Guid guid {get;set;}
 		}
 
 		[TestMethod]
@@ -65,7 +67,7 @@ public void DeserializeObjectWithExcessKeys() {
 
 		public void Test_Issue11() {
 			var deserializedObject = PhpSerialization.Deserialize(
-				"a:1:{i:0;a:7:{s:1:\"A\";N;s:1:\"B\";N;s:1:\"C\";s:1:\"C\";s:5:\"odSdr\";i:1;s:1:\"D\";d:1;s:1:\"E\";N;s:1:\"F\";a:3:{s:1:\"X\";i:8;s:1:\"Y\";N;s:1:\"Z\";N;}}}",
+				"a:1:{i:0;a:7:{s:1:\"A\";N;s:1:\"B\";N;s:1:\"C\";s:1:\"C\";s:5:\"odSdr\";i:1;s:1:\"D\";d:1;s:1:\"E\";N;s:1:\"F\";a:3:{s:1:\"X\";i:8;s:1:\"Y\";N;s:1:\"Z\";N;}}}"
 			);
 			Assert.IsNotNull(deserializedObject);
 		}
@@ -79,6 +81,15 @@ public void ThrowsOnExcessKeys() {
 			Assert.AreEqual("Could not bind the key \"es\" to object of type MappedClass: No such property.", ex.Message);
 		}
 
+		[TestMethod]
+		public void AssignsGuids() {
+			var result = PhpSerialization.Deserialize<MappedClass>(
+				"a:1:{s:4:\"guid\";s:36:\"82e2ebf0-43e6-4c10-82cf-57d60383a6be\";}",
+				new PhpDeserializationOptions() { AllowExcessKeys = true }
+			);
+			Assert.AreEqual(new Guid("82e2ebf0-43e6-4c10-82cf-57d60383a6be"), result.guid);
+		}
+
 
 		[TestMethod]
 		public void DeserializeList() {

PhpSerializerNET.Test/DeserializePrimitives.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 Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace PhpSerializerNET.Test {
@@ -69,6 +70,12 @@ public void DeserializeLong() {
 			);
 		}
 
+		[TestMethod]
+		public void DeserializeGUID() {
+			Guid guid = PhpSerialization.Deserialize<Guid>("s:36:\"82e2ebf0-43e6-4c10-82cf-57d60383a6be\";");
+			Assert.AreEqual("82e2ebf0-43e6-4c10-82cf-57d60383a6be", guid.ToString());
+		}
+
 		[TestMethod]
 		public void DeserializesDouble() {
 			Assert.AreEqual(

PhpSerializerNET/PhpDeserializer.cs

@@ -149,6 +149,8 @@ private object DeserializeToken(Type targetType, PhpSerializeToken token) {
 							}
 						}
 						return ((IConvertible)token.Value).ToType(targetType, CultureInfo.InvariantCulture);
+					} else if(targetType == typeof(System.Guid)) {
+						return new Guid(token.Value);
 					} else {
 						throw new DeserializationException(
 							$"Can not assign value \"{token.Value}\" (at position {token.Position}) to target type of {targetType.Name}."