Merge a94fee9 into 93b69ea

zendframework · Jun 8, 2019 · 9cc0d8e · 9cc0d8e
2 parents 93b69ea + a94fee9
commit 9cc0d8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file, in reverse
 - [#58](https://github.com/zendframework/zend-config/pull/58) adds
   `$processSections` to INI reader, allowing control over whether sections
   should be parsed or not
+- [#63](https://github.com/zendframework/zend-config/pull/63) adds .yml to
+  Zend\Config\Factory as an alternative extension for yaml
 
 ### Changed
 

diff --git a/src/Factory.php b/src/Factory.php
@@ -37,6 +37,7 @@ class Factory
         'json'        => 'json',
         'xml'         => 'xml',
         'yaml'        => 'yaml',
+        'yml'         => 'yaml',
         'properties'  => 'javaproperties',
     ];
 
@@ -52,6 +53,7 @@ class Factory
         'json' => 'json',
         'xml'  => 'xml',
         'yaml' => 'yaml',
+        'yml' => 'yaml',
     ];
 
     /**