Merge branch 'hotfix/#6628-add-missing-java-properties-config-reader-…

…plugin' into develop Close #6628 Forward port #6628
zendframework · Dec 8, 2014 · b0f7a18 · b0f7a18
2 parents 237473c + 252154b
commit b0f7a18
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/library/Zend/Config/Factory.php b/library/Zend/Config/Factory.php
@@ -34,10 +34,11 @@ class Factory
      * @var array
      */
     protected static $extensions = array(
-        'ini'  => 'ini',
-        'json' => 'json',
-        'xml'  => 'xml',
-        'yaml' => 'yaml',
+        'ini'         => 'ini',
+        'json'        => 'json',
+        'xml'         => 'xml',
+        'yaml'        => 'yaml',
+        'properties'  => 'javaproperties',
     );
 
     /**

diff --git a/library/Zend/Config/ReaderPluginManager.php b/library/Zend/Config/ReaderPluginManager.php
@@ -19,10 +19,11 @@ class ReaderPluginManager extends AbstractPluginManager
      * @var array
      */
     protected $invokableClasses = array(
-        'ini'  => 'Zend\Config\Reader\Ini',
-        'json' => 'Zend\Config\Reader\Json',
-        'xml'  => 'Zend\Config\Reader\Xml',
-        'yaml' => 'Zend\Config\Reader\Yaml',
+        'ini'             => 'Zend\Config\Reader\Ini',
+        'json'            => 'Zend\Config\Reader\Json',
+        'xml'             => 'Zend\Config\Reader\Xml',
+        'yaml'            => 'Zend\Config\Reader\Yaml',
+        'javaproperties'  => 'Zend\Config\Reader\JavaProperties',
     );
 
     /**