Test AllowExcessKeys and tweak error messages.

Author: StringEpsilon

CHANGELOG.md

@@ -3,6 +3,7 @@
 - Support for structs.
 - Fixed performance drop due to over-checking the input string.
 - Refactored deserializer to work in less steps and with cleaner code.
+- Slight tweaks of some error messages.
 
 # 0.3.0
 

PhpSerializerNET.Test/DeserializeObjects.cs

@@ -53,6 +53,24 @@ public void DeserializeObjectCaseInsenstiveProps() {
 			Assert.AreEqual("Hallo Welt!", deserializedObject.German);
 		}
 
+		[TestMethod]
+		public void DeserializeObjectWithExcessKeys() {
+			var deserializedObject = PhpSerializer.Deserialize<MappedClass>(
+				"a:3:{s:2:\"en\";s:12:\"Hello World!\";s:2:\"de\";s:11:\"Hallo Welt!\";s:2:\"es\";s:11:\"Hola Mundo!\";}",
+				new PhpDeserializationOptions() { AllowExcessKeys = true }
+			);
+			Assert.IsNotNull(deserializedObject);
+		}
+
+		[TestMethod]
+		public void ThrowsOnExcessKeys() {
+			var ex = Assert.ThrowsException<DeserializationException>(() => PhpSerializer.Deserialize<MappedClass>(
+				"a:3:{s:2:\"en\";s:12:\"Hello World!\";s:2:\"de\";s:11:\"Hallo Welt!\";s:2:\"es\";s:11:\"Hola Mundo!\";}",
+				new PhpDeserializationOptions() { AllowExcessKeys = false }
+			));
+			Assert.AreEqual("Could not bind the key \"es\" to object of type MappedClass: No such property.", ex.Message);
+		}
+
 
 		[TestMethod]
 		public void DeserializeList() {

PhpSerializerNET.Test/TestStructs.cs

@@ -56,6 +56,32 @@ public void DeserializeArrayToStruct() {
 			);
 		}
 
+		[TestMethod]
+		public void DeserializeStructWithExcessKeys() {
+			var value = PhpSerializer.Deserialize<MyStruct>(
+				"a:3:{s:3:\"foo\";s:3:\"Foo\";s:3:\"bar\";s:3:\"Bar\";s:6:\"foobar\";s:6:\"FooBar\";}",
+				new PhpDeserializationOptions() { AllowExcessKeys = true }
+			);
+
+			Assert.AreEqual(
+				"Foo",
+				value.foo
+			);
+			Assert.AreEqual(
+				"Bar",
+				value.bar
+			);
+		}
+
+		[TestMethod]
+		public void ThrowsOnStructWithExcessKeys() {
+			var ex = Assert.ThrowsException<DeserializationException>(() => PhpSerializer.Deserialize<MyStruct>(
+				"a:3:{s:3:\"foo\";s:3:\"Foo\";s:3:\"bar\";s:3:\"Bar\";s:6:\"foobar\";s:6:\"FooBar\";}",
+				new PhpDeserializationOptions() { AllowExcessKeys = false }
+			));
+			Assert.AreEqual("Could not bind the key \"foobar\" to struct of type MyStruct: No such field.", ex.Message);
+		}
+
 		[TestMethod]
 		public void DeserializeStructCaseInsensitive() {
 			var value = PhpSerializer.Deserialize<MyStruct>(

PhpSerializerNET/PhpDeserializer.cs

@@ -111,7 +111,7 @@ private object MakeStruct(Type targetType, PhpSerializeToken token) {
 				if (field == null) {
 					if (!_options.AllowExcessKeys) {
 						throw new DeserializationException(
-							$"Error: Could not bind the key {fieldName} to struct of type {targetType.Name}: No such property."
+							$"Could not bind the key \"{fieldName}\" to struct of type {targetType.Name}: No such field."
 						);
 					}
 					break;
@@ -138,7 +138,7 @@ private object MakeObject(Type targetType, PhpSerializeToken token) {
 				if (property == null) {
 					if (!_options.AllowExcessKeys) {
 						throw new DeserializationException(
-							$"Error: Could not bind the key {propertyName} to object of type {targetType.Name}: No such property."
+							$"Could not bind the key \"{propertyName}\" to object of type {targetType.Name}: No such property."
 						);
 					}
 					break;

README.md

@@ -23,11 +23,7 @@ string serializedData = PhpSerializer.Serialize(myObject);
 ## TODOs
 
 * [ ] Documentation.
-* [ ] Write better exceptions.
-	- Partially done.
 * [ ] General polish.
-* [ ] Cover all features and most error handlinng with unit tests.
-	- AllowExcessKeys needs testing (both ways) (and on structs too.)
 * [ ] Reorganize unit tests.
 
 ## Non-TODO: