From f9a5787fc98fb4594dd61bc5acc16ac9dfee808b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Wed, 12 Jul 2017 11:03:36 +0200
Subject: [PATCH 1/3] [ticket/15269] Set development environment and enable all
 debugs with vagrant

PHPBB3-15269
---
 vagrant/after.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/vagrant/after.sh b/vagrant/after.sh
index 9526698593..1a14adc109 100755
--- a/vagrant/after.sh
+++ b/vagrant/after.sh
@@ -32,7 +32,16 @@ then
 fi
 
 # Add DEBUG mode to phpBB to remove annoying installer warnings
-sed -i "$ a @define('DEBUG', true);" ${PHPBB_CONFIG}
+echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG}
+
+# Change environment to development
+sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG}
+
+# Display load time
+sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/\/\/[[:blank:]]*//' ${PHPBB_CONFIG}
+
+# Enable debug container
+sed -i '/^.*DEBUG_CONTAINER.*$/s/\/\/[[:blank:]]*//' ${PHPBB_CONFIG}
 
 # Update the PHP memory limits (enough to allow phpunit tests to run)
 sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/7.1/fpm/php.ini

From 2a31978aff377a1cf5c24458e207462af78f4609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Wed, 12 Jul 2017 11:51:57 +0200
Subject: [PATCH 2/3] [ticket/15269] Remove comment only if is the beginning of
 a line

PHPBB3-15269
---
 vagrant/after.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vagrant/after.sh b/vagrant/after.sh
index 1a14adc109..63503d9981 100755
--- a/vagrant/after.sh
+++ b/vagrant/after.sh
@@ -38,10 +38,10 @@ echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG}
 sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG}
 
 # Display load time
-sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/\/\/[[:blank:]]*//' ${PHPBB_CONFIG}
+sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/^\/\/[[:blank:]]*//' ${PHPBB_CONFIG}
 
 # Enable debug container
-sed -i '/^.*DEBUG_CONTAINER.*$/s/\/\/[[:blank:]]*//' ${PHPBB_CONFIG}
+sed -i '/^.*DEBUG_CONTAINER.*$/s/^\/\/[[:blank:]]*//' ${PHPBB_CONFIG}
 
 # Update the PHP memory limits (enough to allow phpunit tests to run)
 sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/7.1/fpm/php.ini

From 60f175046dff3c7ee9d51b88401902f4b6b708dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Mon, 17 Jul 2017 21:09:35 +0200
Subject: [PATCH 3/3] [ticket/15269] Don't enable DEBUG_CONTAINER by default

PHPBB3-15269
---
 vagrant/after.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vagrant/after.sh b/vagrant/after.sh
index 63503d9981..909d2d51f7 100755
--- a/vagrant/after.sh
+++ b/vagrant/after.sh
@@ -40,9 +40,6 @@ sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG}
 # Display load time
 sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/^\/\/[[:blank:]]*//' ${PHPBB_CONFIG}
 
-# Enable debug container
-sed -i '/^.*DEBUG_CONTAINER.*$/s/^\/\/[[:blank:]]*//' ${PHPBB_CONFIG}
-
 # Update the PHP memory limits (enough to allow phpunit tests to run)
 sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/7.1/fpm/php.ini