X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=public%2Findex.php;h=49cb018c3ac40b606b0ef9ae18db768f4608c177;hb=HEAD;hp=34d0b34d7602317247ea593357f7e226e35f8abc;hpb=25971d5c84aa8bc53925d4e30f4e18401d7762fe;p=zf2.biz%2Fgalerie.git

diff --git a/public/index.php b/public/index.php
index 34d0b34..49cb018 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,24 +1,12 @@
 <?php
+/**
+ * This makes our life easier when dealing with paths. Everything is relative
+ * to the application root now.
+ */
 chdir(dirname(__DIR__));
-require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
-Zend\Loader\AutoloaderFactory::factory();
 
-if (!($env = getenv('APPLICATION_ENV'))) {
-    $env = 'local';
-}
+// Setup autoloading
+require 'init_autoloader.php';
 
-$appConfig = include 'config/application.config.php';
-
-$listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
-$defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
-$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.{global,$env}..configphp");
-
-$moduleManager = new Zend\Module\Manager($appConfig['modules']);
-$moduleManager->events()->attachAggregate($defaultListeners);
-$moduleManager->loadModules();
-
-// Create application, bootstrap, and run
-$bootstrap   = new Zend\Mvc\Bootstrap($defaultListeners->getConfigListener()->getMergedConfig());
-$application = new Zend\Mvc\Application;
-$bootstrap->bootstrap($application);
-$application->run()->send();
+// Run the application!
+Zend\Mvc\Application::init(require 'config/application.config.php')->run();