Преглед изворни кода

Apply nested-autoload support to all relevant files

Jordi Boggiano пре 13 година
родитељ
комит
26e909a1a0
3 измењених фајлова са 14 додато и 10 уклоњено
  1. 4 5
      bin/compile
  2. 4 5
      bin/composer
  3. 6 0
      tests/bootstrap.php

+ 4 - 5
bin/compile

@@ -1,11 +1,10 @@
 #!/usr/bin/env php
 <?php
 
-if (!@include __DIR__.'/../vendor/.composer/autoload.php') {
-    die('You must set up the project dependencies, run the following commands:
-wget http://getcomposer.org/composer.phar
-php composer.phar install
-');
+if ((!@include __DIR__.'/../../../.composer/autoload.php') && (!@include __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);
 }
 
 use Composer\Compiler;

+ 4 - 5
bin/composer

@@ -1,11 +1,10 @@
 #!/usr/bin/env php
 <?php
 
-if ((!@include __DIR__.'/../../../.composer/autoload.php') and (!@include __DIR__.'/../vendor/.composer/autoload.php')) {
-    die('You must set up the project dependencies, run the following commands:
-wget http://getcomposer.org/composer.phar
-php composer.phar install
-');
+if ((!@include __DIR__.'/../../../.composer/autoload.php') && (!@include __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);
 }
 
 use Composer\Console\Application;

+ 6 - 0
tests/bootstrap.php

@@ -10,6 +10,12 @@
  * file that was distributed with this source code.
  */
 
+if ((!$loader = @include __DIR__.'/../../../.composer/autoload.php') && (!$loader = @include __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__.'/../vendor/.composer/autoload.php';
 $loader->add('Composer\Test', __DIR__);
 $loader->register();