Account for closing bracket in validateformat correctly.

Fixes #11

Author: StringEpsilon

PhpSerializerNET.Test/DeserializeObjects.cs

@@ -61,6 +61,14 @@ public void DeserializeObjectWithExcessKeys() {
 			);
 			Assert.IsNotNull(deserializedObject);
 		}
+		[TestMethod]
+
+		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;}}}",
+			);
+			Assert.IsNotNull(deserializedObject);
+		}
 
 		[TestMethod]
 		public void ThrowsOnExcessKeys() {

PhpSerializerNET.Test/TestDeserializeErrors.cs

@@ -54,7 +54,7 @@ public void DeserializeMalformedString() {
 			Assert.AreEqual("Malformed string at position 0", ex.Message);
 
 			ex = Assert.ThrowsException<DeserializationException>(() => PhpSerialization.Deserialize("s:30:\"\";"));
-			Assert.AreEqual("Illegal length of 30. The string at position 0 pointed to out of bounds index 36.", ex.Message);
+			Assert.AreEqual("Illegal length of 30. The string at position 0 points to out of bounds index 36.", ex.Message);
 
 			ex = Assert.ThrowsException<DeserializationException>(() => PhpSerialization.Deserialize("s:1:\"\";"));
 			Assert.AreEqual("String at position 0 has an incorrect length of 1: Expected double quote at position 6, found ';' instead.", ex.Message);

PhpSerializerNET/PhpTokenizer.cs

@@ -76,7 +76,7 @@ internal bool ValidateFormat(ref int position, bool inArray = false) {
 							}
 							position += match.Length;
 							ValidateFormat(ref position, true);
-
+							position++; // Account for the closing bracket.
 							break;
 						}
 					case 'O': {
@@ -86,6 +86,7 @@ internal bool ValidateFormat(ref int position, bool inArray = false) {
 							}
 							position += match.Length;
 							ValidateFormat(ref position, true);
+							position++; // Account for the closing bracket.
 
 							break;
 					}

docs/Deserializing.md

@@ -79,7 +79,7 @@ var foo = PhpSerialization.Deserialize(
 		// Whether or not properties are matched case sensitive.
 		public bool CaseSensitiveProperties = true,
 
-		// If true, keys present in the array but not on the target class will be ignored.
+		// If true, keys present in the array / object but not on the target class or struct will be ignored.
 		// Otherwise an exception will be thrown.
 		public bool AllowExcessKeys = false,
 
@@ -95,4 +95,5 @@ var foo = PhpSerialization.Deserialize(
 
 # Deserializing php objects
 
-TODO.
+TODO.
+