- renamed internal storage array (storage -> data)

- using constructor properties promotion

Author: kodeart

AccessorTrait.php

@@ -18,16 +18,16 @@
 use function get_class;
 
 /**
- * @property array $storage
+ * @property array $data
  */
 trait AccessorTrait
 {
     public function &__get($index)
     {
-        if (false === array_key_exists($index, $this->storage)) {
-            $this->storage[$index] = null;
+        if (false === array_key_exists($index, $this->data)) {
+            $this->data[$index] = null;
         }
-        return $this->storage[$index];
+        return $this->data[$index];
     }
 
     public function __set($index, $value)
@@ -47,12 +47,12 @@ public function __isset($index)
 
     public function get(string $index, mixed $default = null): mixed
     {
-        return $this->storage[$index] ?? $default;
+        return $this->data[$index] ?? $default;
     }
 
     public function has(string $index): bool
     {
-        return array_key_exists($index, $this->storage);
+        return array_key_exists($index, $this->data);
     }
 
     public function equals(string $propertyA, string $propertyB): bool
@@ -62,33 +62,33 @@ public function equals(string $propertyA, string $propertyB): bool
 
     public function count(): int
     {
-        return count($this->storage);
+        return count($this->data);
     }
 
     public function toArray(): array
     {
-        return $this->storage;
+        return $this->data;
     }
 
     public function toJSON(int $options = 0): string
     {
-        return json_serialize($this->storage, $options);
+        return json_serialize($this->data, $options);
     }
 
     public function toXML(string $root): string
     {
-        return xml_serialize($root, $this->storage);
+        return xml_serialize($root, $this->data);
     }
 
     public function getIterator(): Traversable
     {
-        foreach ($this->storage as $k => $v) {
+        foreach ($this->data as $k => $v) {
             yield $k => $v;
         }
     }
 
     public function jsonSerialize(): mixed
     {
-        return $this->storage;
+        return $this->data;
     }
 }

Arguments.php

@@ -33,27 +33,22 @@ class Arguments implements Argument,
         MutatorTrait::__set insteadof AccessorTrait;
     }
 
-    protected array $storage = [];
+    public function __construct(protected array $data = []) {}
 
-    public function __construct(array $values = [])
-    {
-        $this->storage = $values;
-    }
-
-    public function __clone()
-    {
-    }
+    public function __clone() {}
 
     public function namespace(
         string $prefix,
         bool $lowercase = true,
         bool $trim = true): static
     {
-        return new static($this->filter($this->toArray(), $prefix, $lowercase, $trim));
+        return new static(
+            $this->filter($this->toArray(), $prefix, $lowercase, $trim)
+        );
     }
 
     public function toImmutable(): Immutable
     {
-        return new Immutable($this->storage);
+        return new Immutable($this->data);
     }
 }

ArrayDataFilterTrait.php

@@ -38,26 +38,26 @@ public function filter(
 
     public function find(string $index, mixed $default = null): mixed
     {
-        if (isset($this->storage[$index])) {
-            return $this->storage[$index];
+        if (isset($this->data[$index])) {
+            return $this->data[$index];
         }
-        $storage = $this->storage;
+        $data = $this->data;
         foreach (explode('.', $index) as $token) {
-            if (false === is_array($storage) ||
-                false === array_key_exists($token, $storage)
+            if (false === is_array($data) ||
+                false === array_key_exists($token, $data)
             ) {
                 return $default;
             }
-            $storage = &$storage[$token];
+            $data =& $data[$token];
         }
-        return $storage;
+        return $data;
     }
 
     public function extract(array $indexes): array
     {
         $found = [];
         foreach ($indexes as $index) {
-            $found[$index] = $this->storage[$index] ?? null;
+            $found[$index] = $this->data[$index] ?? null;
         }
         return $found;
     }

ExtendedArguments.php

@@ -27,6 +27,8 @@
  * - boolean is a wrong type for the key; do not use a boolean key (it's juggled into a string)
  *
  * Use string values for the keys and you'll be golden.
+ *
+ * @property array $data
  */
 class ExtendedArguments extends Arguments
 {
@@ -37,16 +39,16 @@ public function get(string $index, mixed $default = null): mixed
 
     public function set(mixed $index, mixed $value): static
     {
-        $storage = &$this->storage;
+        $data =& $this->data;
         foreach (explode('.', $index) as $i) {
-            if (false === is_array($storage[$i]) ||
-                false === array_key_exists($i, $storage)
+            if (false === is_array($data[$i]) ||
+                false === array_key_exists($i, $data)
             ) {
-                $storage[$i] = [];
+                $data[$i] = [];
             }
-            $storage = &$storage[$i];
+            $data =& $data[$i];
         }
-        $storage = $value;
+        $data = $value;
         return $this;
     }
 
@@ -60,31 +62,31 @@ public function append(string $index, mixed $value): static
 
     public function has(string $index): bool
     {
-        $storage = & $this->storage;
+        $data =& $this->data;
         foreach (explode('.', $index) as $i) {
-            if (false === is_array($storage) ||
-                false === array_key_exists($i, $storage)
+            if (false === is_array($data) ||
+                false === array_key_exists($i, $data)
             ) {
                 return false;
             }
-            $storage = &$storage[$i];
+            $data =& $data[$i];
         }
         return true;
     }
 
     public function delete(string $index): static
     {
-        $storage = &$this->storage;
+        $data =& $this->data;
         foreach (explode('.', $index) as $i) {
-            if (false === is_array($storage[$i]) ||
-                false === array_key_exists($i, $storage)
+            if (false === is_array($data[$i]) ||
+                false === array_key_exists($i, $data)
             ) {
                 continue;
             }
-            $storage = &$storage[$i];
+            $data =& $data[$i];
         }
         if (isset($i)) {
-            unset($storage[$i]);
+            unset($data[$i]);
         }
         return $this;
     }
@@ -103,7 +105,7 @@ public function flatten(): static
         $indexes = [];
         $flatten = [];
         $iterator = new RecursiveIteratorIterator(
-            new RecursiveArrayIterator($this->storage),
+            new RecursiveArrayIterator($this->data),
             RecursiveIteratorIterator::SELF_FIRST
         );
         foreach ($iterator as $index => $value) {

Immutable.php

@@ -29,15 +29,10 @@ class Immutable implements Data,
 
     use AccessorTrait, ArrayDataFilterTrait;
 
-    protected array $storage = [];
-
-    public function __construct(array $values)
-    {
-        $this->storage = $values;
-    }
+    public function __construct(protected array $data) {}
 
     public function toArguments(): Arguments
     {
-        return new Arguments($this->storage);
+        return new Arguments($this->data);
     }
 }

MutatorTrait.php

@@ -12,7 +12,7 @@
 namespace Koded\Stdlib;
 
 /**
- * @property array $storage
+ * @property array $data
  */
 trait MutatorTrait
 {
@@ -23,13 +23,13 @@ public function __set($index, $value)
 
     public function set(string $index, mixed $value): static
     {
-        $this->storage[$index] = $value;
+        $this->data[$index] = $value;
         return $this;
     }
 
     public function bind(string $index, mixed &$variable): static
     {
-        $this->storage[$index] = &$variable;
+        $this->data[$index] =& $variable;
         return $this;
     }
 
@@ -41,27 +41,27 @@ public function upsert(string $index, mixed $value): static
     public function pull(string $index, mixed $default = null): mixed
     {
         $value = $this->get($index, $default);
-        unset($this->storage[$index]);
+        unset($this->data[$index]);
         return $value;
     }
 
     public function import(array $array): static
     {
         foreach ($array as $index => $value) {
-            $this->storage[$index] = $value;
+            $this->data[$index] = $value;
         }
         return $this;
     }
 
     public function delete(string $index): static
     {
-        unset($this->storage[$index]);
+        unset($this->data[$index]);
         return $this;
     }
 
     public function clear(): static
     {
-        $this->storage = [];
+        $this->data = [];
         return $this;
     }
 }