Merge branch 'master' into 2.3

This commit is contained in:
mark_story 2012-10-15 21:48:55 -04:00
commit 1cc82ff39f

View file

@ -235,7 +235,7 @@ class CakeEventManagerTest extends CakeTestCase {
*/
public function testDispatchReturnValue() {
$this->skipIf(
version_compare(PHPUnit_Runner_Version::VERSION, '3.7', '<'),
version_compare(PHPUnit_Runner_Version::id(), '3.7', '<'),
'These tests fail in PHPUnit 3.6'
);
$manager = new CakeEventManager;