Respect an existing user-managed AdditionalConfiguration.php, fixes #1053 #1140
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
andrewfrench
force-pushed
the
2018-09-28_typo3-config
branch
from
88b498a
to
1a7b5f9
Compare
rfay
approved these changes
Oct 1, 2018
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.
The Problem/Issue/Bug:
Our documentation claimed that we'd only write an AdditionalConfiguration.php when the file either didn't exist or was ddev-managed, but that wasn't the case.
How this PR Solves The Problem:
If AdditionalConfiguration.php exists, ddev will now check that the file is ddev-managed by ensuring the usual ddev file signature exists.
Manual Testing Instructions:
Use #1053's issue recreation method to ensure that a user-managed AdditionalConfiguration.php is respected and that a warning is emitted to the user indicating this:
composer create-project typo3/cms-base-distribution my-typo3-site ^8cd my-typo3-siteecho "<?php" > public/typo3conf/AdditionalConfiguration.phpddev configNow, ensure ddev can create the config file in the usual case:
rm public/typo3conf/AdditionalConfiguration.phpddev configAdditionalConfiguration.php should have been generated by ddev.
Automated Testing Overview:
Related Issue Link(s):
#1053
Release/Deployment notes: