Merge pull request #567 from tomterl/patch-2

Author: ptondereau

src/types/array/array_key.rs

@@ -18,7 +18,11 @@ pub enum ArrayKey<'a> {
 impl From<String> for ArrayKey<'_> {
     fn from(value: String) -> Self {
         if let Ok(index) = i64::from_str(value.as_str()) {
-            Self::Long(index)
+            if value == "0" || !value.starts_with('0') {
+                Self::Long(index)
+            } else {
+                Self::String(value)
+            }
         } else {
             Self::String(value)
         }
@@ -77,7 +81,11 @@ impl Display for ArrayKey<'_> {
 impl<'a> From<&'a str> for ArrayKey<'a> {
     fn from(value: &'a str) -> ArrayKey<'a> {
         if let Ok(index) = i64::from_str(value) {
-            Self::Long(index)
+            if value == "0" || !value.starts_with('0') {
+                ArrayKey::Long(index)
+            } else {
+                ArrayKey::Str(value)
+            }
         } else {
             ArrayKey::Str(value)
         }
@@ -160,4 +168,30 @@ mod tests {
         assert!(result.is_err());
         assert!(matches!(result.unwrap_err(), Error::InvalidProperty));
     }
+
+    #[test]
+    fn test_from_str_with_leading_zeros() {
+        let key: ArrayKey = "00".into();
+        assert_eq!(key, ArrayKey::Str("00"));
+        let key: ArrayKey = "071".into();
+        assert_eq!(key, ArrayKey::Str("071"));
+        let key: ArrayKey = "0".into();
+        assert_eq!(key, ArrayKey::Long(0));
+    }
+
+    #[test]
+    fn test_from_string_with_leading_zeros() {
+        let key = ArrayKey::String("042".to_string());
+        let result: crate::error::Result<String, _> = key.try_into();
+        assert!(result.is_ok());
+        assert_eq!(result.unwrap(), "042");
+        let key = ArrayKey::String("00".to_string());
+        let result: crate::error::Result<String, _> = key.try_into();
+        assert!(result.is_ok());
+        assert_eq!(result.unwrap(), "00");
+        let key = ArrayKey::String("0".to_string());
+        let result: crate::error::Result<i64, _> = key.try_into();
+        assert!(result.is_ok());
+        assert_eq!(result.unwrap(), 0);
+    }
 }

tests/src/integration/array/array.php

@@ -64,3 +64,18 @@
     1 => 'bar',
     2 => 'baz',
 ]);
+
+$leading_zeros = test_array_assoc_array_keys([
+  '0' => 'zero',
+  '00' => 'zerozero',
+  '007' => 'bond',
+]);
+
+assert(array_key_exists(0, $leading_zeros), '"0" should become integer key 0');
+assert($leading_zeros[0] === 'zero', 'Value at key 0 should be "zero"');
+
+assert(array_key_exists('007', $leading_zeros), '"007" should stay as string key');
+assert($leading_zeros['007'] === 'bond', 'Value at key "007" should be "bond"');
+
+assert(array_key_exists('00', $leading_zeros), '"00" should stay as string key');
+assert($leading_zeros['00'] === 'zerozero', 'Value at key "00" should be "zerozero"');