Rename Object::offsetLoad_*() functions, nested array access

getgrav · May 16, 2017 · 91a6224 · 91a6224
1 parent b480156
commit 91a6224
Showing 1 changed file with 26 additions and 9 deletions.
diff --git a/system/src/Grav/Framework/Object/Object.php b/system/src/Grav/Framework/Object/Object.php
@@ -8,8 +8,8 @@
 
 namespace Grav\Framework\Object;
 
-use RocketTheme\Toolbox\ArrayTraits\ArrayAccessWithGetters;
 use RocketTheme\Toolbox\ArrayTraits\Export;
+use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
 
 /**
  * Object class.
@@ -18,9 +18,10 @@
  */
 class Object implements ObjectInterface
 {
-    use ObjectTrait, ArrayAccessWithGetters, Export {
-        ArrayAccessWithGetters::offsetExists as private parentOffsetExists;
-        ArrayAccessWithGetters::offsetGet as private parentOffsetGet;
+    use ObjectTrait, NestedArrayAccessWithGetters, Export {
+        NestedArrayAccessWithGetters::offsetExists as private parentOffsetExists;
+        NestedArrayAccessWithGetters::offsetGet as private parentOffsetGet;
+        NestedArrayAccessWithGetters::offsetSet as private parentOffsetSet;
     }
 
     /**
@@ -50,31 +51,47 @@ public function __construct(array $elements = [], $key = null)
     }
 
     /**
-     * Checks whether or not an offset exists with a possibility to load the field by $this->loadOffset_{$offset}().
+     * Checks whether or not an offset exists with a possibility to load the field by $this->offsetLoad_{$offset}().
      *
      * @param mixed $offset  An offset to check for.
      * @return bool          Returns TRUE on success or FALSE on failure.
      */
     public function offsetExists($offset)
     {
-        return $this->parentOffsetExists($offset) || method_exists($this, "loadOffset_{$offset}");
+        return $this->parentOffsetExists($offset) || method_exists($this, "offsetLoad_{$offset}");
     }
 
     /**
-     * Returns the value at specified offset with a possibility to load the field by $this->loadOffset_{$offset}().
+     * Returns the value at specified offset with a possibility to load the field by $this->offsetLoad_{$offset}().
      *
      * @param mixed $offset  The offset to retrieve.
      * @return mixed         Can return all value types.
      */
     public function offsetGet($offset)
     {
-        if (!$this->parentOffsetExists($offset) && method_exists($this, "loadOffset_{$offset}")) {
-            $this->offsetSet($offset, call_user_func([$this, "loadOffset_{$offset}"]));
+        if (!$this->parentOffsetExists($offset) && method_exists($this, "offsetLoad_{$offset}")) {
+            $this->offsetSet($offset, call_user_func([$this, "offsetLoad_{$offset}"]));
         }
 
         return $this->parentOffsetGet($offset);
     }
 
+
+    /**
+     * Assigns a value to the specified offset with a possibility to check or alter the value by $this->offsetPrepare_{$offset}().
+     *
+     * @param mixed $offset  The offset to assign the value to.
+     * @param mixed $value   The value to set.
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (method_exists($this, "offsetPrepare_{$offset}")) {
+            $value = call_user_func([$this, "offsetPrepare_{$offset}"], $value);
+        }
+
+        $this->parentOffsetSet($offset, $value);
+    }
+
     /**
      * Implements JsonSerializable interface.
      *