X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=public%2Findex.php;h=34c609d405670e9f3bff78a8701a27df74b243e0;hb=b512f01381ad277ba0d16d8404eb93aff260b8a6;hp=2868a5ca003f1e4ce26e66eed6fdb262d3cd75a7;hpb=fe41037cd7eec32a9f2b8bb0a84b80bc7f6def65;p=zf2.biz%2Fgalerie.git

diff --git a/public/index.php b/public/index.php
index 2868a5c..34c609d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,21 +1,24 @@
 <?php
+use Zend\ServiceManager\ServiceManager,
+    Zend\Mvc\Service\ServiceManagerConfiguration;
+
 chdir(dirname(__DIR__));
-require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
 
-use Zend\Loader\AutoloaderFactory,
-Zend\ServiceManager\ServiceManager,
-Zend\Mvc\Service\ServiceManagerConfiguration;
+if (!file_exists('vendor/autoload.php')) {
+    throw new RuntimeException('vendor/autoload.php could not be found. Did you run php composer.phar install?');
+    exit;
+}
 
-// setup autoloader
-AutoloaderFactory::factory();
+// Composer autoloading
+require_once('vendor/autoload.php');
 
-// get application stack configuration
+// Get application stack configuration.
 $configuration = include 'config/application.config.php';
 
-// setup service manager
+// Setup service manager.
 $serviceManager = new ServiceManager(new ServiceManagerConfiguration($configuration['service_manager']));
 $serviceManager->setService('ApplicationConfiguration', $configuration);
 $serviceManager->get('ModuleManager')->loadModules();
 
-// run application
+// Run application.
 $serviceManager->get('Application')->bootstrap()->run()->send();