From 768bedc16409f27010b3d7de991c593ec31cef58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Chy=C5=82ek?= <marcin@chylek.pl>
Date: Thu, 15 Mar 2012 00:57:58 +0100
Subject: [PATCH] Fix xdebug display errors in autoload

---
 bin/compile  | 6 +++++-
 bin/composer | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/compile b/bin/compile
index bd8426693..e4c1c9eae 100755
--- a/bin/compile
+++ b/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);
diff --git a/bin/composer b/bin/composer
index 286660788..e97da9d1b 100755
--- a/bin/composer
+++ b/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);