From a4621753e75915d1b59f6d9793d57dbb443518f4 Mon Sep 17 00:00:00 2001
From: Evan Coury <me@evancoury.com>
Date: Wed, 7 Dec 2011 14:22:38 -0700
Subject: [PATCH] Remove references to application environment.

- Updated ZF2 submodule
- Added local dist config file, gitignored non-dist counterpart
- Added default global config file
- Some comments explaining the purpose of the files
---
 config/application.config.php         |    5 ++---
 config/autoload/.gitignore            |    1 +
 config/autoload/global.config.php     |   16 ++++++++++++++++
 config/autoload/local.config.php.dist |   16 ++++++++++++++++
 module/Application/Module.php         |    2 +-
 vendor/ZendFramework                  |    2 +-
 6 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 config/autoload/.gitignore
 create mode 100644 config/autoload/global.config.php
 create mode 100644 config/autoload/local.config.php.dist

diff --git a/config/application.config.php b/config/application.config.php
index 273ebbe..ece654c 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -8,8 +8,7 @@ return array(
         'Application',
     ),
     'module_listener_options' => array( 
-        'config_cache_enabled'    => false,
-        'cache_dir'               => realpath(dirname(__DIR__) . '/data/cache'),
-        'application_environment' => getenv('APPLICATION_ENV'),
+        'config_cache_enabled' => false,
+        'cache_dir'            => realpath(dirname(__DIR__) . '/data/cache'),
     ),
 );
diff --git a/config/autoload/.gitignore b/config/autoload/.gitignore
new file mode 100644
index 0000000..a879374
--- /dev/null
+++ b/config/autoload/.gitignore
@@ -0,0 +1 @@
+local.config.php
diff --git a/config/autoload/global.config.php b/config/autoload/global.config.php
new file mode 100644
index 0000000..b03c0c4
--- /dev/null
+++ b/config/autoload/global.config.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Global Configuration Override
+ *
+ * You can use this file for overridding configuration values from modules, etc.  
+ * You would place values in here that are agnostic to the environment and not 
+ * sensitive to security. 
+ *
+ * @NOTE: In practice, this file will typically be INCLUDED in your source 
+ * control, so do not include passwords or other sensitive information in this 
+ * file.
+ */
+
+return array(
+    // ...
+);
diff --git a/config/autoload/local.config.php.dist b/config/autoload/local.config.php.dist
new file mode 100644
index 0000000..7862eba
--- /dev/null
+++ b/config/autoload/local.config.php.dist
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Local Configuration Override
+ *
+ * This configuration override file is for overriding environment-specific and
+ * security-sensitive configuration information. Copy this file without the
+ * .dist extension at the end and populate values as needed.
+ *
+ * @NOTE: This file is ignored from Git by default with the .gitignore included
+ * in ZendSkeletonApplication. This is a good practice, as it prevents sensitive
+ * credentials from accidentally being comitted into version control.
+ */
+
+return array(
+    // ...
+);
diff --git a/module/Application/Module.php b/module/Application/Module.php
index fc85ebb..6708792 100644
--- a/module/Application/Module.php
+++ b/module/Application/Module.php
@@ -31,7 +31,7 @@ class Module implements AutoloaderProvider
         );
     }
 
-    public function getConfig($env = null)
+    public function getConfig()
     {
         return include __DIR__ . '/config/module.config.php';
     }
diff --git a/vendor/ZendFramework b/vendor/ZendFramework
index a2777d1..853f21d 160000
--- a/vendor/ZendFramework
+++ b/vendor/ZendFramework
@@ -1 +1 @@
-Subproject commit a2777d1bd615403635579804e1cb7a086ef47f88
+Subproject commit 853f21da7cc04d7832107e08accc88533de6ad54
-- 
1.7.10.4