From 5038e7eb38aa7a77584f0a26cb484547c1e667a9 Mon Sep 17 00:00:00 2001
From: pjskeptic <psparrow25@gmail.com>
Date: Tue, 12 Mar 2013 22:02:55 -0400
Subject: [PATCH] Fixed PHPUnit include bug.
Fixed vendor include path bug.
---
lib/Cake/TestSuite/CakeTestSuiteDispatcher.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
index 6b8e653e0..86dfd3895 100644
--- a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
+++ b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -138,13 +138,14 @@ class CakeTestSuiteDispatcher {
*/
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;
}
/**