projects
/
zf2.biz
/
galerie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated ZF2 submodule and changed to segment route
[zf2.biz/galerie.git]
/
public
/
index.php
diff --git
a/public/index.php
b/public/index.php
index
f56f4a6
..
84f5f90
100644
(file)
--- a/
public/index.php
+++ b/
public/index.php
@@
-5,6
+5,7
@@
defined('APPLICATION_ENV')
// Ensure ZF is on the include path
set_include_path(implode(PATH_SEPARATOR, array(
// Ensure ZF is on the include path
set_include_path(implode(PATH_SEPARATOR, array(
+ realpath(__DIR__ . '/../library'),
realpath(__DIR__ . '/../library/ZendFramework/library'),
get_include_path(),
)));
realpath(__DIR__ . '/../library/ZendFramework/library'),
get_include_path(),
)));
@@
-12,21
+13,18
@@
set_include_path(implode(PATH_SEPARATOR, array(
require_once 'Zend/Loader/AutoloaderFactory.php';
Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));
require_once 'Zend/Loader/AutoloaderFactory.php';
Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));
-$appConfig = include __DIR__ . '/../configs/application.config.php';
+$appConfig = new Zend\Config\Config(include __DIR__ . '/../configs/application.config.php');
-$moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig->module_paths);
+$moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig['module_paths']);
$moduleLoader->register();
$moduleManager = new Zend\Module\Manager(
$moduleLoader->register();
$moduleManager = new Zend\Module\Manager(
- $appConfig->modules,
- new Zend\Module\ManagerOptions($appConfig->module_manager_options)
+ $appConfig['modules'],
+ new Zend\Module\ManagerOptions($appConfig['module_manager_options'])
);
);
-// Get the merged config object
-$config = $moduleManager->getMergedConfig();
-
// Create application, bootstrap, and run
// Create application, bootstrap, and run
-$bootstrap = new $config->bootstrap_class($config, $moduleManager);
-$application = new Zend\Mvc\Application;
+$bootstrap = new Zend\Mvc\Bootstrap($moduleManager);
+$application = new Zend\Mvc\Application;
$bootstrap->bootstrap($application);
$application->run()->send();
$bootstrap->bootstrap($application);
$application->run()->send();