Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed PHPUnit include bug.

Fixed vendor include path bug.
  • Loading branch information...
commit 5038e7eb38aa7a77584f0a26cb484547c1e667a9 1 parent 73310f9
@psparrow psparrow authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
View
5 lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -138,13 +138,14 @@ protected function _checkPHPUnit() {
*/
public function loadTestFramework() {
foreach (App::path('vendors') as $vendor) {
- if (is_dir($vendor . 'PHPUnit')) {
+ $vendor = rtrim($vendor, DS);
+ if (is_dir($vendor . DS . 'PHPUnit')) {
ini_set('include_path', $vendor . PATH_SEPARATOR . ini_get('include_path'));
break;
}
}
- return include 'PHPUnit' . DS . 'Autoload.php';
+ return (include('PHPUnit' . DS . 'Autoload.php')) !== false;
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.