X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=public%2Findex.php;h=2868a5ca003f1e4ce26e66eed6fdb262d3cd75a7;hb=52f94fcc7087bb4b4134a0400ddedeba8c75175f;hp=f56f4a61e5914893cf093f2b831c23b70e5d6a1f;hpb=49440e70a33225e071345bf53d8a7471d3997670;p=zf2.biz%2Fgalerie.git

diff --git a/public/index.php b/public/index.php
index f56f4a6..2868a5c 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,32 +1,21 @@
 <?php
-// Define application environment
-defined('APPLICATION_ENV')
-    || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'production'));
+chdir(dirname(__DIR__));
+require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
 
-// Ensure ZF is on the include path
-set_include_path(implode(PATH_SEPARATOR, array(
-    realpath(__DIR__ . '/../library/ZendFramework/library'),
-    get_include_path(),
-)));
+use Zend\Loader\AutoloaderFactory,
+Zend\ServiceManager\ServiceManager,
+Zend\Mvc\Service\ServiceManagerConfiguration;
 
-require_once 'Zend/Loader/AutoloaderFactory.php';
-Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));
+// setup autoloader
+AutoloaderFactory::factory();
 
-$appConfig = include __DIR__ . '/../configs/application.config.php';
+// get application stack configuration
+$configuration = include 'config/application.config.php';
 
-$moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig->module_paths);
-$moduleLoader->register();
+// setup service manager
+$serviceManager = new ServiceManager(new ServiceManagerConfiguration($configuration['service_manager']));
+$serviceManager->setService('ApplicationConfiguration', $configuration);
+$serviceManager->get('ModuleManager')->loadModules();
 
-$moduleManager = new Zend\Module\Manager(
-    $appConfig->modules,
-    new Zend\Module\ManagerOptions($appConfig->module_manager_options)
-);
-
-// Get the merged config object
-$config = $moduleManager->getMergedConfig();
-
-// Create application, bootstrap, and run
-$bootstrap = new $config->bootstrap_class($config, $moduleManager);
-$application = new Zend\Mvc\Application;
-$bootstrap->bootstrap($application);
-$application->run()->send();
+// run application
+$serviceManager->get('Application')->bootstrap()->run()->send();