From 853de300a3d85827015ca25131b6efdc31c4285a Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 7 Aug 2019 15:22:03 +0100
Subject: [PATCH] DevelopmentSettings: Clarify grouping of settings and purpose

Change-Id: Ia0fc063eb2679b466e19e6dabaf1f4bea7d6bb20
---
 includes/DevelopmentSettings.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/includes/DevelopmentSettings.php b/includes/DevelopmentSettings.php
index 103ff45bbf..d93caa7dea 100644
--- a/includes/DevelopmentSettings.php
+++ b/includes/DevelopmentSettings.php
@@ -24,8 +24,9 @@ ini_set( 'display_errors', 1 );
 /**
  * Debugging for MediaWiki
  */
+
 global $wgDevelopmentWarnings, $wgShowExceptionDetails, $wgShowHostnames,
-	$wgDebugRawPage, $wgSQLMode, $wgCommandLineMode, $wgDebugLogFile,
+	$wgDebugRawPage, $wgCommandLineMode, $wgDebugLogFile,
 	$wgDBerrorLog, $wgDebugLogGroups;
 
 // Use of wfWarn() should cause tests to fail
@@ -36,9 +37,6 @@ $wgShowExceptionDetails = true;
 $wgShowHostnames = true;
 $wgDebugRawPage = true; // T49960
 
-// Enable MariaDB/MySQL strict mode
-$wgSQLMode = 'TRADITIONAL';
-
 // Enable log files
 $logDir = getenv( 'MW_LOG_DIR' );
 if ( $logDir ) {
@@ -54,9 +52,25 @@ if ( $logDir ) {
 }
 unset( $logDir );
 
+/**
+ * Make testing possible (or easier)
+ */
+
+global $wgRateLimits;
+
 // Disable rate-limiting to allow integration tests to run unthrottled
 // in CI and for devs locally (T225796)
 $wgRateLimits = [];
 
+/**
+ * Experimental changes that may later become the default.
+ * (Must reference a Phabricator ticket)
+ */
+
+global $wgSQLMode, $wgLegacyJavaScriptGlobals;
+
+// Enable MariaDB/MySQL strict mode (T108255)
+$wgSQLMode = 'TRADITIONAL';
+
 // Disable legacy javascript globals in CI and for devs (T72470)
 $wgLegacyJavaScriptGlobals = false;
-- 
2.20.1