Deserialization: Very minor improvements for deserializing PhpDynamicObject and PhpObjectDictionary

Author: StringEpsilon

PhpSerializerNET/Deserialization/PhpDeserializer.cs

@@ -247,34 +247,33 @@ int tokenPosition
 
 	private object MakeClass(in PhpToken token) {
 		var typeName = this.GetString(token);
-		object constructedObject;
 		Type targetType = null;
 		if (typeName != "stdClass" && this._options.EnableTypeLookup) {
 			targetType = TypeLookup.FindTypeInAssymbly(typeName, this._options.TypeCache.HasFlag(TypeCacheFlag.ClassNames));
 		}
-		if (targetType != null && typeName != "stdClass") {
-			_currentToken--; // go back one because we're basically re-entering the object-token from the top.
-			// If we don't decrement the pointer, we'd start with the first child token instead of the object token.
-			constructedObject = this.DeserializeToken(targetType);
-		} else {
-			dynamic result;
+		if (targetType == null || typeName == "stdClass") {
 			if (_options.StdClass == StdClassOption.Dynamic) {
-				result = new PhpDynamicObject();
+				var result = new PhpDynamicObject(token.Length, typeName);
+				result.SetClassName(typeName);
+				for (int i = 0; i < token.Length; i++) {
+					result.TryAdd((string)this.DeserializeToken(), this.DeserializeToken());
+				}
+				return result;
 			} else if (this._options.StdClass == StdClassOption.Dictionary) {
-				result = new PhpObjectDictionary();
+				var result = new PhpObjectDictionary(token.Length, typeName);
+				result.SetClassName(typeName);
+				for (int i = 0; i < token.Length; i++) {
+					result.TryAdd((string)this.DeserializeToken(), this.DeserializeToken());
+				}
+				return result;
 			} else {
 				throw new DeserializationException("Encountered 'stdClass' and the behavior 'Throw' was specified in deserialization options.");
 			}
-			for (int i = 0; i < token.Length; i++) {
-				var key = this.DeserializeToken();
-				var value = this.DeserializeToken();
-				result.TryAdd(
-					(string)key,
-					value
-				);
-			}
-			constructedObject = result;
 		}
+		// go back one because we're basically re-entering the object-token from the top.
+		// If we don't decrement the pointer, we'd start with the first child token instead of the object token.
+		_currentToken--;
+		var constructedObject = this.DeserializeToken(targetType);
 		if (constructedObject is IPhpObject phpObject and not PhpDateTime) {
 			phpObject.SetClassName(typeName);
 		}

PhpSerializerNET/Types/PhpDynamicObject.cs

@@ -10,26 +10,30 @@ This Source Code Form is subject to the terms of the Mozilla Public
 namespace PhpSerializerNET;
 
 public class PhpDynamicObject : DynamicObject, IPhpObject {
-	private readonly PhpObjectDictionary _dictionary = new();
+	private readonly PhpObjectDictionary _dictionary;
 
-	public PhpDynamicObject() { }
+	public PhpDynamicObject() {
+		_dictionary = new();
+	}
+
+	public PhpDynamicObject(int capacity, string className) {
+		_dictionary = new(capacity, className);
+	}
 
 	public void SetClassName(string className) => this._dictionary.SetClassName(className);
+
 	public string GetClassName() => this._dictionary.GetClassName();
 
 	internal void TryAdd(string key, object value) => this._dictionary.TryAdd(key, value);
 
-	internal object GetMember(string name) {
-		return this._dictionary[name];
-	}
+	internal object GetMember(string name) => this._dictionary[name];
 
-	public override ICollection<string> GetDynamicMemberNames() {
-		return this._dictionary.Keys;
-	}
+	public override ICollection<string> GetDynamicMemberNames() => this._dictionary.Keys;
 
 	public override bool TryGetMember(GetMemberBinder binder, out object result) {
 		return this._dictionary.TryGetValue(binder.Name, out result);
 	}
+
 	public override bool TrySetMember(SetMemberBinder binder, object value) {
 		this._dictionary[binder.Name] = value;
 		return true;

PhpSerializerNET/Types/PhpObjectDictionary.cs

@@ -13,11 +13,14 @@ namespace PhpSerializerNET;
 /// </summary>
 public class PhpObjectDictionary : Dictionary<string, object>, IPhpObject {
 	private string _className;
+	public PhpObjectDictionary() { }
 
-	public string GetClassName() {
-		return this._className;
+	public PhpObjectDictionary(int capacity, string className) : base(capacity) {
+		this._className = className;
 	}
 
+	public string GetClassName() => this._className;
+
 	public void SetClassName(string className) {
 		this._className = className;
 	}