Better handling of closing brackets in top array / object.

Fixes #12

Author: StringEpsilon

PhpSerializerNET.Test/DeserializeObjects.cs

@@ -126,5 +126,11 @@ public void DeserializeNestedObject() {
 				result.Bar.Foo
 			);
 		}
+
+		[TestMethod]
+		public void Test_Issue12(){
+			var result = PhpSerialization.Deserialize("a:1:{i:0;a:4:{s:1:\"A\";s:2:\"63\";s:1:\"B\";a:2:{i:558710;s:1:\"2\";i:558709;s:1:\"2\";}s:1:\"C\";s:2:\"71\";s:1:\"G\";a:3:{s:1:\"x\";s:6:\"446368\";s:1:\"y\";s:1:\"0\";s:1:\"z\";s:5:\"1.029\";}}}");
+			Assert.IsNotNull(result);
+		}
 	}
 }

PhpSerializerNET/PhpTokenizer.cs

@@ -26,6 +26,8 @@ public PhpTokenizer(string input, PhpDeserializationOptions options) {
 		}
 
 		internal bool ValidateFormat(ref int position, bool inArray = false) {
+			bool isTop = position == 0;
+			bool expectBracket = false;
 			for (; position < _input.Length; position++) {
 				switch (_input[position]) {
 					case 'N': {
@@ -75,8 +77,11 @@ internal bool ValidateFormat(ref int position, bool inArray = false) {
 								throw new DeserializationException($"Malformed array at position {position}");
 							}
 							position += match.Length;
+							if (isTop) {
+								expectBracket = true;
+							}
 							ValidateFormat(ref position, true);
-							position++; // Account for the closing bracket.
+							
 							break;
 						}
 					case 'O': {
@@ -85,17 +90,24 @@ internal bool ValidateFormat(ref int position, bool inArray = false) {
 								throw new DeserializationException($"Malformed object at position {position}");
 							}
 							position += match.Length;
+							if (isTop) {
+								expectBracket = true;
+							}
 							ValidateFormat(ref position, true);
-							position++; // Account for the closing bracket.
 
 							break;
 					}
 					case '}': {
-							if (inArray) {
-								return true;
+							if (expectBracket) {
+								expectBracket = false;
 							} else {
-								throw new DeserializationException($"Unexpected token '{_input[position]}' at position {position}.");
+								if (inArray) {
+									return true;
+								} else {
+									throw new DeserializationException($"Unexpected token '{_input[position]}' at position {position}.");
+								}
 							}
+							break;
 						}
 					default: {
 							throw new DeserializationException($"Unexpected token '{_input[position]}' at position {position}.");