Upgrade to CakePHP 3.6+.

Author: dereuromark

.travis.yml

@@ -18,9 +18,6 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 7.1
-      env: PHPCS=1 DEFAULT=0
-
     - php: 7.1
       env: DB=pgsql db_dsn='postgres://[email protected]/cakephp_test'
 
@@ -30,6 +27,12 @@ matrix:
     - php: 5.6
       env: PREFER_LOWEST=1
 
+    - php: 7.1
+      env: CODECOVERAGE=1 DEFAULT=0
+
+    - php: 7.1
+      env: PHPCS=1 DEFAULT=0
+
 before_script:
   - if [[ $PHPCS != 1 ]]; then composer require phpunit/phpunit:"^5.7.14|^6.0" ; fi
 
@@ -44,13 +47,12 @@ before_script:
   - cp phpunit.xml.dist phpunit.xml
 
 script:
-  - if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION == 7.0 ]]; then export CODECOVERAGE=1; vendor/bin/phpunit --coverage-clover=clover.xml ; fi
-  - if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then vendor/bin/phpunit ; fi
-
-  - if [[ $PHPCS == 1 ]]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=/vendor/,/tmp/,/logs/,/config/Migrations/ -v . ; fi
+  - if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit; fi
+  - if [[ $PHPCS == 1 ]]; then composer cs-check ; fi
 
-after_success:
-  - if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION == 7.0 ]]; then bash <(curl -s https://codecov.io/bash) ; fi
+  - if [[ $CODECOVERAGE == 1 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml || true; fi
+  - if [[ $CODECOVERAGE == 1 ]]; then wget -O codecov.sh https://codecov.io/bash; fi
+  - if [[ $CODECOVERAGE == 1 ]]; then bash codecov.sh; fi
 
 notifications:
   email: false

README.md

@@ -7,7 +7,7 @@
 [![Total Downloads](https://poser.pugx.org/dereuromark/cakephp-queue/d/total)](https://packagist.org/packages/dereuromark/cakephp-queue)
 [![Coding Standards](https://img.shields.io/badge/cs-PSR--2--R-yellow.svg)](https://github.com/php-fig-rectified/fig-rectified-standards)
 
-This branch is for use with **CakePHP 3**.
+This branch is for use with **CakePHP 3.5+**.
 
 
 ## Background

composer.json

@@ -19,7 +19,7 @@
 	],
 	"require": {
 		"php": ">=5.6",
-		"cakephp/cakephp": "^3.4.1"
+		"cakephp/cakephp": "^3.5"
 	},
 	"require-dev": {
 		"cakephp/migrations": "^1.0",

phpunit.xml.dist

@@ -10,11 +10,16 @@
 	stopOnFailure="false"
 	stopOnIncomplete="false"
 	stopOnSkipped="false"
-	syntaxCheck="false">
-
+	syntaxCheck="false"
+>
+	<php>
+		<!-- E_ALL => 32767 -->
+		<!-- E_ALL & ~E_USER_DEPRECATED => 16383 -->
+		<ini name="error_reporting" value="16383"/>
+	</php>
 	<testsuites>
-		<testsuite name="Geo">
-			<directory>./tests/</directory>
+		<testsuite name="geo">
+			<directory>tests/</directory>
 		</testsuite>
 	</testsuites>
 
@@ -29,7 +34,7 @@
     <!-- Prevent coverage reports from looking in tests, vendors, config folders -->
     <filter>
         <whitelist>
-            <directory suffix=".php">./src/</directory>
+            <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
 

tests/bootstrap.php

@@ -81,7 +81,7 @@
 	],
 ];
 
-Cake\Cache\Cache::config($cache);
+Cake\Cache\Cache::setConfig($cache);
 
 Cake\Core\Plugin::load('Queue', ['path' => ROOT . DS, 'autoload' => true, 'bootstrap' => false, 'routes' => true]);
 Cake\Core\Plugin::load('Foo', ['path' => ROOT . DS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'Foo' . DS]);
@@ -90,20 +90,20 @@
 DispatcherFactory::add('Routing');
 DispatcherFactory::add('ControllerFactory');
 
-Cake\Mailer\Email::configTransport('default', [
+Cake\Mailer\Email::setConfigTransport('default', [
 	'className' => 'Debug',
 ]);
-Cake\Mailer\Email::configTransport('queue', [
+Cake\Mailer\Email::setConfigTransport('queue', [
 	'className' => 'Queue.Queue',
 ]);
-Cake\Mailer\Email::config('default', [
+Cake\Mailer\Email::setConfig('default', [
 	'transport' => 'default',
 ]);
 
 // Allow local overwrite
 // E.g. in your console: export db_dsn="mysql://root:[email protected]/cake_test"
 if (!getenv('db_class') && getenv('db_dsn')) {
-	ConnectionManager::config('test', ['url' => getenv('db_dsn')]);
+	ConnectionManager::setConfig('test', ['url' => getenv('db_dsn')]);
 	return;
 }
 if (!getenv('db_class')) {
@@ -112,7 +112,7 @@
 }
 
 // Uses Travis config then (MySQL, Postgres, ...)
-ConnectionManager::config('test', [
+ConnectionManager::setConfig('test', [
 	'className' => 'Cake\Database\Connection',
 	'driver' => getenv('db_class'),
 	'dsn' => getenv('db_dsn'),