From b4b04cda07b21c9fe0064dac51fe39486a29906b Mon Sep 17 00:00:00 2001 From: Evan Coury Date: Wed, 7 Mar 2012 17:34:38 -0700 Subject: [PATCH] Add optional config filename prefix --- config/autoload/.gitignore | 1 + config/autoload/README.md | 8 ++++---- public/index.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/autoload/.gitignore b/config/autoload/.gitignore index a879374..cd491ae 100644 --- a/config/autoload/.gitignore +++ b/config/autoload/.gitignore @@ -1 +1,2 @@ local.config.php +*.local.config.php diff --git a/config/autoload/README.md b/config/autoload/README.md index a42ef5b..3b36bee 100644 --- a/config/autoload/README.md +++ b/config/autoload/README.md @@ -2,7 +2,7 @@ About this directory: ===================== By default, this application is configured to load all configs in -`./config/autoload/*.config.php`. Doing this provides a location for a -developer to drop in configuration override files provided by modules, as well -as cleanly provide individual, application-wide config files for things like -database connections, etc. +`./config/autoload/{,*.}{global,local}.config.php`. Doing this provides a +location for a developer to drop in configuration override files provided by +modules, as well as cleanly provide individual, application-wide config files +for things like database connections, etc. diff --git a/public/index.php b/public/index.php index ef74d01..354a083 100644 --- a/public/index.php +++ b/public/index.php @@ -7,7 +7,7 @@ $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,local}.php"); +$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/{,*.}{global,local}.config.php"); $moduleManager = new Zend\Module\Manager($appConfig['modules']); -- 1.7.10.4