Jordi Boggiano преди 13 години
родител
ревизия
438cea6363
променени са 4 файла, в които са добавени 28 реда и са изтрити 32 реда
  1. 1 9
      bin/compile
  2. 1 9
      bin/composer
  3. 25 0
      src/bootstrap.php
  4. 1 14
      tests/bootstrap.php

+ 1 - 9
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;
 

+ 1 - 9
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;
 

+ 25 - 0
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;

+ 1 - 14
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__);