Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions src/Foundation/AbstractSanitizableDao.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ abstract class AbstractSanitizableDao extends AbstractDao
/**
* @var callable[][]
*/
protected $_sanetizers = [
protected $_sanitizers = [
'filters' => [],
'validators' => [],
'serializers' => [],
Expand Down Expand Up @@ -126,9 +126,9 @@ public function setDaoProperty($key, $value)
*/
public function filterDaoProperty($key, $value)
{
if(isset($this->_sanetizers['filters'][$key]))
if(isset($this->_sanitizers['filters'][$key]))
{
foreach($this->_sanetizers['filters'][$key] as $filter)
foreach($this->_sanitizers['filters'][$key] as $filter)
{
$value = $filter($value);
}
Expand All @@ -153,9 +153,9 @@ public function validateDaoProperty(
)
{
$errors = [];
if(isset($this->_sanetizers['validators'][$key]))
if(isset($this->_sanitizers['validators'][$key]))
{
foreach($this->_sanetizers['validators'][$key] as $validator)
foreach($this->_sanitizers['validators'][$key] as $validator)
{
try
{
Expand Down Expand Up @@ -242,9 +242,9 @@ public function isValid(array $properties = null, $throw = false)
*/
public function getPropertySerialized($property, $value)
{
if(isset($this->_sanetizers['serializers'][$property]))
if(isset($this->_sanitizers['serializers'][$property]))
{
foreach($this->_sanetizers['serializers'][$property] as $type)
foreach($this->_sanitizers['serializers'][$property] as $type)
{
switch($type)
{
Expand Down Expand Up @@ -285,9 +285,9 @@ public function getPropertySerialized($property, $value)
*/
public function getPropertyUnserialized($property, $value)
{
if(isset($this->_sanetizers['serializers'][$property]))
if(isset($this->_sanitizers['serializers'][$property]))
{
$reversed = $this->_sanetizers['serializers'][$property];
$reversed = $this->_sanitizers['serializers'][$property];
foreach(array_reverse($reversed) as $type)
{
$asArray = false;
Expand Down Expand Up @@ -334,13 +334,13 @@ public function getPropertyUnserialized($property, $value)
*/
public function hydrateDao(array $data, $serialized = false)
{
if(empty($this->_sanetizers['serializers']))
if(empty($this->_sanitizers['serializers']))
{
/** @noinspection PhpIncompatibleReturnTypeInspection */
return parent::hydrateDao($data);
}

$serializedProperties = $serialized ? Arrays::fuse(array_keys($this->_sanetizers['serializers'])) : [];
$serializedProperties = $serialized ? Arrays::fuse(array_keys($this->_sanitizers['serializers'])) : [];
foreach($this->getDaoProperties() as $property)
{
if(!isset($serializedProperties[$property]) && array_key_exists($property, $data))
Expand Down Expand Up @@ -395,7 +395,7 @@ protected function _addSerializer(
$alias = $serializer;
}

$this->_sanetizers['serializers'][$property][$alias] = $serializer;
$this->_sanitizers['serializers'][$property][$alias] = $serializer;
return $this;
}

Expand All @@ -414,7 +414,7 @@ protected function _addCustomSerializer(
$property, $alias, callable $serializer, callable $unserializer
)
{
$this->_sanetizers['serializers'][$property][$alias] = [
$this->_sanitizers['serializers'][$property][$alias] = [
'serializer' => $serializer,
'unserializer' => $unserializer,
];
Expand All @@ -431,7 +431,7 @@ protected function _addCustomSerializer(
*/
protected function _removeSerializer($property, $alias)
{
unset($this->_sanetizers['serializers'][$property][$alias]);
unset($this->_sanitizers['serializers'][$property][$alias]);
return $this;
}

Expand All @@ -444,7 +444,7 @@ protected function _removeSerializer($property, $alias)
*/
protected function _clearSerializers($property)
{
$this->_sanetizers['serializers'][$property] = [];
$this->_sanitizers['serializers'][$property] = [];
return $this;
}

Expand All @@ -459,7 +459,7 @@ protected function _clearSerializers($property)
*/
protected function _addFilter($property, $alias, callable $filter)
{
$this->_sanetizers['filters'][$property][$alias] = $filter;
$this->_sanitizers['filters'][$property][$alias] = $filter;
return $this;
}

Expand All @@ -473,7 +473,7 @@ protected function _addFilter($property, $alias, callable $filter)
*/
protected function _removeFilter($property, $alias)
{
unset($this->_sanetizers['filters'][$property][$alias]);
unset($this->_sanitizers['filters'][$property][$alias]);
return $this;
}

Expand All @@ -486,7 +486,7 @@ protected function _removeFilter($property, $alias)
*/
protected function _clearFilters($property)
{
$this->_sanetizers['filters'][$property] = [];
$this->_sanitizers['filters'][$property] = [];
return $this;
}

Expand All @@ -501,7 +501,7 @@ protected function _clearFilters($property)
*/
protected function _addValidator($property, $alias, callable $filter)
{
$this->_sanetizers['validators'][$property][$alias] = $filter;
$this->_sanitizers['validators'][$property][$alias] = $filter;
return $this;
}

Expand All @@ -515,7 +515,7 @@ protected function _addValidator($property, $alias, callable $filter)
*/
protected function _removeValidator($property, $alias)
{
unset($this->_sanetizers['validators'][$property][$alias]);
unset($this->_sanitizers['validators'][$property][$alias]);
return $this;
}

Expand All @@ -528,7 +528,7 @@ protected function _removeValidator($property, $alias)
*/
protected function _clearValidators($property)
{
$this->_sanetizers['validators'][$property] = [];
$this->_sanitizers['validators'][$property] = [];
return $this;
}

Expand All @@ -541,7 +541,7 @@ protected function _clearValidators($property)
*/
public function getDaoPropertyData($serialized = true)
{
if(!$serialized || empty($this->_sanetizers['serializers']))
if(!$serialized || empty($this->_sanitizers['serializers']))
{
return parent::getDaoPropertyData();
}
Expand Down Expand Up @@ -591,6 +591,6 @@ public function getLoadedDaoId()

public function __sleep()
{
return array_diff(parent::__sleep(), ['_sanetizers']);
return array_diff(parent::__sleep(), ['_sanitizers']);
}
}
4 changes: 2 additions & 2 deletions tests/Foundation/Mocks/MockSanitizableDao.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function __call($method, $args)

protected function _configure()
{
$this->_sanetizers['validators']['lower'] = [
$this->_sanitizers['validators']['lower'] = [
function ($value) {
if(strtolower($value) === $value)
{
Expand All @@ -54,7 +54,7 @@ function ($value) {
},
];

$this->_sanetizers['validators']['upper'] = [
$this->_sanitizers['validators']['upper'] = [
function ($value) {
if(Strings::startsWith($value, 'UPPER'))
{
Expand Down