pass by reference, closes #858

This commit is contained in:
El RIDO 2025-03-11 07:59:10 +01:00
parent e67972417e
commit 629f263cf5
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
12 changed files with 37 additions and 35 deletions

View file

@ -100,9 +100,9 @@ abstract class AbstractModel
* @param array $data
* @throws Exception
*/
public function setData(array $data)
public function setData(array &$data)
{
$data = $this->_sanitize($data);
$this->_sanitize($data);
$this->_validate($data);
$this->_data = $data;
@ -163,9 +163,8 @@ abstract class AbstractModel
*
* @access protected
* @param array $data
* @return array
*/
abstract protected function _sanitize(array $data);
abstract protected function _sanitize(array &$data);
/**
* Validate data.
@ -174,7 +173,7 @@ abstract class AbstractModel
* @param array $data
* @throws Exception
*/
protected function _validate(array $data)
protected function _validate(array &$data)
{
}
}

View file

@ -104,7 +104,7 @@ class Comment extends AbstractModel
* @param Paste $paste
* @throws Exception
*/
public function setPaste(Paste $paste)
public function setPaste(Paste &$paste)
{
$this->_paste = $paste;
$this->_data['pasteid'] = $paste->getId();
@ -155,9 +155,8 @@ class Comment extends AbstractModel
*
* @access protected
* @param array $data
* @return array
*/
protected function _sanitize(array $data)
protected function _sanitize(array &$data)
{
// we generate an icon based on a SHA512 HMAC of the users IP, if configured
$icon = $this->_conf->getKey('icon');
@ -190,6 +189,5 @@ class Comment extends AbstractModel
$data['meta']['icon'] = $pngdata;
}
}
return $data;
}
}

View file

@ -219,11 +219,10 @@ class Paste extends AbstractModel
*
* @access protected
* @param array $data
* @return array
*/
protected function _sanitize(array $data)
protected function _sanitize(array &$data)
{
$expiration = $data['meta']['expire'];
$expiration = $data['meta']['expire'] ?? 0;
unset($data['meta']['expire']);
$expire_options = $this->_conf->getSection('expire_options');
if (array_key_exists($expiration, $expire_options)) {
@ -235,7 +234,6 @@ class Paste extends AbstractModel
if ($expire > 0) {
$data['meta']['expire_date'] = time() + $expire;
}
return $data;
}
/**
@ -245,7 +243,7 @@ class Paste extends AbstractModel
* @param array $data
* @throws Exception
*/
protected function _validate(array $data)
protected function _validate(array &$data)
{
// reject invalid or disabled formatters
if (!array_key_exists($data['adata'][1], $this->_conf->getSection('formatter_options'))) {