Made sebastianbergmann#844 work for isolated tests.

Author: whatthejeff

PHPUnit/Framework/Process/TestCaseMethod.tpl.dist

@@ -1,7 +1,7 @@
 <?php
 ini_set('display_errors', 'stderr');
 set_include_path('{include_path}');
-require 'PHPUnit/Autoload.php';
+require {autoload};
 ob_start();
 
 function __phpunit_run_isolated_test()

PHPUnit/Framework/TestCase.php

@@ -735,6 +735,12 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
                 $strict = 'FALSE';
             }
 
+            if (defined('PHPUNIT_COMPOSER_INSTALL')) {
+                $autoload = var_export(PHPUNIT_COMPOSER_INSTALL, TRUE);
+            } else {
+                $autoload = '\'PHPUnit/Autoload.php\'';
+            }
+
             $data            = var_export(serialize($this->data), TRUE);
             $dependencyInput = var_export(serialize($this->dependencyInput), TRUE);
             $includePath     = var_export(get_include_path(), TRUE);
@@ -746,6 +752,7 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
 
             $template->setVar(
               array(
+                'autoload'                       => $autoload,
                 'filename'                       => $class->getFileName(),
                 'className'                      => $class->getName(),
                 'methodName'                     => $this->name,

composer/bin/phpunit

@@ -46,7 +46,7 @@ foreach ($files as $file) {
     if (file_exists($file)) {
         require $file;
 
-        define('PHPUNIT_COMPOSER_INSTALL', TRUE);
+        define('PHPUNIT_COMPOSER_INSTALL', $file);
 
         break;
     }