Updated composer.json to latest master.

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

diff --git a/public/index.php b/public/index.php
index 2868a5c..f347d34 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -1,21 +1,40 @@
 <?php
+use Zend\Loader\AutoloaderFactory;
+use Zend\ServiceManager\ServiceManager;
+use 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;
+// Composer autoloading
+if (file_exists('vendor/autoload.php')) {
+    $loader = include 'vendor/autoload.php';
+}
+
+// Support for ZF2_PATH environment variable or git submodule
+if ($zf2Path = getenv('ZF2_PATH') ?: (is_dir('vendor/ZF2/library') ? 'vendor/ZF2/library' : false)) {
+    if (isset($loader)) {
+        $loader->add('Zend', $zf2Path . '/Zend');
+    } else {
+        include $zf2Path . '/Zend/Loader/AutoloaderFactory.php';
+        AutoloaderFactory::factory(array(
+            'Zend\Loader\StandardAutoloader' => array(
+                'autoregister_zf' => true
+            )
+        ));
+    }
+}
 
-// setup autoloader
-AutoloaderFactory::factory();
+if (!class_exists('Zend\Loader\AutoloaderFactory')) {
+    throw new RuntimeException('Unable to load ZF2. Run `php composer.phar install` or define a ZF2_PATH environment variable.');
+}
 
-// 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();