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

diff --git a/public/index.php b/public/index.php
index 418b63b..49cb018 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,25 +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();
 
-$appConfig = include 'config/application.config.php';
+// Setup autoloading
+require 'init_autoloader.php';
 
-$sharedEvents     = new Zend\EventManager\SharedEventManager();
-$listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
-$defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
-$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/{,*.}{global,local}.config.php");
-    
-
-$moduleManager = new Zend\Module\Manager($appConfig['modules']);
-$events        = $moduleManager->events();
-$events->setSharedCollections($sharedEvents);
-$events->attach($defaultListeners);
-$moduleManager->loadModules();
-
-// Create application, bootstrap, and run
-$bootstrap   = new Zend\Mvc\Bootstrap($defaultListeners->getConfigListener()->getMergedConfig());
-$bootstrap->events()->setSharedCollections($sharedEvents);
-$application = new Zend\Mvc\Application;
-$bootstrap->bootstrap($application);
-$application->run()->send();
+// Run the application!
+Zend\Mvc\Application::init(require 'config/application.config.php')->run();