Merge branch '3.7'

sebastianbergmann · Mar 7, 2013 · c77923f · c77923f
2 parents b5b8a12 + 3c4559d
commit c77923f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/PHPUnit/Autoload.php b/PHPUnit/Autoload.php
@@ -47,16 +47,15 @@
 }
 
 $paths = array(
-  '/..',
+  __DIR__ . '/../vendor',
-  '/../../../..'
+  __DIR__ . '/../../..'
 );
 
 foreach ($paths as $path) {
-    $vendor = __DIR__ . $path . '/vendor';
+    if (is_dir($path . '/composer') &&
-    if (is_dir($vendor . '/composer') &&
+        is_file($path . '/autoload.php')) {
-        is_file($vendor . '/autoload.php')) {
+        require_once $path . '/autoload.php';
-        require_once $vendor . '/autoload.php';
+        define('PHPUNIT_COMPOSER_INSTALL', $path . '/autoload.php');
-        define('PHPUNIT_COMPOSER_INSTALL', $vendor . '/autoload.php');
 
         return;
     }

diff --git a/PHPUnit/Autoload.php.in b/PHPUnit/Autoload.php.in
@@ -47,16 +47,15 @@ if (defined('PHPUNIT_COMPOSER_INSTALL')) {
 }
 
 $paths = array(
-  '/..',
+  __DIR__ . '/../vendor',
-  '/../../../..'
+  __DIR__ . '/../../..'
 );
 
 foreach ($paths as $path) {
-    $vendor = __DIR__ . $path . '/vendor';
+    if (is_dir($path . '/composer') &&
-    if (is_dir($vendor . '/composer') &&
+        is_file($path . '/autoload.php')) {
-        is_file($vendor . '/autoload.php')) {
+        require_once $path . '/autoload.php';
-        require_once $vendor . '/autoload.php';
+        define('PHPUNIT_COMPOSER_INSTALL', $path . '/autoload.php');
-        define('PHPUNIT_COMPOSER_INSTALL', $vendor . '/autoload.php');
 
         return;
     }