Fix errors reported by phpstan

Author: ADmad

phpstan.neon

@@ -1,12 +1,59 @@
 parameters:
-    level: 4
+    level: 6
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
-        - '#Method Muffin\\Webservice\\Query::endpoint\(\) should return \$this\(Muffin\\Webservice\\Query\)|Muffin\\Webservice\\Model\\Endpoint but returns Cake\Datasource\RepositoryInterface#'
-        - '#Call to an undefined method Cake\\Datasource\\RepositoryInterface::callFinder\(\)#'
-        - '#Call to an undefined method Cake\\Datasource\\RepositoryInterface::dispatchEvent\(\)#'
-        - '#Method Muffin\\Webservice\\Query::offset\(\) should return \$this\(Cake\\Datasource\\QueryInterface\) but returns \$this\(Muffin\\Webservice\\Query\)#'
-        - '#Return type \(array\) of method Muffin\\Webservice\\Query::aliasField\(\) should be compatible with return type \(string\) of method Cake\\Datasource\\QueryInterface::aliasField\(\)#'
-        - '#Call to an undefined method Cake\\Datasource\\RepositoryInterface::getName\(\)#'
-        - '#Call to an undefined method Traversable::count\(\)#'
-        - '#Strict comparison using === between string and null will always evaluate to false#'
-        - '#Negated boolean expression is always false#'
+        -
+            message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
+            count: 1
+            path: src/Marshaller.php
+
+        -
+            message: "#^Negated boolean expression is always false\\.$#"
+            count: 3
+            path: src/Model/Endpoint.php
+
+        -
+            message: "#^Result of \\|\\| is always true\\.$#"
+            count: 1
+            path: src/Model/Endpoint.php
+
+        -
+            message: "#^Unreachable statement \\- code above always terminates\\.$#"
+            count: 1
+            path: src/Model/Endpoint.php
+
+        -
+            message: "#^Call to an undefined method Traversable\\:\\:count\\(\\)\\.$#"
+            count: 1
+            path: src/Model/Endpoint.php
+
+        -
+            message: "#^Parameter \\#1 \\$connection of method Muffin\\\\Webservice\\\\Model\\\\Endpoint\\:\\:setConnection\\(\\) expects Muffin\\\\Webservice\\\\Connection, Muffin\\\\Webservice\\\\AbstractDriver given\\.$#"
+            count: 1
+            path: src/Model/Endpoint.php
+
+        -
+            message: "#^Method Muffin\\\\Webservice\\\\Query\\:\\:endpoint\\(\\) should return \\$this\\(Muffin\\\\Webservice\\\\Query\\)\\|Muffin\\\\Webservice\\\\Model\\\\Endpoint but returns Cake\\\\Datasource\\\\RepositoryInterface\\.$#"
+            count: 1
+            path: src/Query.php
+
+        -
+            message: "#^Call to an undefined method Cake\\\\Datasource\\\\RepositoryInterface\\:\\:callFinder\\(\\)\\.$#"
+            count: 1
+            path: src/Query.php
+
+        -
+            message: "#^Call to an undefined method Cake\\\\Datasource\\\\RepositoryInterface\\:\\:getName\\(\\)\\.$#"
+            count: 1
+            path: src/Query.php
+
+        -
+            message: "#^Return type \\(array\\) of method Muffin\\\\Webservice\\\\Query\\:\\:aliasField\\(\\) should be compatible with return type \\(string\\) of method Cake\\\\Datasource\\\\QueryInterface\\:\\:aliasField\\(\\)$#"
+            count: 1
+            path: src/Query.php
+
+        -
+            message: "#^Call to an undefined method Cake\\\\Datasource\\\\RepositoryInterface\\:\\:dispatchEvent\\(\\)\\.$#"
+            count: 1
+            path: src/Query.php

src/AbstractDriver.php

@@ -16,8 +16,18 @@ abstract class AbstractDriver implements LoggerAwareInterface
     use InstanceConfigTrait;
     use LoggerAwareTrait;
 
+    /**
+     * Client
+     *
+     * @var object
+     */
     protected $_client;
 
+    /**
+     * Default config
+     *
+     * @var array
+     */
     protected $_defaultConfig = [];
 
     /**
@@ -195,7 +205,7 @@ public function logQueries($enable = null)
             return $this->_logQueries;
         }
 
-        $this->_logQueries = $enable;
+        return $this->_logQueries = $enable;
     }
 
     /**

src/Model/Endpoint.php

@@ -49,7 +49,7 @@ class Endpoint implements RepositoryInterface, EventListenerInterface, EventDisp
     /**
      * Connection instance this endpoint uses
      *
-     * @var \Muffin\Webservice\Connection|null $connection Connection instance
+     * @var \Muffin\Webservice\Connection
      */
     protected $_connection;
 
@@ -635,9 +635,9 @@ public function getResourceClass()
             $name = implode('\\', array_slice($parts, 0, -1)) . '\Resource\\' . $alias;
             if (!class_exists($name)) {
                 return $this->_resourceClass = $default;
-            } else {
-                return $this->_resourceClass = $name;
             }
+
+            return $this->_resourceClass = $name;
         }
 
         return $this->_resourceClass;
@@ -695,13 +695,7 @@ public function webservice($webservice = null)
             return $this->setWebservice($this->getName(), $webservice);
         }
 
-        if ($webservice === null) {
-            return $this->getWebservice();
-        }
-
-        $this->_webservice = $webservice;
-
-        return $this;
+        return $this->getWebservice();
     }
 
     /**

src/Webservice/Webservice.php

@@ -345,7 +345,7 @@ protected function _logQuery(Query $query, LoggerInterface $logger)
             return;
         }
 
-        $logger->debug($query->endpoint(), [
+        $logger->debug($query->endpoint()->getName(), [
             'params' => $query->where(),
         ]);
     }