summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorignace nyamagana butera <nyamsprod@gmail.com>2015-10-27 13:03:04 +0100
committerignace nyamagana butera <nyamsprod@gmail.com>2015-10-27 13:03:04 +0100
commitf67966f1eec1982dd97d25b18fb80b7d12892e7e (patch)
treea7a964dc7981c2ef65894dae04c60f5a00911665
parentdd293b63b25e839bc71675dc68140a2695df1bb7 (diff)
downloadcsv-f67966f1eec1982dd97d25b18fb80b7d12892e7e.zip
csv-f67966f1eec1982dd97d25b18fb80b7d12892e7e.tar.gz
csv-f67966f1eec1982dd97d25b18fb80b7d12892e7e.tar.bz2
Simplify code
-rw-r--r--src/Modifier/QueryFilter.php8
-rw-r--r--src/Modifier/RowFilter.php8
2 files changed, 3 insertions, 13 deletions
diff --git a/src/Modifier/QueryFilter.php b/src/Modifier/QueryFilter.php
index ce34be1..77b2f33 100644
--- a/src/Modifier/QueryFilter.php
+++ b/src/Modifier/QueryFilter.php
@@ -151,9 +151,7 @@ trait QueryFilter
public function removeSortBy(callable $callable)
{
$res = array_search($callable, $this->iterator_sort_by, true);
- if (false !== $res) {
- unset($this->iterator_sort_by[$res]);
- }
+ unset($this->iterator_sort_by[$res]);
return $this;
}
@@ -206,9 +204,7 @@ trait QueryFilter
public function removeFilter(callable $callable)
{
$res = array_search($callable, $this->iterator_filters, true);
- if (false !== $res) {
- unset($this->iterator_filters[$res]);
- }
+ unset($this->iterator_filters[$res]);
return $this;
}
diff --git a/src/Modifier/RowFilter.php b/src/Modifier/RowFilter.php
index 532ccd7..a1a6d76 100644
--- a/src/Modifier/RowFilter.php
+++ b/src/Modifier/RowFilter.php
@@ -61,9 +61,7 @@ trait RowFilter
public function removeFormatter(callable $callable)
{
$res = array_search($callable, $this->formatters, true);
- if (false !== $res) {
- unset($this->formatters[$res]);
- }
+ unset($this->formatters[$res]);
return $this;
}
@@ -102,7 +100,6 @@ trait RowFilter
*/
public function addValidator(callable $callable, $name)
{
- $name = trim($name);
$this->validators[$name] = $callable;
return $this;
@@ -117,7 +114,6 @@ trait RowFilter
*/
public function removeValidator($name)
{
- $name = trim($name);
if (array_key_exists($name, $this->validators)) {
unset($this->validators[$name]);
}
@@ -134,8 +130,6 @@ trait RowFilter
*/
public function hasValidator($name)
{
- $name = trim($name);
-
return array_key_exists($name, $this->validators);
}