Make test suite compatible with PHPUnit 5.

cakephp · Apr 6, 2017 · 10052ed · 10052ed
1 parent 68432f7
commit 10052ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,9 @@ matrix:
     - php: 7.0
       env: PHPCS=1
 
+    - php: 7.1
+      env: DB=mysql PHPUNIT=5.7.19
+
 
 before_script:
   - composer global require "phpunit/phpunit=$PHPUNIT"

diff --git a/lib/Cake/TestSuite/CakeTestCase.php b/lib/Cake/TestSuite/CakeTestCase.php
@@ -655,7 +655,7 @@ protected function expectError($expected = false, $message = '') {
  * @deprecated 3.0.0 This is a compatibility wrapper for 1.x. It will be removed in 3.0.
  * @return void
  */
-	protected function expectException($name = 'Exception', $message = '') {
+	public function expectException($name = 'Exception', $message = '') {
 		$this->setExpectedException($name, $message);
 	}
 

diff --git a/lib/Cake/TestSuite/CakeTestRunner.php b/lib/Cake/TestSuite/CakeTestRunner.php
@@ -44,9 +44,10 @@ public function __construct($loader, $params) {
  *
  * @param PHPUnit_Framework_Test $suite The test suite to run
  * @param array $arguments The CLI arguments
+ * @param bool $exit Exits by default or returns the results
  * @return void
  */
-	public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array()) {
+	public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array(), $exit = true) {
 		if (isset($arguments['printer'])) {
 			static::$versionStringPrinted = true;
 		}