Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/14' into develop
Browse files Browse the repository at this point in the history
Forward port #14
  • Loading branch information
weierophinney committed Nov 6, 2017
2 parents 2ebf738 + 50e0392 commit 059f3a6
Show file tree
Hide file tree
Showing 5 changed files with 151 additions and 168 deletions.
23 changes: 4 additions & 19 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 1.1.0 - TBD

### Added

- Nothing.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- Nothing.

## 1.0.1 - TBD

### Added
Expand All @@ -36,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#14](https://github.com/zendframework/zend-config-aggregator/pull/14) fixes
how file globbing of configuration files works on FreeBSD and IBM i Series
systems. It does so by adding a dependency on zend-stdlib, which provides a
glob compatibility layer.

## 1.0.0 - 2017-04-24

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
}
},
"require": {
"php": "^5.6 || ^7.0"
"php": "^5.6 || ^7.0",
"zendframework/zend-stdlib": "^2.7.7 || ^3.1.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7.21 || ^6.3",
Expand All @@ -27,7 +28,6 @@
"mikey179/vfsStream": "^1.6"
},
"suggest": {
"zendframework/zend-stdlib": "Allows removing configuration keys and globbing on Windows platform",
"zendframework/zend-config": "Allows loading configuration from XML, INI, YAML, and JSON files"
},
"autoload": {
Expand Down
Loading

0 comments on commit 059f3a6

Please sign in to comment.