Removing unused stat call and reducing complexity of index.php

[zf2.biz/galerie.git] / public / index.php

diff --git a/public/index.php b/public/index.php
index 2868a5c..ece1222 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -1,21 +1,21 @@
 <?php
-chdir(dirname(__DIR__));
-require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
+use Zend\ServiceManager\ServiceManager,
+    Zend\Mvc\Service\ServiceManagerConfiguration;
 
-use Zend\Loader\AutoloaderFactory,
-Zend\ServiceManager\ServiceManager,
-Zend\Mvc\Service\ServiceManagerConfiguration;
+chdir(dirname(__DIR__));
 
-// setup autoloader
-AutoloaderFactory::factory();
+// Composer autoloading
+if (!include_once('vendor/autoload.php')) {
+    throw new RuntimeException('vendor/autoload.php could not be found. Did you run `php composer.phar install`?');
+}
 
-// 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();