Permalink
Browse files

Merge branch '3.7'

  • Loading branch information...
2 parents b5b8a12 + 3c4559d commit c77923f54a0dbd7d223d42975f9a7ce9258353c3 @whatthejeff whatthejeff committed Mar 7, 2013
Showing with 12 additions and 14 deletions.
  1. +6 −7 PHPUnit/Autoload.php
  2. +6 −7 PHPUnit/Autoload.php.in
View
@@ -47,16 +47,15 @@
}
$paths = array(
- '/..',
- '/../../../..'
+ __DIR__ . '/../vendor',
+ __DIR__ . '/../../..'
);
foreach ($paths as $path) {
- $vendor = __DIR__ . $path . '/vendor';
- if (is_dir($vendor . '/composer') &&
- is_file($vendor . '/autoload.php')) {
- require_once $vendor . '/autoload.php';
- define('PHPUNIT_COMPOSER_INSTALL', $vendor . '/autoload.php');
+ if (is_dir($path . '/composer') &&
+ is_file($path . '/autoload.php')) {
+ require_once $path . '/autoload.php';
+ define('PHPUNIT_COMPOSER_INSTALL', $path . '/autoload.php');
return;
}
View
@@ -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($vendor . '/composer') &&
- is_file($vendor . '/autoload.php')) {
- require_once $vendor . '/autoload.php';
- define('PHPUNIT_COMPOSER_INSTALL', $vendor . '/autoload.php');
+ if (is_dir($path . '/composer') &&
+ is_file($path . '/autoload.php')) {
+ require_once $path . '/autoload.php';
+ define('PHPUNIT_COMPOSER_INSTALL', $path . '/autoload.php');
return;
}

0 comments on commit c77923f

Please sign in to comment.