Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Regroup bootstrapers

  • Loading branch information...
commit 438cea6363bb18c1d3e1d6d8d1c359f46c30b82c 1 parent 36c53f4
@Seldaek Seldaek authored
View
10 bin/compile
@@ -1,15 +1,7 @@
#!/usr/bin/env php
<?php
-function autoload($file) {
- return (file_exists($file) && include $file);
-}
-
-if (!autoload(__DIR__.'/../../../.composer/autoload.php') && !autoload(__DIR__.'/../vendor/.composer/autoload.php')) {
- die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
- 'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
- 'php composer.phar install'.PHP_EOL);
-}
+require __DIR__.'/../src/bootstrap.php';
use Composer\Compiler;
View
10 bin/composer
@@ -1,15 +1,7 @@
#!/usr/bin/env php
<?php
-function autoload($file) {
- return (file_exists($file) && include $file);
-}
-
-if (!autoload(__DIR__.'/../../../.composer/autoload.php') && !autoload(__DIR__.'/../vendor/.composer/autoload.php')) {
- die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
- 'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
- 'php composer.phar install'.PHP_EOL);
-}
+require __DIR__.'/../src/bootstrap.php';
use Composer\Console\Application;
View
25 src/bootstrap.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ * Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+function includeIfExists($file) {
+ if (file_exists($file)) {
+ return include $file;
+ }
+}
+
+if ((!$loader = includeIfExists(__DIR__.'/../../../.composer/autoload.php')) && (!$loader = includeIfExists(__DIR__.'/../vendor/.composer/autoload.php'))) {
+ die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
+ 'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
+ 'php composer.phar install'.PHP_EOL);
+}
+
+return $loader;
View
15 tests/bootstrap.php
@@ -10,18 +10,5 @@
* file that was distributed with this source code.
*/
-function autoload($file) {
- if (file_exists($file)) {
- return include $file;
- } else {
- return false;
- }
-}
-
-if ((!$loader = autoload(__DIR__.'/../../../.composer/autoload.php')) && (!$loader = autoload(__DIR__.'/../vendor/.composer/autoload.php'))) {
- die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
- 'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
- 'php composer.phar install'.PHP_EOL);
-}
-
+$loader = require __DIR__.'/../src/bootstrap.php';
$loader->add('Composer\Test', __DIR__);

0 comments on commit 438cea6

Please sign in to comment.
Something went wrong with that request. Please try again.