Added tests

Moved to more specific ArgumentOutOfRangeException

Author: sommmen

CHANGELOG.md

@@ -3,6 +3,7 @@
 **Deserialization:**
 - Added `string Serialize(object? input, PhpSerializiationOptions? options = null)` to `PhpSerialization` so the target type can be specified at run time.
 - `PhpSerialization` (entry point of the library) is now null reference aware, aiding library consumers in caching `NullReferenceException`.
+- `PhpSerialization` throws `ArgumentOutOfRangeException` instead of the more generalised `ArgumentException`
 - Bugfix: "INF" and "-INF" would not be handled correctly when using explicit typing (`Deserialize<T>`) for some target types.
 - Bugfix: Properly set classname when deserializing with explicit types that implement IPhpObject.
 - Performance tweaks:

PhpSerializerNET.Test/Deserialize/Validation/TestOtherErrors.cs

@@ -33,17 +33,24 @@ public void ErrorOnTuple() {
 
 		[TestMethod]
 		public void ErrorOnEmptyInput() {
-			var ex = Assert.ThrowsException<ArgumentException>(
+			var ex = Assert.ThrowsException<ArgumentOutOfRangeException>(
 				() => PhpSerialization.Deserialize("")
 			);
 
-			Assert.AreEqual("PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty.", ex.Message);
+			const string expected = "PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty. (Parameter 'input')";
+			Assert.AreEqual(expected, ex.Message);
 
-			ex = Assert.ThrowsException<ArgumentException>(
+			ex = Assert.ThrowsException<ArgumentOutOfRangeException>(
 				() => PhpSerialization.Deserialize<string>("")
 			);
 
-			Assert.AreEqual("PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty.", ex.Message);
+			Assert.AreEqual(expected, ex.Message);
+
+			ex = Assert.ThrowsException<ArgumentOutOfRangeException>(
+				() => PhpSerialization.Deserialize("", typeof(string))
+			);
+
+			Assert.AreEqual(expected, ex.Message);
 		}
 	}
 }

PhpSerializerNET.Test/DeserializeObjects.cs

@@ -57,5 +57,30 @@ 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);
 		}
+
+		[TestMethod]
+		public void DeserializeWithRuntimeType() {
+			var expectedType = typeof(CircularTest);
+			var result = PhpSerialization.Deserialize("a:2:{s:3:\"Foo\";s:5:\"First\";s:3:\"Bar\";a:2:{s:3:\"Foo\";s:6:\"Second\";s:3:\"Bar\";N;}}", expectedType);
+
+			Assert.IsNotNull(result);
+			Assert.AreEqual(expectedType, result.GetType());
+
+			if (result is CircularTest circularTest) {
+				Assert.AreEqual(
+					"First",
+					circularTest.Foo
+				);
+				Assert.IsNotNull(
+					circularTest.Bar
+				);
+				Assert.AreEqual(
+					"Second",
+					circularTest.Bar.Foo
+				);
+			} else {
+				throw new InvalidOperationException();
+			}
+		}
 	}
 }

PhpSerializerNET/PhpSerialization.cs

@@ -34,7 +34,7 @@ public static class PhpSerialization {
 		/// </returns>
 		public static object? Deserialize(string input, PhpDeserializationOptions? options = null) {
 			if (string.IsNullOrEmpty(input)) {
-				throw new ArgumentException("PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty.");
+				throw new ArgumentOutOfRangeException(nameof(input), "PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty.");
 			}
 			return new PhpDeserializer(input, options).Deserialize();
 		}
@@ -60,7 +60,7 @@ public static T Deserialize<T>(
 			PhpDeserializationOptions? options = null
 		) {
 			if (string.IsNullOrEmpty(input)) {
-				throw new ArgumentException("PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty.");
+				throw new ArgumentOutOfRangeException(nameof(input), "PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty.");
 			}
 			return new PhpDeserializer(input, options).Deserialize<T>();
 		}
@@ -86,8 +86,11 @@ public static T Deserialize<T>(
 			Type type,
 			PhpDeserializationOptions? options = null
 		) {
+			if (type == null) {
+				throw new ArgumentNullException(nameof(type));
+			}
 			if (string.IsNullOrEmpty(input)) {
-				throw new ArgumentException("PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty.");
+				throw new ArgumentOutOfRangeException(nameof(input), "PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty.");
 			}
 			return new PhpDeserializer(input, options).Deserialize(type);
 		}