Deduplicated some initialization code.

Author: StringEpsilon

PhpSerializerNET/PhpDeserializer.cs

@@ -16,9 +16,19 @@ internal class PhpDeserializer {
 		private PhpDeserializationOptions _options;
 		private List<PhpSerializeToken> _tokens;
 
-		public PhpDeserializer(PhpDeserializationOptions options, List<PhpSerializeToken> tokens) {
+		public PhpDeserializer(string input, PhpDeserializationOptions options) {
 			this._options = options;
-			this._tokens = tokens;
+			if (this._options == null) {
+				this._options = PhpDeserializationOptions.DefaultOptions;
+			}
+			this._tokens = new PhpTokenizer(input, _options).Tokenize();
+
+			if (_tokens.Count > 1) {
+				throw new DeserializationException("Can not deserialize loose collection of values into object");
+			}
+			if (_tokens.Count == 0) {
+				throw new DeserializationException("No PHP serialization data found.");
+			}
 		}
 
 		public object Deserialize() {

PhpSerializerNET/PhpSerializer.cs

@@ -33,16 +33,7 @@ public static class PhpSerializer {
 		/// <see cref="Dictionary{object,object}"/>
 		/// </returns>
 		public static object Deserialize(string input, PhpDeserializationOptions options = null) {
-			if (options == null) {
-				options = PhpDeserializationOptions.DefaultOptions;
-			}
-			var tokens = new PhpTokenizer(input, options).Tokenize();
-			if (tokens.Count > 1) // TODO: maybe have an option to return a List<> in this case.
-			{
-				throw new DeserializationException("Can not deserialize loose collection of values into object");
-			}
-
-			return new PhpDeserializer(options, tokens).Deserialize();
+			return new PhpDeserializer(input, options).Deserialize();
 		}
 
 		/// <summary>
@@ -62,17 +53,7 @@ public static T Deserialize<T>(
 			string input,
 			PhpDeserializationOptions options = null
 		) {
-			if (options == null) {
-				options = PhpDeserializationOptions.DefaultOptions;
-			}
-			var tokens = new PhpTokenizer(input, options).Tokenize();
-
-			if (tokens.Count > 1) // TODO: maybe have an option to return a List<> in this case.
-			{
-				throw new DeserializationException("Can not deserialize loose collection of values into object");
-			}
-
-			return new PhpDeserializer(options, tokens).Deserialize<T>();
+			return new PhpDeserializer(input, options).Deserialize<T>();
 		}
 
 		/// <summary>