Reverting to config globbing practice decided in meeting

See http://framework.zend.com/wiki/display/ZFDEV2/2011-12-07+Meeting+Log

diff --git a/public/.htaccess b/public/.htaccess
index dc8c8dc..7a9766d 100644 (file)
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,5 +1,3 @@
-SetEnv APPLICATION_ENV local
-
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} -s [OR]
 RewriteCond %{REQUEST_FILENAME} -l [OR]

diff --git a/public/index.php b/public/index.php
index 8007083..ef74d01 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -3,15 +3,11 @@ 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';
-}
-
 $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/{module.*,global,$env,local}.config.php");
+$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.{global,local}.php");
     
 
 $moduleManager = new Zend\Module\Manager($appConfig['modules']);