Fix errors reported by phpstan.

Author: ADmad

.travis.yml

@@ -27,7 +27,7 @@ matrix:
 before_script:
   - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi
 
-  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan; fi
+  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.9; fi
   - if [[ $PHPSTAN != 1 ]]; then composer install --no-interaction; fi
 
 script:

src/Marshaller.php

@@ -106,22 +106,23 @@ public function one(array $data, array $options = [])
      */
     protected function _validate($data, $options, $isNew)
     {
-        if (!$options['validate']) {
-            return [];
-        }
+        $validator = null;
+
         if ($options['validate'] === true) {
-            $options['validate'] = $this->_endpoint->getValidator('default');
+            $validator = $this->_endpoint->getValidator('default');
+        } elseif (is_string($options['validate'])) {
+            $validator = $this->_endpoint->getValidator($options['validate']);
+        } elseif (is_object($options['validate'])) {
+            $validator = $options['validate'];
         }
-        if (is_string($options['validate'])) {
-            $options['validate'] = $this->_endpoint->getValidator($options['validate']);
-        }
-        if (!is_object($options['validate'])) {
+
+        if ($validator === null) {
             throw new RuntimeException(
                 sprintf('validate must be a boolean, a string or an object. Got %s.', gettype($options['validate']))
             );
         }
 
-        return $options['validate']->errors($data, $isNew);
+        return $validator->errors($data, $isNew);
     }
 
     /**

src/Model/Endpoint.php

@@ -14,15 +14,13 @@
 use Cake\Event\EventDispatcherTrait;
 use Cake\Event\EventListenerInterface;
 use Cake\Event\EventManager;
-use Cake\Network\Exception\NotImplementedException;
 use Cake\Utility\Inflector;
 use Cake\Validation\ValidatorAwareTrait;
 use Muffin\Webservice\Exception\MissingResourceClassException;
 use Muffin\Webservice\Exception\UnexpectedDriverException;
 use Muffin\Webservice\Marshaller;
 use Muffin\Webservice\Query;
 use Muffin\Webservice\Schema;
-use Muffin\Webservice\StreamQuery;
 
 /**
  * The table equivalent of a webservice endpoint