Fixes #908

Don't rely on composer to set up the `include_path` for `ErrorHandler.php`.
sebastianbergmann · May 12, 2013 · a3dcfcb · a3dcfcb
1 parent 19f1d74
commit a3dcfcb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -12,6 +12,7 @@ PHPUnit 3.7.20
 * Fixed #891: Better messages when JSON-related assertions receive invalid JSON.
 * Fixed #896: Use the proper `toString()` method inside `PHPUnit_Framework_TestFailure::toString()`.
 * Fixed #902: Allow symfony/yaml >=2.0,<3.0
+* Fixed #908: Don't rely on composer to set up the `include_path` for `ErrorHandler.php`.
 
 PHPUnit 3.7.19
 --------------

diff --git a/PHPUnit/Util/ErrorHandler.php b/PHPUnit/Util/ErrorHandler.php
@@ -45,10 +45,10 @@
 
 // Workaround for http://bugs.php.net/bug.php?id=47987,
 // see https://github.com/sebastianbergmann/phpunit/issues#issue/125 for details
-require_once 'PHPUnit/Framework/Error.php';
-require_once 'PHPUnit/Framework/Error/Notice.php';
-require_once 'PHPUnit/Framework/Error/Warning.php';
-require_once 'PHPUnit/Framework/Error/Deprecated.php';
+require_once __DIR__ . '/../Framework/Error.php';
+require_once __DIR__ . '/../Framework/Error/Notice.php';
+require_once __DIR__ . '/../Framework/Error/Warning.php';
+require_once __DIR__ . '/../Framework/Error/Deprecated.php';
 
 /**
  * Error handler that converts PHP errors and warnings to exceptions.