Permalink
Browse files

- Merge [4717].

  • Loading branch information...
1 parent 8d1ec2f commit 4303f06c4afb3e9eb04e194a71ebbaef7c59ca3b @sebastianbergmann committed Mar 21, 2009
Showing with 2 additions and 1 deletion.
  1. +2 −1 PHPUnit/TextUI/TestRunner.php
@@ -586,7 +586,8 @@ public static function printVersionString()
*/
protected function handleConfiguration(array &$arguments)
{
- if (isset($arguments['configuration'])) {
+ if (isset($arguments['configuration']) &&
+ !$arguments['configuration'] instanceof PHPUnit_Util_Configuration) {
$arguments['configuration'] = PHPUnit_Util_Configuration::getInstance(
$arguments['configuration']
);

0 comments on commit 4303f06

Please sign in to comment.