Merge pull request #844 from whatthejeff/autoload_confusion

sebastianbergmann · Mar 2, 2013 · 605a5c0 · 605a5c0
2 parents 956132b + 0996428
commit 605a5c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/PHPUnit/Autoload.php b/PHPUnit/Autoload.php
@@ -42,6 +42,10 @@
  * @since      File available since Release 3.5.0
  */
 
+if (defined('PHPUNIT_COMPOSER_INSTALL')) {
+    return;
+}
+
 require_once 'File/Iterator/Autoload.php';
 require_once 'PHP/CodeCoverage/Autoload.php';
 require_once 'PHP/Timer/Autoload.php';

diff --git a/PHPUnit/Autoload.php.in b/PHPUnit/Autoload.php.in
@@ -42,6 +42,10 @@
  * @since      File available since Release 3.5.0
  */
 
+if (defined('PHPUNIT_COMPOSER_INSTALL')) {
+    return;
+}
+
 require_once 'File/Iterator/Autoload.php';
 require_once 'PHP/CodeCoverage/Autoload.php';
 require_once 'PHP/Timer/Autoload.php';

diff --git a/composer/bin/phpunit b/composer/bin/phpunit
@@ -42,19 +42,17 @@ $files = array(
   __DIR__ . '/../../../../autoload.php'
 );
 
-$found = FALSE;
-
 foreach ($files as $file) {
     if (file_exists($file)) {
         require $file;
 
-        $found = TRUE;
+        define('PHPUNIT_COMPOSER_INSTALL', TRUE);
 
         break;
     }
 }
 
-if (!$found) {
+if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
     die(
       'You need to set up the project dependencies using the following commands:' . PHP_EOL .
       'curl -s http://getcomposer.org/installer | php' . PHP_EOL .