From a6483f03339b5752f3b19a2354385c59ca2baed5 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 20 Aug 2014 14:51:03 +0300 Subject: [PATCH] Prevent fatal error when composer hasn't been run --- composer.json | 3 +++ index.php | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c12e41acc..c1b629b1c 100644 --- a/composer.json +++ b/composer.json @@ -31,5 +31,8 @@ "Grav\\": "system/src/" }, "files": ["system/defines.php"] + }, + "archive": { + "exclude": ["VERSION"] } } diff --git a/index.php b/index.php index 796beaf86..1137ea3ca 100644 --- a/index.php +++ b/index.php @@ -4,12 +4,16 @@ namespace Grav; if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) { exit(sprintf('You are running PHP %s, but Grav needs at least PHP %s to run.', $ver, $req)); } +$autoload = __DIR__ . '/vendor/autoload.php'; +if (!is_file($autoload)) { + exit('Please run: composer install -o'); +} use Grav\Common\Grav; use Grav\Common\Debugger; // Register the auto-loader. -$loader = require_once __DIR__ . '/vendor/autoload.php'; +$loader = require_once $autoload; if (!ini_get('date.timezone')) { date_default_timezone_set('UTC');