Split the tokenizer into a validator and tokenizer.

The main benefit is reduced memory allocations, as we now count the tokens during the validation step and then work off of a flat array without nesting children.

I have also slightly loosened the coupling between tokenizer and deserializer.

Lastly there has been some housekeeping with naming and file locations.

Author: StringEpsilon

PhpSerializerNET.Test/Deserialize/ArrayDeserialization.cs

@@ -160,6 +160,7 @@ public void ExplicitToStructWrongField() {
 		public void ExplicitToList() {
 			var result = PhpSerialization.Deserialize<List<string>>("a:3:{i:0;s:5:\"Hello\";i:1;s:5:\"World\";i:2;i:12345;}");
 
+			Assert.AreEqual(3, result.Count);
 			CollectionAssert.AreEqual(new List<string>() { "Hello", "World", "12345" }, result);
 		}
 

PhpSerializerNET.Test/Deserialize/Options/EmptyStringToDefault.cs

@@ -164,7 +164,7 @@ public void Enabled_StringArrayToIntList() {
 
 		[TestMethod]
 		public void Enabled_StringArrayToNullableIntList() {
-			var result = PhpSerialization.Deserialize<List<int?>>("a:1:{i:0;s:0:\"\";}");
+			var result = PhpSerialization.Deserialize<List<int?>>("a:1:{i:1;s:0:\"\";}");
 			CollectionAssert.AreEqual(new List<int?> { default }, result);
 		}
 

PhpSerializerNET.Test/Deserialize/Options/UseLists.cs

@@ -52,6 +52,7 @@ public void Option_Default_NonConsequetive() {
 				}
 			);
 
+			Assert.AreEqual(typeof (Dictionary<object, object>), result.GetType());
 			var dictionary = result as Dictionary<object, object>;
 			Assert.IsNotNull(dictionary);
 			Assert.AreEqual(2, dictionary.Count);

PhpSerializerNET/PhpSerializationException.cs renamed to PhpSerializerNET/Deserialization/DeserializationException.cs

@@ -0,0 +1,42 @@
+/**
+  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/.
+**/
+
+namespace PhpSerializerNET;
+
+/// <summary>
+/// PHP data types that can be de/serialized.
+/// </summary>
+internal enum PhpDataType : byte {
+	/// <summary>
+	/// Null (N;)
+	/// </summary>
+	Null,
+	/// <summary>
+	/// Boolean value (b:n;)
+	/// </summary>
+	Boolean,
+	/// <summary>
+	/// Integer value (i:[value];)
+	/// </summary>
+	Integer,
+	/// <summary>
+	/// Floating point number (f:[value];)
+	/// </summary>
+	Floating,
+	/// <summary>
+	/// String (s:[length]:"[value]")
+	/// </summary>
+	String,
+	/// <summary>
+	/// Array (a:[length]:{[children]})
+	/// </summary>
+	Array,
+	/// <summary>
+	/// Object (O:[identLength]:"[ident]":[length]:{[children]})
+	/// </summary>
+	Object
+}
+