Update bootstrap to check non-hidden config files #5748
Merged
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
|
Huzzah! 🎊🎉 |
|
|
||
| // An extra handler if a PHP bootstrap is provided, allow the bootstrap file to return | ||
| // a pre-initialized Bolt Application rather than the config array. | ||
| if (is_array($php)) { |
There was a problem hiding this comment.
PHP isn't defined for all paths … Travis go bye bye
There was a problem hiding this comment.
Travis the fascist.
| } | ||
|
|
||
| // An extra handler if a PHP bootstrap is provided, allow the bootstrap file to return | ||
| // a pre-initialized Bolt Application rather than the config array. |
There was a problem hiding this comment.
This is already allowed below though?
<?php
return [
'application' => $myApp
];
|
Should bolt/composer-install be updated as well? |
|
As discussed in the dev-meeting: Merging in for 3.2, so we can test and bugfix before release! See https://github.com/bolt/bolt/wiki/Dev-meeting-2016-09-20 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As discussed in #5729 Check for alternative non-dot versions of
.bolt.ymland.bolt.php.There's an additional minor improvement here and that allows a
bolt.phpfile to just return a pre-constructed application rather than array. This is optional but simplifies the flow of php bootstrap files that will normally take care of creating an instance ofBolt\Application.