Misc object fixes (new features only)

getgrav · Jan 9, 2018 · ae245c0 · ae245c0
1 parent 154fa4e
commit ae245c0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/system/src/Grav/Framework/Object/Property/ArrayPropertyTrait.php b/system/src/Grav/Framework/Object/Property/ArrayPropertyTrait.php
@@ -51,7 +51,7 @@ protected function doHasProperty($property)
      */
     protected function &doGetProperty($property, $default = null, $doCreate = false)
     {
-        if (!$this->doHasProperty($property)) {
+        if (!array_key_exists($property, $this->_elements)) {
             if ($doCreate) {
                 $this->_elements[$property] = null;
             } else {
@@ -64,7 +64,7 @@ protected function &doGetProperty($property, $default = null, $doCreate = false)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $value         New value.
+     * @param mixed  $value         New value.
      */
     protected function doSetProperty($property, $value)
     {
@@ -86,7 +86,7 @@ protected function doUnsetProperty($property)
      */
     protected function getElement($property, $default = null)
     {
-        return $this->doHasProperty($property) ? $this->_elements[$property] : $default;
+        return array_key_exists($property, $this->_elements) ? $this->_elements[$property] : $default;
     }
 
     /**

diff --git a/system/src/Grav/Framework/Object/Property/LazyPropertyTrait.php b/system/src/Grav/Framework/Object/Property/LazyPropertyTrait.php
@@ -67,7 +67,7 @@ protected function &doGetProperty($property, $default = null, $doCreate = false)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $value         New value.
+     * @param mixed  $value         New value.
      * @return $this
      */
     protected function doSetProperty($property, $value)
@@ -104,7 +104,7 @@ protected function getElement($property, $default = null)
             return $this->getObjectElement($property, $default);
         }
 
-        return $this->getArrayElement($property, $default, false);
+        return $this->getArrayElement($property, $default);
     }
 
     /**

diff --git a/system/src/Grav/Framework/Object/Property/MixedPropertyTrait.php b/system/src/Grav/Framework/Object/Property/MixedPropertyTrait.php
@@ -66,7 +66,7 @@ protected function &doGetProperty($property, $default = null, $doCreate = false)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $value         New value.
+     * @param mixed  $value         New value.
      * @return $this
      */
     protected function doSetProperty($property, $value)

diff --git a/system/src/Grav/Framework/Object/Property/ObjectPropertyTrait.php b/system/src/Grav/Framework/Object/Property/ObjectPropertyTrait.php
@@ -123,7 +123,7 @@ protected function &doGetProperty($property, $default = null, $doCreate = false)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $value         New value.
+     * @param mixed  $value         New value.
      * @throws \InvalidArgumentException
      */
     protected function doSetProperty($property, $value)