Merge pull request #84 from UseMuffin/static-analysis

Fix errors reported by phpstan.

Author: ADmad

.travis.yml

@@ -25,7 +25,7 @@ matrix:
     - php: 7.0
       env: PHPCS=1 DEFAULT=0
 
-    - php: 7.0
+    - php: 7.1
       env: PHPSTAN=1 DEFAULT=0
 
     - php: 5.6
@@ -34,7 +34,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:^0.9; fi
+  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.11; fi
   - if [[ $PHPSTAN != 1 ]]; then composer install --no-interaction; fi
 
 script:
@@ -43,7 +43,7 @@ script:
 
   - if [[ $PHPCS = 1 ]]; then ./vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
-  - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -l 2 src; fi
+  - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse src; fi
 
 after_success:
 - if [[ $CODECOVERAGE = 1 ]]; then bash <(curl -s https://codecov.io/bash); fi

phpstan.neon

@@ -0,0 +1,12 @@
+parameters:
+    level: 4
+    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#'

src/AbstractDriver.php

@@ -165,7 +165,7 @@ public function logger()
     /**
      * Returns a logger instance
      *
-     * @return \Psr\Log\LoggerInterface
+     * @return \Psr\Log\LoggerInterface|null
      */
     public function getLogger()
     {

src/Model/Endpoint.php

@@ -50,7 +50,7 @@ class Endpoint implements RepositoryInterface, EventListenerInterface, EventDisp
     /**
      * Connection instance this endpoint uses
      *
-     * @var \Muffin\Webservice\Connection $connection Connection instance
+     * @var \Muffin\Webservice\Connection|null $connection Connection instance
      */
     protected $_connection;
 
@@ -222,7 +222,7 @@ public function initialize(array $config)
     public function endpoint($endpoint = null)
     {
         if ($endpoint !== null) {
-            return $this->setName($endpoint);
+            $this->setName($endpoint);
         }
 
         return $this->getName();
@@ -362,7 +362,7 @@ public function setConnection($connection)
     /**
      * Returns the connection driver.
      *
-     * @return \Muffin\Webservice\Connection
+     * @return \Muffin\Webservice\Connection|null
      */
     public function getConnection()
     {
@@ -592,7 +592,7 @@ public function getDisplayField()
     public function resourceClass($name = null)
     {
         if ($name !== null) {
-            return $this->setResourceClass($name);
+            $this->setResourceClass($name);
         }
 
         return $this->getResourceClass();
@@ -654,7 +654,7 @@ public function getResourceClass()
     public function inflectionMethod($method = null)
     {
         if ($method !== null) {
-            return $this->setInflectionMethod($method);
+            $this->setInflectionMethod($method);
         }
 
         return $this->getInflectionMethod();
@@ -1057,7 +1057,7 @@ public function exists($conditions)
      */
     public function save(EntityInterface $resource, $options = [])
     {
-        $options = new ArrayObject($options + [
+        $options = new ArrayObject((array)$options + [
                 'checkRules' => true,
                 'checkExisting' => false,
             ]);

src/Query.php

@@ -81,7 +81,7 @@ class Query implements IteratorAggregate, JsonSerializable, QueryInterface
     /**
      * The results from the webservice
      *
-     * @var ResultSet
+     * @var ResultSet|null
      */
     protected $__resultSet;
 
@@ -234,7 +234,7 @@ public function firstOrFail()
         }
         throw new RecordNotFoundException(sprintf(
             'Record not found in endpoint "%s"',
-            $this->getRepository()->endpoint()
+            $this->getRepository()->getName()
         ));
     }
 

src/ResultSet.php

@@ -46,7 +46,7 @@ class ResultSet implements ResultSetInterface
      */
     public function __construct(array $resources, $total = null)
     {
-        $this->_results = \SplFixedArray::fromArray($resources, false);
+        $this->_results = array_values($resources);
         $this->_total = $total;
     }
 

src/Webservice/Webservice.php

@@ -23,7 +23,7 @@ abstract class Webservice implements WebserviceInterface
     /**
      * The driver to use to communicate with the webservice
      *
-     * @var \Muffin\Webservice\AbstractDriver
+     * @var \Muffin\Webservice\AbstractDriver|null
      */
     protected $_driver;
 
@@ -99,7 +99,7 @@ public function setDriver(AbstractDriver $driver)
     /**
      * Get this webservices driver
      *
-     * @return \Muffin\Webservice\AbstractDriver
+     * @return \Muffin\Webservice\AbstractDriver|null
      */
     public function getDriver()
     {
@@ -195,8 +195,8 @@ public function execute(Query $query, array $options = [])
         }
 
         // Write to the logger when one has been defined
-        if ($this->getDriver()->logger()) {
-            $this->_logQuery($query, $this->getDriver()->logger());
+        if ($this->getDriver()->getLogger()) {
+            $this->_logQuery($query, $this->getDriver()->getLogger());
         }
 
         return $result;