Add configuration for typo3 mail and errors, default to php 7.2, fixes …

…#924 (#954)
ddev · Jul 4, 2018 · 05111dc · 05111dc
1 parent 75e91c4
commit 05111dc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/pkg/ddevapp/apptypes.go b/pkg/ddevapp/apptypes.go
@@ -69,7 +69,7 @@ func init() {
 			createWordpressSettingsFile, getWordpressUploadDir, getWordpressHooks, setWordpressSiteSettingsPaths, isWordpressApp, wordpressPostImportDBAction, nil, nil, nil,
 		},
 		"typo3": {
-			createTypo3SettingsFile, getTypo3UploadDir, getTypo3Hooks, setTypo3SiteSettingsPaths, isTypo3App, nil, nil, nil, nil,
+			createTypo3SettingsFile, getTypo3UploadDir, getTypo3Hooks, setTypo3SiteSettingsPaths, isTypo3App, nil, typo3ConfigOverrideAction, nil, nil,
 		},
 		"backdrop": {
 			createBackdropSettingsFile, getBackdropUploadDir, getBackdropHooks, setBackdropSiteSettingsPaths, isBackdropApp, backdropPostImportDBAction, nil, nil, nil,

diff --git a/pkg/ddevapp/typo3.go b/pkg/ddevapp/typo3.go
@@ -25,7 +25,17 @@ $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default'] = array_merge($GLOBA
                     'password' => 'db',
                     'port' => '3306',
                     'user' => 'db',
-]);`
+]);
+
+// This mail configuration sends all emails to mailhog
+$GLOBALS['TYPO3_CONF_VARS']['MAIL'] = [
+    'transport' => 'smtp',
+    'transport_smtp_server' => 'localhost:1025',
+];
+
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['devIPmask'] = '*';
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['displayErrors'] = 1;
+`
 
 // createTypo3SettingsFile creates the app's LocalConfiguration.php and
 // AdditionalConfiguration.php, adding things like database host, name, and
@@ -123,3 +133,9 @@ func isTypo3App(app *DdevApp) bool {
 	}
 	return false
 }
+
+// typo3ConfigOverrideAction sets a safe php_version for TYPO3
+func typo3ConfigOverrideAction(app *DdevApp) error {
+	app.PHPVersion = "7.2"
+	return nil
+}