Browse Source

Fix xdebug display errors in autoload

Marcin Chyłek 13 years ago
parent
commit
768bedc164
2 changed files with 10 additions and 2 deletions
  1. 5 1
      bin/compile
  2. 5 1
      bin/composer

+ 5 - 1
bin/compile

@@ -1,7 +1,11 @@
 #!/usr/bin/env php
 <?php
 
-if ((!@include __DIR__.'/../../../.composer/autoload.php') && (!@include __DIR__.'/../vendor/.composer/autoload.php')) {
+function autoload($file) {
+    return (file_exists($file) && include $file) ? true : false;
+}
+
+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);

+ 5 - 1
bin/composer

@@ -1,7 +1,11 @@
 #!/usr/bin/env php
 <?php
 
-if ((!@include __DIR__.'/../../../.composer/autoload.php') && (!@include __DIR__.'/../vendor/.composer/autoload.php')) {
+function autoload($file) {
+    return (file_exists($file) && include $file) ? true : false;
+}
+
+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);