fix

Author: efureev

src/Traits/ArrayStorage.php

@@ -15,7 +15,12 @@ trait ArrayStorage
     /** @var array */
     private $data = [];
 
-    private function propertyExists($name): bool
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    private function propertyExists(string $name): bool
     {
         return $name !== 'data' && property_exists($this, $name);
     }
@@ -31,16 +36,13 @@ public function __get(string $name)
             return $this->$name;
         }
 
-        if (array_key_exists($name, $this->data)) {
-            $val = Arr::get($this->data, $name);
-            return $this->data[$name];
+        if (Arr::has($this->data, $name)) {
+            return Arr::get($this->data, $name);
         }
 
         $trace = debug_backtrace();
         trigger_error(
-            'Undefined property in __get(): ' . $name .
-            ' in file ' . $trace[0]['file'] .
-            ' in line ' . $trace[0]['line'],
+            "Undefined property in __get(): $name in file {$trace[0]['file']} in line {$trace[0]['line']}",
             E_USER_NOTICE);
         return null;
     }
@@ -55,7 +57,7 @@ public function __set(string $name, $value): void
             $this->$name = $value;
         }
 
-        $this->data[$name] = $value;
+        Arr::set($this->data, $name, $value);
     }
 
     /**

tests/traits/ArrayStorageTest.php

@@ -40,22 +40,26 @@ public function testDeepData(): void
         static::assertEquals('test', $config->{'upper.sad.as'});
     }
 
-    public function testUnset(): void
+    public function testGetData(): void
     {
         $config = new ArrayStorageClassTest;
-        $key = 'test.sub.key';
-
-        static::assertFalse(isset($config->$key));
-
-        $config->$key = 1;
-        static::assertTrue(isset($config->$key));
-
-        static::assertEquals(1, $config->$key);
-
-        unset($config->$key);
-
-        static::assertFalse(isset($config->$key));
 
+        $config->{'test.sub.key'} = 1;
+        $config->{'test.sub.val'} = 'value';
+
+        $config->{'test.next'} = 'next value';
+        $expected = [
+            'test' => [
+                'sub' => [
+                    'key' => 1,
+                    'val' => 'value',
+                ],
+                'next' => 'next value',
+            ],
+        ];
+
+        static::assertEquals($expected['test'], $config->test);
+        static::assertEquals($expected, $config->getData());
     }
 
     public function testUnset2(): void