This repository has been archived by the owner on Jan 29, 2020. It is now read-only.
Fixed merge order of config files on FreeBSD-based systems #14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@weierophinney Is this going to get merged soon? Took me all day to figure out why my app decided to stop working. Managed to trace it down to this issue. |
weierophinney
added a commit
that referenced
this pull request
Nov 6, 2017
Fixed merge order of config files on FreeBSD-based systems Conflicts: composer.lock
weierophinney
added a commit
that referenced
this pull request
Nov 6, 2017
|
Thanks, @kynx. Merged to master; will release shortly. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an alternative to #13. As noted on that PR, on FreeBSD-based systems - including macOS highSierra - the libc glob function now sorts all the results before returning them, instead of returning the results in brace pattern order (as glibc does).
This PR doesn't suffer from the potential BC-break if people are relying on the order of config results within a brace expression (ie counting on
a.global.phpbeing merged beforeb.global.php).To do this it passes the
$forceFallbackparam toZend\Stdlib\Glob::glob()so the brace order is controlled in userland. To ensure this always happens it addszendframework/zend-stdlibas a dependency.