Change implicit numeric type to int.

I am not sure why I used long as the default previously. Int is the int-uitive choice here and explicit typing still exists for those who need it. And since there are already breaking changes for 2.0, this is a good time to remedy that weird decision. :)

Author: StringEpsilon

CHANGELOG.md

@@ -3,6 +3,10 @@
 ## Breaking
 - `PhpTokenizer` class is now internal.
 - Removed support for `net6.0` and `net7.0`.
+- The default implicit type for numeric values is now `int` instead of `long`
+  1.x: `PhpSerialization.Deserialize("i:42;") == 42L` 
+  2.x: `PhpSerialization.Deserialize("i:42;") == 42` 
+- Changed the signature of `[PhpPropery(long)]` to `[PhpPropery(long)]` to align with the above change.
 
 ## Features
 - Added `PhpSerialization.DeserializeUtf8(ReadOnlySpan<byte>)` overloads for cases in which consumers directly work with

PhpSerializerNET.Test/Deserialize/ArrayDeserialization.cs

@@ -58,7 +58,7 @@ public void ExplicitToDictionaryOfObject() {
 		Assert.Equal(5, result.Count);
 
 		Assert.Equal("this is a string value", result["AString"]);
-		Assert.Equal((long)10, result["AnInteger"]);
+		Assert.Equal(10, result["AnInteger"]);
 		Assert.Equal(1.2345, result["ADouble"]);
 		Assert.Equal(true, result["True"]);
 		Assert.Equal(false, result["False"]);
@@ -110,9 +110,9 @@ public void ExplicitToHashtable() {
 		Assert.Equal(5, result.Count);
 		// the cast to long on the keys is because of the hashtable and C# intrinsics.
 		// (int)0 and (long)0 aren't identical enough for the hashtable
-		Assert.Equal("this is a string value", result[(long)0]);
-		Assert.Equal((long)10, result[(long)1]);
-		Assert.Equal(1.2345, result[(long)2]);
+		Assert.Equal("this is a string value", result[(int)0]);
+		Assert.Equal(10, result[1]);
+		Assert.Equal(1.2345, result[2]);
 		Assert.Equal(true, result["True"]);
 		Assert.Equal(false, result["False"]);
 	}
@@ -197,7 +197,7 @@ public void ImplicitToDictionary() {
 		Assert.Equal(5, dictionary.Count);
 
 		Assert.Equal("this is a string value", dictionary["AString"]);
-		Assert.Equal((long)10, dictionary["AnInteger"]);
+		Assert.Equal(10, dictionary["AnInteger"]);
 		Assert.Equal(1.2345, dictionary["ADouble"]);
 		Assert.Equal(true, dictionary["True"]);
 		Assert.Equal(false, dictionary["False"]);

PhpSerializerNET.Test/Deserialize/IntegerDeserialization.cs

@@ -24,7 +24,7 @@ public void Deserialize(string input, int expected) {
 	[InlineData("i:1;", 1)]
 	[InlineData("i:2147483647;", int.MaxValue)]
 	[InlineData("i:-2147483648;", int.MinValue)]
-	public void DeserializeImplicit(string input, long expected) {
+	public void DeserializeImplicit(string input, int expected) {
 		Assert.Equal(expected, PhpSerialization.Deserialize(input));
 	}
 

PhpSerializerNET.Test/Deserialize/Options/UseLists.cs

@@ -21,8 +21,8 @@ public void Option_Never() {
 			var dictionary = test as Dictionary<object, object>;
 			Assert.NotNull(dictionary);
 			Assert.Equal(2, dictionary.Count);
-			Assert.Equal("a", dictionary[(long)0]);
-			Assert.Equal("b", dictionary[(long)1]);
+			Assert.Equal("a", dictionary[0]);
+			Assert.Equal("b", dictionary[1]);
 		}
 
 		[Fact]
@@ -55,8 +55,8 @@ public void Option_Default_NonConsequetive() {
 			var dictionary = result as Dictionary<object, object>;
 			Assert.NotNull(dictionary);
 			Assert.Equal(2, dictionary.Count);
-			Assert.Equal("a", dictionary[(long)2]);
-			Assert.Equal("b", dictionary[(long)4]);
+			Assert.Equal("a", dictionary[2]);
+			Assert.Equal("b", dictionary[4]);
 		}
 
 		[Fact]

PhpSerializerNET/Attributes/PhpProperty.cs

@@ -12,7 +12,7 @@ namespace PhpSerializerNET;
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
 public class PhpPropertyAttribute : Attribute {
 	public string Name { get; set; }
-	public long Key { get; set; }
+	public int Key { get; set; }
 	public bool IsInteger { get; private set; } = false;
 
 	/// <summary>
@@ -29,7 +29,7 @@ public PhpPropertyAttribute(string name) {
 	/// <remark>
 	/// Deserialization of objects and arrays with mixed keys may yield unexpected results and or exceptions on certain target types.
 	/// </remarks>
-	public PhpPropertyAttribute(long key) {
+	public PhpPropertyAttribute(int key) {
 		this.Key = key;
 		this.IsInteger = true;
 	}

PhpSerializerNET/Deserialization/PhpDeserializer.cs

@@ -43,7 +43,7 @@ private object DeserializeToken() {
 			case PhpDataType.Boolean:
 				return token.Value.GetBool(this._input);
 			case PhpDataType.Integer:
-				return token.Value.GetLong(this._input);
+				return token.Value.GetInt(this._input);
 			case PhpDataType.Floating:
 				return token.Value.GetDouble(this._input);
 			case PhpDataType.String:
@@ -318,7 +318,7 @@ private object MakeObject(Type targetType, in PhpToken token) {
 					? this.GetString(nameToken)
 					: this.GetString(nameToken).ToLower();
 			} else if (nameToken.Type == PhpDataType.Integer) {
-				propertyName = nameToken.Value.GetLong(_input);
+				propertyName = nameToken.Value.GetInt(_input);
 			} else {
 				throw new DeserializationException(
 					$"Error encountered deserizalizing an object of type '{targetType.FullName}': " +
@@ -447,7 +447,7 @@ private object MakeCollection(in PhpToken token) {
 				isList = false;
 				break;
 			} else {
-				var key = this._tokens[_currentToken + i].Value.GetLong(_input);
+				int key = this._tokens[_currentToken + i].Value.GetInt(_input);
 				if (i == 0 || key == previousKey + 1) {
 					previousKey = key;
 				} else {

PhpSerializerNET/Deserialization/ValueSpan.cs

@@ -35,7 +35,7 @@ internal double GetDouble(ReadOnlySpan<byte> input) {
 
 	internal bool GetBool(ReadOnlySpan<byte> input) => input[this.Start] == '1';
 
-	internal long GetLong(ReadOnlySpan<byte> input) {
+	internal int GetInt(ReadOnlySpan<byte> input) {
 		// All the PHP integers we deal with here can only be the number characters and an optional "-".
 		// See also the Validator code.
 		// 'long.Parse()' has to take into account that we can skip here, making this manual approach faster.
@@ -46,7 +46,7 @@ internal long GetLong(ReadOnlySpan<byte> input) {
 			i++;
 			isNegative = true;
 		}
-		long result = 0;
+		int result = 0;
 		for (; i < span.Length; i++) {
 			result = result * 10 + (span[i] - 48);
 		}