Deserializer: Ignore redundant property/field name information.

Author: StringEpsilon

PhpSerializerNET.Test/DataTypes/AStructWithRename.cs

@@ -11,4 +11,8 @@ public struct AStructWithRename {
 		[PhpProperty("foobar")]
 		public string bar;
 	}
+	public struct RedundantStructName {
+		[PhpProperty("foo")]
+		public string foo;
+	}
 }

PhpSerializerNET.Test/DataTypes/MappedClass.cs

@@ -20,4 +20,12 @@ public class MappedClass {
 
 		public Guid Guid { get; set; }
 	}
+
+	public class BadMappedClass {
+		[PhpProperty("A")]
+		public int A { get; set; }
+
+		[PhpProperty("B")]
+		public int B { get; set; }
+	}
 }

PhpSerializerNET.Test/Deserialize/ArrayDeserialization.cs

@@ -130,6 +130,15 @@ public void ExplicitToClass_MappingInfo() {
 		Assert.Null(deserializedObject.It);
 	}
 
+	[Fact]
+	public void RedundantMappingInfo() {
+		var deserializedObject = PhpSerialization.Deserialize<BadMappedClass>(
+			"""a:2:{s:1:"A";i:1;s:1:"B";i:2;}"""
+		);
+		Assert.Equal(1, deserializedObject.A);
+		Assert.Equal(2, deserializedObject.B);
+	}
+
 	[Fact]
 	public void ExplicitToStruct() {
 		var value = PhpSerialization.Deserialize<AStruct>(

PhpSerializerNET.Test/Deserialize/DeserializeStructs.cs

@@ -46,6 +46,13 @@ public void DeserializePropertyName() {
 		Assert.Equal("Foo", value.foo);
 		Assert.Equal("Bar", value.bar);
 	}
+	[Fact]
+	public void DeserializeDuplicateFieldName() {
+		var value = PhpSerialization.Deserialize<RedundantStructName>(
+			"a:1:{s:3:\"foo\";s:3:\"Foo\";}"
+		);
+		Assert.Equal("Foo", value.foo);
+	}
 
 	[Fact]
 	public void DeserializeBoolToStruct() {

PhpSerializerNET.Test/Deserialize/Validation/TestOtherErrors.cs

@@ -39,19 +39,27 @@ public void ErrorOnEmptyInput() {
 		);
 
 		const string expected = "PhpSerialization.Deserialize(): Parameter 'input' must not be null or empty. (Parameter 'input')";
+		const string expectedUtf8 = "PhpSerialization.DeserializeUtf8(): Parameter 'input' must not be empty. (Parameter 'input')";
 		Assert.Equal(expected, ex.Message);
 
 		ex = Assert.Throws<ArgumentOutOfRangeException>(
 			() => PhpSerialization.Deserialize<string>("")
 		);
-
 		Assert.Equal(expected, ex.Message);
 
 		ex = Assert.Throws<ArgumentOutOfRangeException>(
 			() => PhpSerialization.Deserialize("", typeof(string))
 		);
-
 		Assert.Equal(expected, ex.Message);
+
+		ex = Assert.Throws<ArgumentOutOfRangeException>(
+			() => PhpSerialization.DeserializeUtf8(""u8, typeof(string))
+		);
+		Assert.Equal(expectedUtf8, ex.Message);
+		ex = Assert.Throws<ArgumentOutOfRangeException>(
+			() => PhpSerialization.DeserializeUtf8(""u8)
+		);
+		Assert.Equal(expectedUtf8, ex.Message);
 	}
 
 

PhpSerializerNET/Deserialization/PhpDeserializer.cs

@@ -360,7 +360,7 @@ private object MakeObject(Type targetType, in PhpToken token) {
 						result, this.DeserializeToken(property.PropertyType)
 					);
 				} catch (Exception exception) {
-					var valueToken = this._tokens[this._currentToken - 1];
+					var valueToken = this._tokens[this._currentToken-1];
 					throw new DeserializationException(
 						$"Exception encountered while trying to assign '{this.GetString(valueToken)}' to {targetType.Name}.{property.Name}. See inner exception for details.",
 						exception
@@ -408,7 +408,7 @@ private object MakeList(Type targetType, in PhpToken token) {
 			}
 			index++;
 			if (valueToken.Type == PhpDataType.Array || valueToken.Type == PhpDataType.Object) {
-				itemPosition = valueToken.ValueEnd +1;
+				itemPosition = valueToken.LastValuePosition +1;
 			} else {
 				itemPosition += 2;
 			}
@@ -493,7 +493,7 @@ private object MakeCollection(in PhpToken token) {
 			}
 			index++;
 			if (this._tokens[itemPosition+1].Type == PhpDataType.Array || this._tokens[itemPosition+1].Type == PhpDataType.Object) {
-				itemPosition = this._tokens[itemPosition+1].ValueEnd +1;
+				itemPosition = this._tokens[itemPosition+1].LastValuePosition +1;
 			} else {
 				itemPosition += 2;
 			}

PhpSerializerNET/Extensions/ArrayExtensions.cs

@@ -26,19 +26,21 @@ internal static Dictionary<object, PropertyInfo> GetAllProperties(this PropertyI
 					phpPropertyAttribute = foundAttribute;
 				}
 			}
+			var propertyName = options.CaseSensitiveProperties
+					? property.Name
+					: property.Name.ToLower();
 			if (phpPropertyAttribute != null) {
 				if (phpPropertyAttribute.IsInteger) {
 					result.Add(phpPropertyAttribute.Key, isIgnored ? null : property);
 				} else {
 					var attributeName = options.CaseSensitiveProperties
 						? phpPropertyAttribute.Name
 						: phpPropertyAttribute.Name.ToLower();
-					result.Add(attributeName, isIgnored ? null : property);
+					if (attributeName != propertyName) {
+						result.Add(attributeName, isIgnored ? null : property);
+					}
 				}
 			}
-			var propertyName = options.CaseSensitiveProperties
-					? property.Name
-					: property.Name.ToLower();
 			result.Add(propertyName, isIgnored ? null : property);
 		}
 		return result;
@@ -59,16 +61,17 @@ internal static Dictionary<string, FieldInfo> GetAllFields(this FieldInfo[] fiel
 					phpPropertyAttribute = foundAttribute;
 				}
 			}
+			var fieldName = options.CaseSensitiveProperties
+					? field.Name
+					: field.Name.ToLower();
 			if (phpPropertyAttribute != null) {
 				var attributeName = options.CaseSensitiveProperties
 					? phpPropertyAttribute.Name
 					: phpPropertyAttribute.Name.ToLower();
-				result.Add(attributeName, isIgnored ? null : field);
+				if (attributeName != fieldName) {
+					result.Add(attributeName, isIgnored ? null : field);
+				}
 			}
-
-			var fieldName = options.CaseSensitiveProperties
-					? field.Name
-					: field.Name.ToLower();
 			result.Add(fieldName, isIgnored ? null : field);
 		}
 		return result;