Merge branch 'master' into cake-4.x

Author: ADmad

.travis.yml

@@ -2,24 +2,25 @@ language: php
 
 php:
   - 7.2
-  - 7.3
   - 7.4
 
-dist: xenial
+services:
+  - postgresql
+  - mysql
 
 env:
   global:
     - DEFAULT=1
-
-services:
-  - mysql
-  - postgresql
+  matrix:
+    - DB=mysql DB_DSN='mysql://[email protected]/cakephp_test?init[]=SET sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
+    - DB=pgsql DB_DSN='postgres://[email protected]/cakephp_test'
+    - DB=sqlite DB_DSN='sqlite:///:memory:'
 
 matrix:
   fast_finish: true
 
   include:
-    - php: 7.2
+    - php: 7.4
       env: PHPCS=1 DEFAULT=0
 
     - php: 7.2
@@ -28,24 +29,32 @@ matrix:
     - php: 7.2
       env: PREFER_LOWEST=1 DEFAULT=0
 
-before_script:
-  - if [[ $TRAVIS_PHP_VERSION != 7.3 ]]; then phpenv config-rm xdebug.ini; fi
+before_install:
+  - 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
+
+install:
+  - if [[ $DB != 'mysql' && $TRAVIS_PHP_VERSION != 7.4 ]]; then phpenv config-rm xdebug.ini; fi
 
-  - if [[ $STATIC_ANALYSIS == 1 ]]; then composer require --dev phpstan/phpstan:^0.12 psalm/phar:^3.7; fi
-  - if [[ $PREFER_LOWEST == 1 ]]; then composer update --no-interaction --prefer-lowest --prefer-stable --prefer-dist; fi
-  - if [[ $PREFER_LOWEST != 1 ]]; then composer install --no-interaction; fi
+  - if [[ $STATIC_ANALYSIS != 1 ]]; then composer install --no-interaction; fi
+  - |
+      if [[ $STATIC_ANALYSIS == 1 ]]; then
+        composer require phpstan/phpstan:^0.12
+        composer require psalm/phar:^3.7
+        composer install --no-dev
+      fi
 
 script:
-  - if [[ $TRAVIS_PHP_VERSION == 7.3 ]]; then ./vendor/bin/phpunit --coverage-clover=clover.xml; fi
-  - if [[ $DEFAULT == 1 || $PREFER_LOWEST == 1 ]]; then ./vendor/bin/phpunit; fi
+  - if [[ $DB == 'mysql' && $TRAVIS_PHP_VERSION == 7.4 ]]; then ./vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $DEFAULT == 1 ]]; then ./vendor/bin/phpunit; fi
 
   - if [[ $PHPCS == 1 ]]; then ./vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
-  - if [[ $STATIC_ANALYSIS == 1 ]]; then vendor/bin/phpstan.phar analyse src; fi
-  - if [[ $STATIC_ANALYSIS == 1 ]]; then vendor/bin/psalm.phar analyse src; fi
+  - if [[ $STATIC_ANALYSIS == 1 ]]; then vendor/bin/phpstan analyse src; fi
+  - if [[ $STATIC_ANALYSIS == 1 ]]; then vendor/bin/psalm.phar; fi
 
 after_success:
-- if [[ $TRAVIS_PHP_VERSION == 7.3 ]]; then bash <(curl -s https://codecov.io/bash); fi
+- if [[ $DB == 'mysql' && $TRAVIS_PHP_VERSION == 7.4 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
 notifications:
   email: false

phpstan.neon

@@ -1,7 +1,7 @@
 parameters:
     level: 6
-    checkGenericClassInNonGenericObjectType: false
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
         -
             message: "#^Call to an undefined method Cake\\\\Datasource\\\\RepositoryInterface\\:\\:callFinder\\(\\)\\.$#"

src/Model/Endpoint.php

@@ -499,9 +499,9 @@ public function getResourceClass(): string
             $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;

tests/bootstrap.php

@@ -83,13 +83,14 @@
     ],
 ]);
 
-$config = [
+if (!getenv('DB_DSN')) {
+    putenv('DB_DSN=sqlite:///:memory:');
+}
+
+ConnectionManager::setConfig('test', [
     'className' => Connection::class,
     'driver' => TestDriver::class,
-];
-
-// Use the test connection for 'debug_kit' as well.
-ConnectionManager::setConfig('test', $config);
+] + ConnectionManager::parseDsn(env('DB_DSN')));
 
 Log::setConfig([
     'debug' => [