From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 15 May 2012 17:20:17 +0000 (-0500)
Subject: [zen-33] Updated config globbing
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b0c3027e5d74dc8608679e1d6f15a1753eecda2a;p=zf2.biz%2Fapplication_blanche.git

[zen-33] Updated config globbing

- Removed ".config" segment from application configuration
---

diff --git a/config/autoload/README.md b/config/autoload/README.md
index 3b36bee..4e504db 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/{,*.}{global,local}.config.php`. Doing this provides a
+`./config/autoload/{,*.}{global,local}.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/config/autoload/global.config.php b/config/autoload/global.config.php
deleted file mode 100644
index b03c0c4..0000000
--- a/config/autoload/global.config.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/global.php b/config/autoload/global.php
new file mode 100644
index 0000000..b03c0c4
--- /dev/null
+++ b/config/autoload/global.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
deleted file mode 100644
index 7862eba..0000000
--- a/config/autoload/local.config.php.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/config/autoload/local.php.dist b/config/autoload/local.php.dist
new file mode 100644
index 0000000..7862eba
--- /dev/null
+++ b/config/autoload/local.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/vendor/ZendFramework b/vendor/ZendFramework
index 93d3c42..5cc6522 160000
--- a/vendor/ZendFramework
+++ b/vendor/ZendFramework
@@ -1 +1 @@
-Subproject commit 93d3c423f23e5bd9731b97a4bb1a9da7e06933ba
+Subproject commit 5cc65225ef195722fe82fe5991ffda8042a818cd