Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-27 23:10:13 +01:00
Code Issues Packages Projects Releases Activity

Fix extra storageKey, timestamps fields stored into the Flex objects

Browse Source
This commit is contained in:
Matias Griese
2018-09-24 15:23:23 +03:00
parent 346b8683ac
commit ff1d5bc965
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/src/Grav/Framework/Flex/FlexObject.php
View File

@@ -48,9 +48,9 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
/** @var FlexForm[] */
private $_forms = [];
/** @var string */
private $storageKey;
private $_storageKey;
/** @var int */
private $timestamp = 0;
private $_timestamp = 0;
/**
* @return array
@@ -212,7 +212,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
*/
public function getStorageKey()
{
return $this->storageKey;
return $this->_storageKey;
}
/**
@@ -221,7 +221,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
*/
public function setStorageKey($key = null)
{
$this->storageKey = $key;
$this->_storageKey = $key;
return $this;
}
@@ -231,7 +231,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
*/
public function getTimestamp() : int
{
return $this->timestamp;
return $this->_timestamp;
}
/**
@@ -240,7 +240,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
*/
public function setTimestamp($timestamp = null)
{
$this->timestamp = $timestamp ?? time();
$this->_timestamp = $timestamp ?? time();
return $this;
}
@@ -485,8 +485,8 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
throw new \InvalidArgumentException("Cannot unserialize '{$type}': Not found");
}
$this->_flexDirectory = $directory;
$this->storageKey = $serialized['storage_key'];
$this->timestamp = $serialized['storage_timestamp'];
$this->_storageKey = $serialized['storage_key'];
$this->_timestamp = $serialized['storage_timestamp'];
$this->setKey($serialized['key']);
$this->setElements($serialized['elements']);
@@ -571,10 +571,10 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
protected function filterElements(array &$elements)
{
if (!empty($elements['storage_key'])) {
$this->storageKey = trim($elements['storage_key']);
$this->_storageKey = trim($elements['storage_key']);
}
if (!empty($elements['storage_timestamp'])) {
$this->timestamp = (int)$elements['storage_timestamp'];
$this->_timestamp = (int)$elements['storage_timestamp'];
}
unset ($elements['storage_key'], $elements['storage_timestamp']);