make scrutinizer happy

3 files changed, 9 insertions, 27 deletions

diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index cc0c065..6ec2b23 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -287,16 +287,4 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
     {
         return $this->newInstance('\League\Csv\Reader', $open_mode);
     }
-
-    /**
-    * Validate a variable to be stringable
-    *
-    * @param object|string $str
-    *
-    * @return bool
-    */
-    public static function isValidString($str)
-    {
-        return is_scalar($str) || (is_object($str) && method_exists($str, '__toString'));
-    }
 }
diff --git a/src/Exporter/Validator.php b/src/Exporter/Validator.php
index 7975cbf..d9a3169 100644
--- a/src/Exporter/Validator.php
+++ b/src/Exporter/Validator.php
@@ -46,9 +46,9 @@ trait Validator
      * add a Validator to the collection
      *
      * @param callable $callable
-     * @param string rule name
+     * @param string   $name      the rule name
      *
-     * @return static
+     * @return $this
      */
     public function addValidator(callable $callable, $name)
     {
@@ -60,9 +60,9 @@ trait Validator
     /**
      * Remove a validator from the collection
      *
-     * @param callable $callable
+     * @param string $name the validator name
      *
-     * @return static
+     * @return $this
      */
     public function removeValidator($name)
     {
@@ -76,7 +76,7 @@ trait Validator
     /**
      * Detect if a validator is already registered
      *
-     * @param callable $callable
+     * @param string $name the validator name
      *
      * @return bool
      */
@@ -88,7 +88,7 @@ trait Validator
     /**
      * Remove all registered validatior
      *
-     * @return static
+     * @return $this
      */
     public function clearValidators()
     {
@@ -102,16 +102,12 @@ trait Validator
     *
     * @param array $row
     *
-    * @return array
+    * @return bool
     */
     protected function validateRow(array $row)
     {
         $this->lastValidator = null;
         $this->lastRowData   = null;
-        if (! $this->validationRules) {
-            return true;
-        }
-
         foreach ($this->validationRules as $name => $validator) {
             if (! $validator($row)) {
                 $this->lastValidator = $name;
diff --git a/src/Reader.php b/src/Reader.php
index ab943fc..ddb88f7 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -247,11 +247,9 @@ class Reader extends AbstractCsv
      */
     protected function isValidAssocKeys(array $keys)
     {
-        $validKeys = array_unique(array_filter($keys, function ($value) {
-            return self::isValidString($value);
+        return count($keys) && $keys === array_unique(array_filter($keys, function ($value) {
+            return is_scalar($value) || (is_object($value) && method_exists($value, '__toString'));
         }));
-
-        return count($keys) && $keys === $validKeys;
     }
 
     /**