Merge remote-tracking branch 'Xerkus/hotfix/glob-path'

[zf2.biz/galerie.git] / public / index.php

diff --git a/public/index.php b/public/index.php
index b8dc353..8007083 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -1,15 +1,20 @@
 <?php
 chdir(dirname(__DIR__));
-require_once 'vendor/ZendFramework/library/Zend/Loader/AutoloaderFactory.php';
-Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));
+require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
+Zend\Loader\AutoloaderFactory::factory();
+
+if (!($env = getenv('APPLICATION_ENV'))) {
+    $env = 'local';
+}
 
 $appConfig = include 'config/application.config.php';
 
-$moduleManager    = new Zend\Module\Manager($appConfig['modules']);
 $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");
+    
 
-$defaultListeners->getConfigListener()->addConfigGlobPath('config/autoload/*.config.php');
+$moduleManager = new Zend\Module\Manager($appConfig['modules']);
 $moduleManager->events()->attachAggregate($defaultListeners);
 $moduleManager->loadModules();