Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #690 from webtechnick/2.1

No longer suppress include error for PHPUnit loading.
  • Loading branch information...
commit 645e981cf2a46fb5b82de993e3cf2e7e4303d9b7 2 parents c318586 + ae990cc
@markstory markstory authored
Showing with 6 additions and 16 deletions.
  1. +6 −16 lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
View
22 lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -136,24 +136,14 @@ protected function _checkPHPUnit() {
* @return boolean true if found, false otherwise
*/
public function loadTestFramework() {
- $found = $path = null;
-
- if (@include 'PHPUnit' . DS . 'Autoload.php') {
- $found = true;
- }
-
- if (!$found) {
- foreach (App::path('vendors') as $vendor) {
- if (is_dir($vendor . 'PHPUnit')) {
- $path = $vendor;
- }
- }
-
- if ($path && ini_set('include_path', $path . PATH_SEPARATOR . ini_get('include_path'))) {
- $found = include 'PHPUnit' . DS . 'Autoload.php';
+ foreach (App::path('vendors') as $vendor) {
+ if (is_dir($vendor . 'PHPUnit')) {
+ ini_set('include_path', $vendor . PATH_SEPARATOR . ini_get('include_path'));
+ break;
}
}
- return $found;
+
+ return include 'PHPUnit' . DS . 'Autoload.php';
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.