projects
/
zf2.biz
/
galerie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[zendframework/ZendSkeletonApplication#67] fixed path to index.phtml (was introduced...
[zf2.biz/galerie.git]
/
public
/
index.php
diff --git
a/public/index.php
b/public/index.php
index
34d0b34
..
ece1222
100644
(file)
--- a/
public/index.php
+++ b/
public/index.php
@@
-1,24
+1,21
@@
<?php
<?php
+use Zend\ServiceManager\ServiceManager,
+ Zend\Mvc\Service\ServiceManagerConfiguration;
+
chdir(dirname(__DIR__));
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';
+// Composer autoloading
+if (!include_once('vendor/autoload.php')) {
+ throw new RuntimeException('vendor/autoload.php could not be found. Did you run `php composer.phar install`?');
}
}
-$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");
+// 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();