Merge pull request #723 from cakephp/align-travis

Align travis config with cakephp

Author: markstory

.travis.yml

@@ -3,7 +3,7 @@ language: php
 php:
   - 7.2
   - 7.3
-  - 7.4snapshot
+  - 7.4
 
 dist: xenial
 
@@ -23,27 +23,24 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 7.2
-      env: STATIC_ANALYSIS=1 DEFAULT=0
+    - php: 7.3
+      env: CHECKS=1 DEFAULT=0
 
   allow_failures:
-    - php: 7.4snapshot
+    - php: 7.4
 
 install:
   - composer install --prefer-dist --no-interaction
 
 before_script:
-  - if [ $DB = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE cakephp_test;'; fi
-  - if [ $DB = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi
-  - if [[ $STATIC_ANALYSIS == 1 ]]; then composer require --dev psalm/phar:^3.6; fi
+  - if [[ $DB == 'mysql' ]]; then mysql -u root -e 'CREATE DATABASE cakephp_test;'; fi
+  - if [[ $DB == 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi
+  - if [[ $CHECKS == 1 ]]; then composer require --dev psalm/phar:^3.6; fi
 
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.1 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.1 ]]; then vendor/bin/phpunit; fi
-  - if [[ $STATIC_ANALYSIS == 1 ]]; then vendor/bin/psalm.phar --show-info=false; fi
-
-after_success:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.1 ]]; then bash <(curl -s https://codecov.io/bash); fi
+  - if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit; fi
+  - if [[ $CHECKS == 1 ]]; then vendor/bin/psalm.phar --show-info=false; fi
+  - if [[ $CHECKS == 1 ]]; then vendor/bin/phpcs --colors --parallel=16 -p src/ tests/; fi
 
 notifications:
   email: false

composer.json

@@ -31,7 +31,7 @@
         "jdorn/sql-formatter": "^1.2"
     },
     "require-dev": {
-        "cakephp/cakephp-codesniffer": "dev-next",
+        "cakephp/cakephp-codesniffer": "^4.0",
         "phpunit/phpunit": "^8.0"
     },
     "autoload": {

src/Controller/DashboardController.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)

src/View/Helper/ToolbarHelper.php

@@ -128,9 +128,7 @@ public function makeNeatArray(
                 $value = 'function';
             }
 
-            $isObject = is_object($value);
-            if ($isObject && $ancestors->contains($value)) {
-                $isObject = false;
+            if (is_object($value) && $ancestors->contains($value)) {
                 $value = ' - recursion';
             }
 
@@ -139,7 +137,7 @@ public function makeNeatArray(
                 $value instanceof ArrayAccess ||
                 $value instanceof Iterator ||
                 is_array($value) ||
-                $isObject
+                is_object($value)
                 ) && !empty($value)
             ) {
                 $out .= $this->makeNeatArray($value, $openDepth, $nextDepth, $doubleEncode, $ancestors);

tests/TestCase/Controller/DashboardControllerTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)