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

diff --git a/public/index.php b/public/index.php
index ec12489..2868a5c 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,24 +1,21 @@
 <?php
 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';
-}
+use Zend\Loader\AutoloaderFactory,
+Zend\ServiceManager\ServiceManager,
+Zend\Mvc\Service\ServiceManagerConfiguration;
 
-$appConfig = include 'config/application.config.php';
+// setup autoloader
+AutoloaderFactory::factory();
 
-$listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
-$defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
-$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.{global,$env}.php");
+// get application stack configuration
+$configuration = include 'config/application.config.php';
 
-$moduleManager = new Zend\Module\Manager($appConfig['modules']);
-$moduleManager->events()->attachAggregate($defaultListeners);
-$moduleManager->loadModules();
+// setup service manager
+$serviceManager = new ServiceManager(new ServiceManagerConfiguration($configuration['service_manager']));
+$serviceManager->setService('ApplicationConfiguration', $configuration);
+$serviceManager->get('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 application
+$serviceManager->get('Application')->bootstrap()->run()->send();