Merge pull request #542 from FriendsOfCake/phpstan

Bump up phpstan level.

.travis.yml

@@ -43,11 +43,10 @@ script:
   - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml; fi
 
   - 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 -c phpstan.neon -l 1 src; fi
+  - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -c phpstan.neon -l 3 src; fi
 
 after_success:
   - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
 notifications:
   email: false
-

phpstan.neon

@@ -1,3 +1,12 @@
 parameters:
     excludes_analyse:
         - */src/TestSuite/*
+    universalObjectCratesClasses:
+        - Crud\Event\Subject
+    ignoreErrors:
+        - '#Access to an undefined property Exception::\$response#'
+        - '#Access to an undefined property Cake\\Controller\\Controller::\$dispatchComponents#'
+        - '#Access to an undefined property Cake\\Controller\\Controller::\$Crud#'
+        - '#Call to an undefined method Crud\\Action\\BaseAction::view\(\)#'
+        - '#Call to an undefined method Crud\\Action\\BaseAction::viewVar\(\)#'
+        - '#Call to an undefined method Crud\\Action\\BaseAction::findMethod\(\)#'

src/Action/Bulk/DeleteAction.php

@@ -45,6 +45,6 @@ protected function _bulk(Query $query = null)
         $statement = $query->execute();
         $statement->closeCursor();
 
-        return $statement->rowCount();
+        return (bool)$statement->rowCount();
     }
 }

src/Action/Bulk/SetValueAction.php

@@ -65,6 +65,6 @@ protected function _bulk(Query $query = null)
         $statement = $query->execute();
         $statement->closeCursor();
 
-        return $statement->rowCount();
+        return (bool)$statement->rowCount();
     }
 }

src/Action/Bulk/ToggleAction.php

@@ -65,6 +65,6 @@ protected function _bulk(Query $query = null)
         $statement = $query->execute();
         $statement->closeCursor();
 
-        return $statement->rowCount();
+        return (bool)$statement->rowCount();
     }
 }

src/Controller/Component/CrudComponent.php

@@ -180,7 +180,7 @@ public function initialize(array $config)
     {
         parent::initialize($config);
 
-        $this->_action = $this->_controller->request->action;
+        $this->_action = $this->_controller->request->param('action');
         $this->_request = $this->_controller->request;
 
         if (!isset($this->_controller->dispatchComponents)) {
@@ -600,7 +600,7 @@ public function table()
      * Returns new entity
      *
      * @param array $data Data
-     * @return \Cake\ORM\Entity
+     * @return \Cake\Datasource\EntityInterface
      */
     public function entity(array $data = [])
     {

src/Event/Subject.php

@@ -8,8 +8,6 @@
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
- *
- * @property string $action
  */
 class Subject
 {

src/Listener/ApiPaginationListener.php

@@ -19,12 +19,12 @@ class ApiPaginationListener extends BaseListener
      *
      * We attach at priority 10 so normal bound events can run before us
      *
-     * @return array|void
+     * @return array|null
      */
     public function implementedEvents()
     {
         if (!$this->_checkRequestType('api')) {
-            return;
+            return null;
         }
 
         return [

tests/TestCase/Controller/Component/CrudComponentTest.php

@@ -395,7 +395,7 @@ public function testIsActionMappedYes()
         $result = $this->Crud->isActionMapped('index');
         $this->assertTrue($result);
 
-        $this->controller->request->action = 'edit';
+        $this->controller->request->param('action', 'edit');
         $this->Crud->initialize([]);
         $result = $this->Crud->isActionMapped();
         $this->assertTrue($result);