projects
/
zf2.biz
/
galerie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into feature/composer
[zf2.biz/galerie.git]
/
public
/
index.php
diff --git
a/public/index.php
b/public/index.php
index
8007083
..
adaa631
100644
(file)
--- a/
public/index.php
+++ b/
public/index.php
@@
-1,25
+1,19
@@
<?php
<?php
-chdir(dirname(__DIR__));
-require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
-Zend\Loader\AutoloaderFactory::factory();
+use Zend\ServiceManager\ServiceManager,
+ Zend\Mvc\Service\ServiceManagerConfiguration;
-if (!($env = getenv('APPLICATION_ENV'))) {
- $env = 'local';
-}
+chdir(dirname(__DIR__));
-$appConfig = include 'config/application.config.php';
+// Composer autoloading
+require_once('vendor/autoload.php');
-$listenerOptions = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
-$defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
-$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/{module.*,global,$env,local}.config.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();
\ No newline at end of file