Slight improvement to b9ea952.

Author: whatthejeff

PHPUnit/Framework/Process/TestCaseMethod.tpl.dist

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

PHPUnit/Framework/TestCase.php

@@ -736,9 +736,9 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
             }
 
             if (defined('PHPUNIT_COMPOSER_INSTALL')) {
-                $autoload = var_export(PHPUNIT_COMPOSER_INSTALL, TRUE);
+                $composerAutoload = var_export(PHPUNIT_COMPOSER_INSTALL, TRUE);
             } else {
-                $autoload = '\'PHPUnit/Autoload.php\'';
+                $composerAutoload = '\'\'';
             }
 
             $data            = var_export(serialize($this->data), TRUE);
@@ -752,7 +752,7 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
 
             $template->setVar(
               array(
-                'autoload'                       => $autoload,
+                'composerAutoload'               => $composerAutoload,
                 'filename'                       => $class->getFileName(),
                 'className'                      => $class->getName(),
                 'methodName'                     => $this->name,