[prep-release-3.2.0-b1] Updates changelog

PHPBB3-14453

build/build.xml

@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.2.0-a1" />
-	<property name="prevversion" value="3.1.6" />
-	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5" />
+	<property name="newversion" value="3.2.0-b1" />
+	<property name="prevversion" value="3.2.0-a2" />
+	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.2.0-a1" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -303,9 +303,25 @@
 
 	<target name="clean-vendor-dir">
 		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
+		<delete dir="${dir}/vendor/bantu/ini-get-wrapper/tests" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.gitignore" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.scrutinizer.yml" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.travis.yml" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/phpunit.xml.dist" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/README.md" />
+
+		<delete dir="${dir}/vendor/google/recaptcha/examples" />
+		<delete dir="${dir}/vendor/google/recaptcha/tests" />
+		<delete file="${dir}/vendor/google/recaptcha/.gitignore" />
+		<delete file="${dir}/vendor/google/recaptcha/.travis.yml" />
+		<delete file="${dir}/vendor/google/recaptcha/CONTRIBUTING.md" />
+		<delete file="${dir}/vendor/google/recaptcha/phpunit.xml.dist" />
+		<delete file="${dir}/vendor/google/recaptcha/README.md" />
+
 		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
 		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
+		<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
@@ -391,12 +407,19 @@
 		<delete file="${dir}/vendor/symfony/routing/README.md" />
 		<delete file="${dir}/vendor/symfony/routing/phpunit.xml.dist" />
 
+		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/Tests" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/.gitignore" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/README.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/phpunit.xml.dist" />
+
 		<delete dir="${dir}/vendor/symfony/yaml/.git" />
-		<delete dir="${dir}/vendor/symfony/yaml/Symfony/Tests" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/.gitignore" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/README.md" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/phpunit.xml.dist" />
+		<delete dir="${dir}/vendor/symfony/yaml/Tests" />
+		<delete file="${dir}/vendor/symfony/yaml/.gitignore" />
+		<delete file="${dir}/vendor/symfony/yaml/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/yaml/README.md" />
+		<delete file="${dir}/vendor/symfony/yaml/phpunit.xml.dist" />
 
 		<delete dir="${dir}/vendor/twig/twig/doc" />
 		<delete dir="${dir}/vendor/twig/twig/ext" />
@@ -404,38 +427,9 @@
 		<delete file="${dir}/vendor/twig/twig/.editorconfig" />
 		<delete file="${dir}/vendor/twig/twig/.gitignore" />
 		<delete file="${dir}/vendor/twig/twig/.travis.yml" />
-		<delete file="${dir}/vendor/twig/twig/AUTHORS" />
 		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
 		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/twig/twig/README.markdown" />
-
-		<delete dir="${dir}/vendor/symfony/security-core/.git" />
-		<delete dir="${dir}/vendor/symfony/security-core/Core/Tests" />
-		<delete file="${dir}/vendor/symfony/security-core/Core/.gitignore" />
-		<delete file="${dir}/vendor/symfony/security-core/Core/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/security-core/Core/README.md" />
-		<delete file="${dir}/vendor/symfony/security-core/Core/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/security-csrf/.git" />
-		<delete dir="${dir}/vendor/symfony/security-csrf/Csrf/Tests" />
-		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/.gitignore" />
-		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/README.md" />
-		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/README.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/security/.git" />
-		<delete dir="${dir}/vendor/symfony/security/Tests" />
-		<delete file="${dir}/vendor/symfony/security/.gitignore" />
-		<delete file="${dir}/vendor/symfony/security/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/security/README.md" />
-		<delete file="${dir}/vendor/symfony/security/phpunit.xml.dist" />
+		<delete file="${dir}/vendor/twig/twig/README.rst" />
 	</target>
 
 	<target name="clean-diff-dir">

build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php

@@ -87,6 +87,11 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 				$old_simple_statement = $simple_statement;
 
 				$simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1));
+
+				if ($simple_class_name_start === false) {
+					continue;
+				}
+
 				$simple_class_name_end = $phpcsFile->findNext($find, ($simple_statement + 1), null, true);
 
 				$simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start)));

phpBB/adm/style/acp_ban.html

@@ -52,7 +52,7 @@
 	<legend>{L_TITLE}</legend>
 <dl>
 	<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>
-	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
+	<dd><!-- EVENT acp_ban_cell_prepend --><textarea name="ban" cols="40" rows="3" id="ban"></textarea><!-- EVENT acp_ban_cell_append --></dd>
 	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
 </dl>
 <dl>

phpBB/adm/style/acp_email.html

@@ -19,12 +19,14 @@
 	<legend>{L_COMPOSE}</legend>
 <dl>
 	<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>
+	<!-- EVENT acp_email_group_options_prepend -->
 	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
+	<!-- EVENT acp_email_group_options_append -->
 </dl>
 <dl>
 	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd><!-- EVENT acp_email_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_email_find_username_append --></dd>
 </dl>
 <dl>
 	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>

phpBB/adm/style/acp_forums.html

@@ -498,7 +498,7 @@
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
 
-		<input class="button2" type="submit" value="{L_GO}" />
+		<!-- EVENT acp_forums_quick_select_button_prepend --><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_forums_quick_select_button_append -->
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>

phpBB/adm/style/acp_groups.html

@@ -236,7 +236,7 @@
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd><!-- EVENT acp_groups_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_groups_find_username_append --></dd>
 	</dl>
 
 	<p class="quick">
@@ -265,12 +265,14 @@
 
 	<form id="acp_groups" method="post" action="{U_ACTION}">
 
+	<!-- EVENT acp_groups_manage_before -->
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
+		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -280,11 +282,12 @@
 		<!-- IF groups.S_SPECIAL -->
 		<!-- IF groups.S_FIRST_ROW -->
 			<tr>
-				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
+				<td colspan="6" class="row3">{L_NO_GROUPS_CREATED}</td>
 			</tr>
 		<!-- ENDIF -->
 	</tbody>
 	</table>
+	<!-- EVENT acp_groups_manage_after -->
 
 	<fieldset class="quick">
 		<!-- IF S_GROUP_ADD -->
@@ -300,11 +303,12 @@
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
 
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
+		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -314,6 +318,7 @@
 		<tr>
 			<td><strong>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
+			<td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
 			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
 			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>

phpBB/adm/style/acp_groups_position.html

@@ -65,8 +65,10 @@
 					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
 				<!-- END add_legend -->
 			</select>
+			<!-- EVENT acp_groups_position_legend_add_button_before -->
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
+			<!-- EVENT acp_groups_position_legend_add_button_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
@@ -162,8 +164,10 @@
 					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
 				<!-- END add_teampage -->
 			</select>
+			<!-- EVENT acp_groups_position_teampage_add_button_before -->
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
+			<!-- EVENT acp_groups_position_teampage_add_button_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>

phpBB/adm/style/acp_logs.html

@@ -73,7 +73,7 @@
 <!-- IF S_SHOW_FORUMS -->
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
-		<input class="button2" type="submit" value="{L_GO}" />
+		<!-- EVENT acp_logs_quick_select_forum_button_prepend --><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_logs_quick_select_forum_button_append -->
 	</fieldset>
 <!-- ENDIF -->
 

phpBB/adm/style/acp_main.html

@@ -146,7 +146,7 @@
 	<!-- IF S_VERSIONCHECK -->
 		<td>{L_BOARD_VERSION}{L_COLON} </td>
 		<td>
-			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 		</td>
 	<!-- ENDIF -->
 	<!-- IF S_TOTAL_ORPHAN -->

phpBB/adm/style/acp_permissions.html

@@ -30,7 +30,7 @@
 			<legend>{L_LOOK_UP_FORUM}</legend>
 			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
 		<dl>
-			<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+			<dt><!-- EVENT acp_permissions_select_multiple_forum_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_multiple_forum_append --></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
 			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
 		</dl>
@@ -52,7 +52,7 @@
 				<legend>{L_LOOK_UP_FORUM}</legend>
 				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
 			<dl>
-				<dt><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+				<dt><!-- EVENT acp_permissions_select_forum_prepend --><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_forum_append --></dt>
 				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
 			</dl>
 
@@ -95,7 +95,7 @@
 		<fieldset>
 			<legend>{L_LOOK_UP_GROUP}</legend>
 		<dl>
-			<dt><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
+			<dt><!-- EVENT acp_permissions_select_group_prepend --><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label><!-- EVENT acp_permissions_select_group_append --></dt>
 			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
 		</dl>
 
@@ -140,7 +140,7 @@
 				<p>{L_USERNAMES_EXPLAIN}</p>
 			<dl>
 				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+				<dd class="full" style="text-align: left;"><!-- EVENT acp_permissions_find_username_prepend --><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><!-- EVENT acp_permissions_find_username_append --><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>
 
@@ -183,7 +183,7 @@
 			<fieldset>
 				<legend>{L_ADD_GROUPS}</legend>
 			<dl>
-				<dd class="full"><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<dd class="full"><!-- EVENT acp_permissions_add_group_options_prepend --><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select><!-- EVENT acp_permissions_add_group_options_append --></dd>
 			</dl>
 			</fieldset>
 
@@ -267,7 +267,9 @@
 				<legend>{L_LOOK_UP_GROUP}</legend>
 			<dl>
 				<dt><label for="group_select">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
+				<!-- EVENT acp_permissions_select_group_before -->
 				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<!-- EVENT acp_permissions_select_group_after -->
 				<dd>&nbsp;</dd>
 			</dl>
 			</fieldset>

phpBB/adm/style/acp_prune_forums.html

@@ -43,7 +43,7 @@
 		<legend>{L_SELECT_FORUM}</legend>
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 	<dl>
-		<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+		<dt><!-- EVENT acp_prune_forums_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_prune_forums_append --></dt>
 		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
 	</dl>

phpBB/adm/style/acp_prune_users.html

@@ -50,7 +50,7 @@
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd><!-- EVENT acp_prune_users_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_prune_users_find_username_append --></dd>
 </dl>
 </fieldset>
 

phpBB/adm/style/acp_users.html

@@ -146,7 +146,9 @@
 
 	<!-- IF S_GROUP_OPTIONS -->
 		<fieldset class="quick">
+			<!-- EVENT acp_users_select_group_before -->
 			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			<!-- EVENT acp_users_select_group_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	<!-- ENDIF -->

phpBB/adm/style/acp_users_prefs.html

@@ -52,7 +52,7 @@
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
+		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="64" /></div></dd>
 	</dl>
 	<!-- EVENT acp_users_prefs_personal_append -->
 	</fieldset>

phpBB/adm/style/admin.css

@@ -2554,6 +2554,7 @@ fieldset.permissions .padding {
 #progress-bar {
 	position: relative;
 	width: 90%;
+	text-align: center;
 	height: 25px;
 	margin: 20px auto;
 	border: 1px solid #cecece;
@@ -2563,9 +2564,7 @@ fieldset.permissions .padding {
 	position: absolute;
 	top: 0;
 	width: 100%;
-	text-align: center;
-	line-height: 25px;
-	font-weight: bold;
+	color: #000;
 }
 
 #progress-bar #progress-bar-filler {
@@ -2576,4 +2575,11 @@ fieldset.permissions .padding {
 	background-color: #3c84ad;
 	width: 0;
 	height: 25px;
+	overflow: hidden;
+	color: #fff;
+}
+
+#progress-bar p {
+	line-height: 25px;
+	font-weight: bold;
 }

phpBB/adm/style/installer_convert.html

@@ -0,0 +1,87 @@
+<!-- INCLUDE installer_header.html -->
+<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
+<!-- IF S_ERROR_BOX -->
+<div class="errorbox">
+	<h3>{ERROR_TITLE}</h3>
+	<p>{ERROR_MSG}</p>
+</div>
+<!-- ENDIF -->
+<!-- IF .errors -->
+<div id="error-container">
+<!-- BEGIN errors -->
+	<strong>{errors.TITLE}</strong>
+	<!-- IF errors.DESCRIPTION --><p>{errors.DESCRIPTION}</p><!-- ENDIF -->
+<!-- END errors -->
+</div>
+<!-- ENDIF -->
+<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
+<!-- IF CONTENT -->{CONTENT}<!-- ENDIF -->
+<!-- IF S_CONV_IN_PROGRESS -->
+<p class="centered-text"><a href="{U_ACTION}" class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->"<!-- IF S_REFRESH --> onclick="return false;"<!-- ENDIF -->>{L_SUBMIT}</a></p>
+<!-- ENDIF -->
+<!-- IF S_CONTINUE -->
+<div id="download-wrapper" class="download-box">
+	<p class="centered-text">
+		<a href="{U_NEW_ACTION}" class="button1">{L_CONVERT_NEW_CONVERSION}</a>
+		<a href="{U_CONTINUE_ACTION}" class="button1">{L_CONTINUE_OLD_CONVERSION}</a>
+	</p>
+</div>
+<!-- ENDIF -->
+<!-- IF S_LIST -->
+<table class="table1">
+	<caption>{L_AVAILABLE_CONVERTORS}</caption>
+	<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+	<thead>
+	<tr>
+		<th>{L_SOFTWARE}</th>
+		<th>{L_VERSION}</th>
+		<th>{L_AUTHOR}</th>
+		<th>{L_CONVERT_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .convertors -->
+	<!-- BEGIN convertors -->
+	<tr>
+		<td>{convertors.SOFTWARE}</td>
+		<td>{convertors.VERSION}</td>
+		<td>{convertors.AUTHOR}</td>
+		<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
+	</tr>
+	<!-- END convertors -->
+	<!-- ELSE -->
+	<tr>
+		<td>{L_NO_CONVERTORS}</td>
+		<td>-</td>
+		<td>-</td>
+		<td>-</td>
+	</tr>
+	<!-- ENDIF -->
+	</tbody>
+</table>
+<!-- ENDIF -->
+<!-- IF .checks -->
+<fieldset>
+
+	<!-- BEGIN checks -->
+	<!-- IF checks.S_LEGEND -->
+	<!-- IF not checks.S_FIRST_ROW -->
+</fieldset>
+
+<fieldset>
+	<!-- ENDIF -->
+	<legend>{checks.LEGEND}</legend>
+	<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+	<!-- ELSE -->
+
+	<dl>
+		<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+		<dd>{checks.RESULT}</dd>
+	</dl>
+	<!-- ENDIF -->
+	<!-- END checks -->
+
+</fieldset>
+<!-- ENDIF -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_footer.html

@@ -12,8 +12,8 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 

phpBB/adm/style/installer_header.html

@@ -6,7 +6,7 @@
 	<!-- IF META -->{META}<!-- ENDIF -->
 	<title>{PAGE_TITLE}</title>
 
-	<link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">

phpBB/adm/style/installer_install.html

@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_update.html

@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_update_file_status.html

@@ -4,7 +4,7 @@
 <p>{L_FILES_DELETED_EXPLAIN}</p>
 
 <fieldset id="deleted">
-	<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
 	<!-- BEGIN deleted -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt>
@@ -20,7 +20,7 @@
 <p>{L_FILES_CONFLICT_EXPLAIN}</p>
 
 <fieldset id="conflict">
-	<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
 	<!-- BEGIN conflict -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt>
@@ -36,7 +36,7 @@
 <p>{L_FILES_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="modified">
-	<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
 	<!-- BEGIN modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt>
@@ -52,7 +52,7 @@
 <p>{L_FILES_NEW_EXPLAIN}</p>
 
 <fieldset id="new_files" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_new.gif" alt="{L_STATUS_NEW}" /></legend>
 	<!-- BEGIN new -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong>
@@ -69,7 +69,7 @@
 <p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="not_modified" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
 	<!-- BEGIN not_modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt>

phpBB/adm/style/overall_footer.html

@@ -34,7 +34,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->

phpBB/adm/style/overall_header.html

@@ -49,7 +49,7 @@ function marklist(id, name, state)
 	}
 
 	var rb = parent.getElementsByTagName('input');
-	
+
 	for (var r = 0; r < rb.length; r++)
 	{
 		if (rb[r].name.substr(0, name.length) == name)
@@ -103,7 +103,7 @@ function popup(url, width, height, name)
 		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 	</div>
-	
+
 	<div id="page-body">
 		<div id="tabs">
 			<ul>
@@ -120,7 +120,7 @@ function popup(url, width, height, name)
 						<!-- DEFINE $LI_USED = 0 -->
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
-	
+
 						<!-- BEGIN l_block2 -->
 							<!-- IF .l_block1.l_block2.l_block3 -->
 							<!-- IF $LI_USED --></ul></div><!-- ENDIF -->
@@ -129,13 +129,13 @@ function popup(url, width, height, name)
 								<ul>
 							<!-- DEFINE $LI_USED = 1 -->
 							<!-- ENDIF -->
-	
+
 							<!-- BEGIN l_block3 -->
 								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
 								<!-- DEFINE $LI_USED = 1 -->
 							<!-- END l_block3 -->
 						<!-- END l_block2 -->
-						
+
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
 						<!-- IF $LI_USED -->
@@ -143,6 +143,13 @@ function popup(url, width, height, name)
 							</div>
 						<!-- ENDIF -->
 					</div>
-	
+
 					<div id="main">
 						<div class="main">
+							{% if CONTAINER_EXCEPTION !== false %}
+							<div class="errorbox">
+								<p>{{ lang('CONTAINER_EXCEPTION') }}</p><br />
+								<p>{{ lang('EXCEPTION') }}{{ lang('COLON') }} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
+								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
+							</div>
+							{% endif %}

phpBB/adm/style/permission_forum_copy.html

@@ -12,7 +12,7 @@
 		<legend>{L_LOOK_UP_FORUM}</legend>
 
 		<dl>
-			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+			<dt><!-- EVENT acp_permission_forum_copy_src_forum_prepend --><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span><!-- EVENT acp_permission_forum_copy_src_forum_append --></dt>
 			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
@@ -22,7 +22,7 @@
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 
 		<dl>
-			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+			<dt><!-- EVENT acp_permission_forum_copy_dest_forum_prepend --><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span><!-- EVENT acp_permission_forum_copy_dest_forum_append --></dt>
 			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>

phpBB/adm/style/simple_footer.html

@@ -17,7 +17,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->

phpBB/assets/javascript/core.js

@@ -306,6 +306,10 @@ phpbb.ajaxify = function(options) {
 					alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
 				} else {
 					$dark.fadeOut(phpbb.alertTime);
+
+					if ($loadingIndicator) {
+						$loadingIndicator.fadeOut(phpbb.alertTime);
+					}
 				}
 
 				if (typeof phpbb.ajaxCallbacks[callback] === 'function') {

phpBB/assets/javascript/installer.js

@@ -177,7 +177,7 @@
 	 * @param progressObject
 	 */
 	function setProgress(progressObject) {
-		var $statusText, $progressBar, $progressText, $progressFiller;
+		var $statusText, $progressBar, $progressText, $progressFiller, $progressFillerText;
 
 		if (progressObject.task_name.length) {
 			if (!progressBarTriggered) {
@@ -189,27 +189,34 @@
 				$progressBar.attr('id', 'progress-bar');
 				$progressText = $('<p />');
 				$progressText.attr('id', 'progress-bar-text');
-				$progressFiller = $('<span />');
+				$progressFiller = $('<div />');
 				$progressFiller.attr('id', 'progress-bar-filler');
+				$progressFillerText = $('<p />');
+				$progressFillerText.attr('id', 'progress-bar-filler-text');
 
 				$statusText = $('<p />');
 				$statusText.attr('id', 'progress-status-text');
 
-				$progressBar.append($progressFiller);
+				$progressFiller.append($progressFillerText);
 				$progressBar.append($progressText);
+				$progressBar.append($progressFiller);
 
 				$progressBarWrapper.append($statusText);
 				$progressBarWrapper.append($progressBar);
 
+				$progressFillerText.css('width', $progressBar.width());
+
 				progressBarTriggered = true;
 			} else if (progressObject.hasOwnProperty('restart')) {
 				clearInterval(progressTimer);
 
 				$progressFiller = $('#progress-bar-filler');
+				$progressFillerText = $('#progress-bar-filler-text');
 				$progressText = $('#progress-bar-text');
 				$statusText = $('#progress-status-text');
 
 				$progressText.text('0%');
+				$progressFillerText.text('0%');
 				$progressFiller.css('width', '0%');
 
 				currentProgress = 0;
@@ -236,6 +243,22 @@
 		}
 	}
 
+	// Redirects user
+	function redirect(url, use_ajax) {
+		if (use_ajax) {
+			resetPolling();
+
+			var xhReq = createXhrObject();
+			xhReq.open('GET', url, true);
+			xhReq.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+			xhReq.send();
+
+			startPolling(xhReq);
+		} else {
+			window.location.href = url;
+		}
+	}
+
 	/**
 	 * Parse messages from the response object
 	 *
@@ -302,6 +325,10 @@
 		if (responseObject.hasOwnProperty('refresh')) {
 			refreshRequested = true;
 		}
+
+		if (responseObject.hasOwnProperty('redirect')) {
+			redirect(responseObject.redirect.url, responseObject.redirect.use_ajax);
+		}
 	}
 
 	/**
@@ -342,15 +369,20 @@
 	 *
 	 * @param $progressText
 	 * @param $progressFiller
+	 * @param $progressFillerText
 	 * @param progressLimit
 	 */
-	function incrementFiller($progressText, $progressFiller, progressLimit) {
+	function incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit) {
 		if (currentProgress >= progressLimit || currentProgress >= 100) {
 			clearInterval(progressTimer);
 			return;
 		}
 
+		var $progressBar = $('#progress-bar');
+
 		currentProgress++;
+		$progressFillerText.css('width', $progressBar.width());
+		$progressFillerText.text(currentProgress + '%');
 		$progressText.text(currentProgress + '%');
 		$progressFiller.css('width', currentProgress + '%');
 	}
@@ -362,13 +394,14 @@
 	 */
 	function incrementProgressBar(progressLimit) {
 		var $progressFiller = $('#progress-bar-filler');
+		var $progressFillerText = $('#progress-bar-filler-text');
 		var $progressText = $('#progress-bar-text');
 		var progressStart = $progressFiller.width() / $progressFiller.offsetParent().width() * 100;
 		currentProgress = Math.floor(progressStart);
 
 		clearInterval(progressTimer);
 		progressTimer = setInterval(function() {
-			incrementFiller($progressText, $progressFiller, progressLimit);
+			incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit);
 		}, 10);
 	}
 

phpBB/bin/phpbbcli.php

@@ -70,6 +70,8 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
 /* @var $user \phpbb\user */
 $user = $phpbb_container->get('user');
+$user->data['user_id'] = ANONYMOUS;
+$user->ip = '127.0.0.1';
 $user->add_lang('acp/common');
 $user->add_lang('cli');
 

phpBB/common.php

@@ -90,8 +90,14 @@ include($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
-// Set PHP error handler to ours
-set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
+if (PHPBB_ENVIRONMENT === 'development')
+{
+	\phpbb\debug\debug::enable();
+}
+else
+{
+	set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
+}
 
 $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
@@ -104,10 +110,17 @@ try
 }
 catch (InvalidArgumentException $e)
 {
-	trigger_error(
-		'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
-		E_USER_ERROR
-	);
+	if (PHPBB_ENVIRONMENT !== 'development')
+	{
+		trigger_error(
+			'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
+			E_USER_ERROR
+		);
+	}
+	else
+	{
+		throw $e;
+	}
 }
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));

phpBB/composer.json

@@ -25,39 +25,41 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
+		"php": ">=5.4,<7.1",
 		"bantu/ini-get-wrapper": "1.0.*",
-	  	"google/recaptcha": "~1.1",
-		"lusitanian/oauth": "0.2.*",
+		"google/recaptcha": "~1.1",
+		"lusitanian/oauth": "^0.8.1",
 		"marc1706/fast-image-size": "1.1.*",
 		"patchwork/utf8": "1.1.*",
-		"php": ">=5.4",
-		"s9e/text-formatter": "dev-release/php5.3",
-		"symfony/config": "2.8.*@dev",
-		"symfony/console": "2.8.*@dev",
-		"symfony/dependency-injection": "2.8.*@dev",
-		"symfony/event-dispatcher": "2.8.*@dev",
-		"symfony/filesystem": "2.8.*@dev",
-		"symfony/finder": "2.8.*@dev",
-		"symfony/http-kernel": "2.8.*@dev",
-		"symfony/routing": "2.8.*@dev",
-		"symfony/security-core": "2.8.*@dev",
-		"symfony/security-csrf": "2.8.*@dev",
-		"symfony/twig-bridge": "2.8.*@dev",
-		"symfony/yaml": "2.8.*@dev",
+		"s9e/text-formatter": "^0.4.2",
+		"symfony/config": "2.8.*",
+		"symfony/console": "2.8.*",
+		"symfony/debug": "2.8.*",
+		"symfony/dependency-injection": "2.8.*",
+		"symfony/event-dispatcher": "2.8.*",
+		"symfony/filesystem": "2.8.*",
+		"symfony/finder": "2.8.*",
+		"symfony/http-foundation": "2.8.*",
+		"symfony/http-kernel": "2.8.*",
+		"symfony/routing": "2.8.*",
+		"symfony/twig-bridge": "2.8.*",
+		"symfony/yaml": "2.8.*",
 		"twig/twig": "1.*"
 	},
 	"require-dev": {
-		"fabpot/goutte": "1.0.*",
+		"fabpot/goutte": "~2.0",
 		"phing/phing": "2.4.*",
 		"phpunit/dbunit": "1.3.*",
 		"phpunit/phpunit": "4.1.*",
 		"sami/sami": "1.*",
 		"squizlabs/php_codesniffer": "2.*",
-		"symfony/browser-kit": "2.8.*@dev",
-		"symfony/css-selector": "2.8.*@dev",
-		"symfony/debug": "2.8.*@dev",
-		"symfony/dom-crawler": "2.8.*@dev",
-		"symfony/http-foundation": "2.8.*@dev",
-		"symfony/process": "2.8.*@dev"
+		"symfony/browser-kit": "2.8.*",
+		"symfony/css-selector": "2.8.*",
+		"symfony/dom-crawler": "2.8.*"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "3.2.x-dev"
+		}
 	}
 }

phpBB/config/default/container/services.yml

@@ -36,41 +36,41 @@ services:
     cache:
         class: phpbb\cache\service
         arguments:
-             - @cache.driver
-             - @config
-             - @dbal.conn
-             - %core.root_path%
-             - %core.php_ext%
+             - '@cache.driver'
+             - '@config'
+             - '@dbal.conn'
+             - '%core.root_path%'
+             - '%core.php_ext%'
 
     cache.driver:
-        class: %cache.driver.class%
+        class: '%cache.driver.class%'
 
     class_loader:
         class: phpbb\class_loader
         arguments:
             - phpbb\
-            - %core.root_path%includes/
-            - %core.php_ext%
+            - '%core.root_path%includes/'
+            - '%core.php_ext%'
         calls:
             - [register, []]
-            - [set_cache, [@cache.driver]]
+            - [set_cache, ['@cache.driver']]
 
     class_loader.ext:
         class: phpbb\class_loader
         arguments:
             - \
-            - %core.root_path%ext/
-            - %core.php_ext%
+            - '%core.root_path%ext/'
+            - '%core.php_ext%'
         calls:
             - [register, []]
-            - [set_cache, [@cache.driver]]
+            - [set_cache, ['@cache.driver']]
 
     config:
         class: phpbb\config\db
         arguments:
-            - @dbal.conn
-            - @cache.driver
-            - %tables.config%
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '%tables.config%'
 
     config.php:
         synthetic: true
@@ -78,37 +78,37 @@ services:
     config_text:
         class: phpbb\config\db_text
         arguments:
-            - @dbal.conn
-            - %tables.config_text%
+            - '@dbal.conn'
+            - '%tables.config_text%'
 
     controller.helper:
         class: phpbb\controller\helper
         arguments:
-            - @template
-            - @user
-            - @config
-            - @symfony_request
-            - @request
-            - @routing.helper
+            - '@template'
+            - '@user'
+            - '@config'
+            - '@symfony_request'
+            - '@request'
+            - '@routing.helper'
 
     controller.resolver:
         class: phpbb\controller\resolver
         arguments:
-            - @service_container
-            - %core.root_path%
-            - @template
+            - '@service_container'
+            - '%core.root_path%'
+            - '@template'
 
     ext.manager:
         class: phpbb\extension\manager
         arguments:
-            - @service_container
-            - @dbal.conn
-            - @config
-            - @filesystem
-            - %tables.ext%
-            - %core.root_path%
-            - %core.php_ext%
-            - @cache.driver
+            - '@service_container'
+            - '@dbal.conn'
+            - '@config'
+            - '@filesystem'
+            - '%tables.ext%'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@cache.driver'
 
     file_downloader:
         class: phpbb\file_downloader
@@ -116,45 +116,45 @@ services:
     file_locator:
         class: phpbb\routing\file_locator
         arguments:
-            - @filesystem
-            - %core.root_path%
+            - '@filesystem'
+            - '%core.root_path%'
 
     group_helper:
         class: phpbb\group\helper
         arguments:
-            - @language
+            - '@language'
 
     log:
         class: phpbb\log\log
         arguments:
-            - @dbal.conn
-            - @user
-            - @auth
-            - @dispatcher
-            - %core.root_path%
-            - %core.adm_relative_path%
-            - %core.php_ext%
-            - %tables.log%
+            - '@dbal.conn'
+            - '@user'
+            - '@auth'
+            - '@dispatcher'
+            - '%core.root_path%'
+            - '%core.adm_relative_path%'
+            - '%core.php_ext%'
+            - '%tables.log%'
 
     path_helper:
         class: phpbb\path_helper
         arguments:
-            - @symfony_request
-            - @filesystem
-            - @request
-            - %core.root_path%
-            - %core.php_ext%
-            - %core.adm_relative_path%
+            - '@symfony_request'
+            - '@filesystem'
+            - '@request'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%core.adm_relative_path%'
 
     plupload:
         class: phpbb\plupload\plupload
         arguments:
-            - %core.root_path%
-            - @config
-            - @request
-            - @user
-            - @php_ini
-            - @mimetype.guesser
+            - '%core.root_path%'
+            - '@config'
+            - '@request'
+            - '@user'
+            - '@php_ini'
+            - '@mimetype.guesser'
 
     upload_imagesize:
         class: FastImageSize\FastImageSize
@@ -163,7 +163,7 @@ services:
         class: phpbb\version_helper
         scope: prototype
         arguments:
-            - @cache
-            - @config
-            - @file_downloader
-            - @user
+            - '@cache'
+            - '@config'
+            - '@file_downloader'
+            - '@user'

phpBB/config/default/container/services_attachment.yml

@@ -3,38 +3,38 @@ services:
         class: phpbb\attachment\delete
         scope: prototype
         arguments:
-            - @config
-            - @dbal.conn
-            - @dispatcher
-            - @filesystem
-            - @attachment.resync
-            - %core.root_path%
+            - '@config'
+            - '@dbal.conn'
+            - '@dispatcher'
+            - '@filesystem'
+            - '@attachment.resync'
+            - '%core.root_path%'
 
     attachment.manager:
         class: phpbb\attachment\manager
         scope: prototype
         arguments:
-            - @attachment.delete
-            - @attachment.resync
-            - @attachment.upload
+            - '@attachment.delete'
+            - '@attachment.resync'
+            - '@attachment.upload'
 
     attachment.resync:
         class: phpbb\attachment\resync
         scope: prototype
         arguments:
-            - @dbal.conn
+            - '@dbal.conn'
 
     attachment.upload:
         class: phpbb\attachment\upload
         scope: prototype
         arguments:
-            - @auth
-            - @cache
-            - @config
-            - @files.upload
-            - @language
-            - @mimetype.guesser
-            - @dispatcher
-            - @plupload
-            - @user
-            - %core.root_path%
+            - '@auth'
+            - '@cache'
+            - '@config'
+            - '@files.upload'
+            - '@language'
+            - '@mimetype.guesser'
+            - '@dispatcher'
+            - '@plupload'
+            - '@user'
+            - '%core.root_path%'

phpBB/config/default/container/services_auth.yml

@@ -7,63 +7,64 @@ services:
     auth.provider_collection:
         class: phpbb\auth\provider_collection
         arguments:
-            - @service_container
-            - @config
+            - '@service_container'
+            - '@config'
         tags:
             - { name: service_collection, tag: auth.provider }
 
     auth.provider.db:
         class: phpbb\auth\provider\db
         arguments:
-            - @dbal.conn
-            - @config
-            - @passwords.manager
-            - @request
-            - @user
-            - @service_container
-            - %core.root_path%
-            - %core.php_ext%
+            - '@dbal.conn'
+            - '@config'
+            - '@passwords.manager'
+            - '@request'
+            - '@user'
+            - '@service_container'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: auth.provider }
 
     auth.provider.apache:
         class: phpbb\auth\provider\apache
         arguments:
-            - @dbal.conn
-            - @config
-            - @passwords.manager
-            - @request
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@dbal.conn'
+            - '@config'
+            - '@passwords.manager'
+            - '@request'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: auth.provider }
 
     auth.provider.ldap:
         class: phpbb\auth\provider\ldap
         arguments:
-            - @dbal.conn
-            - @config
-            - @passwords.manager
-            - @user
+            - '@dbal.conn'
+            - '@config'
+            - '@passwords.manager'
+            - '@user'
         tags:
             - { name: auth.provider }
 
     auth.provider.oauth:
         class: phpbb\auth\provider\oauth\oauth
         arguments:
-            - @dbal.conn
-            - @config
-            - @passwords.manager
-            - @request
-            - @user
-            - %tables.auth_provider_oauth_token_storage%
-            - %tables.auth_provider_oauth_account_assoc%
-            - @auth.provider.oauth.service_collection
-            - %tables.users%
-            - @service_container
-            - %core.root_path%
-            - %core.php_ext%
+            - '@dbal.conn'
+            - '@config'
+            - '@passwords.manager'
+            - '@request'
+            - '@user'
+            - '%tables.auth_provider_oauth_token_storage%'
+            - '%tables.auth_provider_oauth_states%'
+            - '%tables.auth_provider_oauth_account_assoc%'
+            - '@auth.provider.oauth.service_collection'
+            - '%tables.users%'
+            - '@service_container'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: auth.provider }
 
@@ -71,30 +72,30 @@ services:
     auth.provider.oauth.service_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: auth.provider.oauth.service }
 
     auth.provider.oauth.service.bitly:
         class: phpbb\auth\provider\oauth\service\bitly
         arguments:
-            - @config
-            - @request
+            - '@config'
+            - '@request'
         tags:
             - { name: auth.provider.oauth.service }
 
     auth.provider.oauth.service.facebook:
         class: phpbb\auth\provider\oauth\service\facebook
         arguments:
-            - @config
-            - @request
+            - '@config'
+            - '@request'
         tags:
             - { name: auth.provider.oauth.service }
 
     auth.provider.oauth.service.google:
         class: phpbb\auth\provider\oauth\service\google
         arguments:
-            - @config
-            - @request
+            - '@config'
+            - '@request'
         tags:
             - { name: auth.provider.oauth.service }

phpBB/config/default/container/services_avatar.yml

@@ -2,26 +2,26 @@ services:
     avatar.manager:
         class: phpbb\avatar\manager
         arguments:
-            - @config
-            - @avatar.driver_collection
+            - '@config'
+            - '@avatar.driver_collection'
 
 # ----- Avatar drivers -----
     avatar.driver_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: avatar.driver }
 
     avatar.driver.gravatar:
         class: phpbb\avatar\driver\gravatar
         arguments:
-            - @config
-            - @upload_imagesize
-            - %core.root_path%
-            - %core.php_ext%
-            - @path_helper
-            - @cache.driver
+            - '@config'
+            - '@upload_imagesize'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@path_helper'
+            - '@cache.driver'
         calls:
             - [set_name, [avatar.driver.gravatar]]
         tags:
@@ -30,12 +30,12 @@ services:
     avatar.driver.local:
         class: phpbb\avatar\driver\local
         arguments:
-            - @config
-            - @upload_imagesize
-            - %core.root_path%
-            - %core.php_ext%
-            - @path_helper
-            - @cache.driver
+            - '@config'
+            - '@upload_imagesize'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@path_helper'
+            - '@cache.driver'
         calls:
             - [set_name, [avatar.driver.local]]
         tags:
@@ -44,12 +44,12 @@ services:
     avatar.driver.remote:
         class: phpbb\avatar\driver\remote
         arguments:
-            - @config
-            - @upload_imagesize
-            - %core.root_path%
-            - %core.php_ext%
-            - @path_helper
-            - @cache.driver
+            - '@config'
+            - '@upload_imagesize'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@path_helper'
+            - '@cache.driver'
         calls:
             - [set_name, [avatar.driver.remote]]
         tags:
@@ -58,14 +58,14 @@ services:
     avatar.driver.upload:
         class: phpbb\avatar\driver\upload
         arguments:
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - @filesystem
-            - @path_helper
-            - @dispatcher
-            - @files.factory
-            - @cache.driver
+            - '@config'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@filesystem'
+            - '@path_helper'
+            - '@dispatcher'
+            - '@files.factory'
+            - '@cache.driver'
         calls:
             - [set_name, [avatar.driver.upload]]
         tags:

phpBB/config/default/container/services_captcha.yml

@@ -2,15 +2,15 @@ services:
     captcha.factory:
         class: phpbb\captcha\factory
         arguments:
-            - @service_container
-            - @captcha.plugins.service_collection
+            - '@service_container'
+            - '@captcha.plugins.service_collection'
 
 # ----- Captcha plugins -----
 # Scope MUST be prototype for all the plugins to work.
     captcha.plugins.service_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: captcha.plugins }
 
@@ -42,9 +42,9 @@ services:
         class: phpbb\captcha\plugins\qa
         scope: prototype
         arguments:
-            - %tables.captcha_qa_questions%
-            - %tables.captcha_qa_answers%
-            - %tables.captcha_qa_confirm%
+            - '%tables.captcha_qa_questions%'
+            - '%tables.captcha_qa_answers%'
+            - '%tables.captcha_qa_confirm%'
         calls:
             - [set_name, [core.captcha.plugins.qa]]
         tags:

phpBB/config/default/container/services_console.yml

@@ -2,219 +2,220 @@ services:
     console.exception_subscriber:
         class: phpbb\console\exception_subscriber
         arguments:
-            - @language
-            - %debug.exceptions%
+            - '@language'
+            - '%debug.exceptions%'
         tags:
             - { name: kernel.event_subscriber }
 
     console.command_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: console.command }
 
     console.command.cache.purge:
         class: phpbb\console\command\cache\purge
         arguments:
-            - @user
-            - @cache.driver
-            - @dbal.conn
-            - @auth
-            - @log
-            - @config
+            - '@user'
+            - '@cache.driver'
+            - '@dbal.conn'
+            - '@auth'
+            - '@log'
+            - '@config'
         tags:
             - { name: console.command }
 
     console.command.config.delete:
         class: phpbb\console\command\config\delete
         arguments:
-            - @user
-            - @config
+            - '@user'
+            - '@config'
         tags:
             - { name: console.command }
 
     console.command.config.increment:
         class: phpbb\console\command\config\increment
         arguments:
-            - @user
-            - @config
+            - '@user'
+            - '@config'
         tags:
             - { name: console.command }
 
     console.command.config.get:
         class: phpbb\console\command\config\get
         arguments:
-            - @user
-            - @config
+            - '@user'
+            - '@config'
         tags:
             - { name: console.command }
 
     console.command.config.set:
         class: phpbb\console\command\config\set
         arguments:
-            - @user
-            - @config
+            - '@user'
+            - '@config'
         tags:
             - { name: console.command }
 
     console.command.config.set_atomic:
         class: phpbb\console\command\config\set_atomic
         arguments:
-            - @user
-            - @config
+            - '@user'
+            - '@config'
         tags:
             - { name: console.command }
 
     console.command.cron.list:
         class: phpbb\console\command\cron\cron_list
         arguments:
-            - @user
-            - @cron.manager
+            - '@user'
+            - '@cron.manager'
         tags:
             - { name: console.command }
 
     console.command.cron.run:
         class: phpbb\console\command\cron\run
         arguments:
-            - @user
-            - @cron.manager
-            - @cron.lock_db
+            - '@user'
+            - '@cron.manager'
+            - '@cron.lock_db'
         tags:
             - { name: console.command }
 
     console.command.db.list:
         class: phpbb\console\command\db\list_command
         arguments:
-            - @user
-            - @migrator
-            - @ext.manager
-            - @config
-            - @cache
+            - '@user'
+            - '@migrator'
+            - '@ext.manager'
+            - '@config'
+            - '@cache'
         tags:
             - { name: console.command }
 
     console.command.db.migrate:
         class: phpbb\console\command\db\migrate
         arguments:
-            - @user
-            - @language
-            - @migrator
-            - @ext.manager
-            - @config
-            - @cache
-            - @log
-            - @filesystem
-            - %core.root_path%
+            - '@user'
+            - '@language'
+            - '@migrator'
+            - '@ext.manager'
+            - '@config'
+            - '@cache'
+            - '@log'
+            - '@filesystem'
+            - '%core.root_path%'
         tags:
             - { name: console.command }
 
     console.command.db.revert:
         class: phpbb\console\command\db\revert
         arguments:
-            - @user
-            - @language
-            - @migrator
-            - @ext.manager
-            - @config
-            - @cache
-            - @filesystem
-            - %core.root_path%
+            - '@user'
+            - '@language'
+            - '@migrator'
+            - '@ext.manager'
+            - '@config'
+            - '@cache'
+            - '@filesystem'
+            - '%core.root_path%'
         tags:
             - { name: console.command }
 
     console.command.dev.migration_tips:
         class: phpbb\console\command\dev\migration_tips
         arguments:
-            - @user
-            - @ext.manager
+            - '@user'
+            - '@ext.manager'
         tags:
             - { name: console.command }
 
     console.command.extension.disable:
         class: phpbb\console\command\extension\disable
         arguments:
-            - @user
-            - @ext.manager
-            - @log
+            - '@user'
+            - '@ext.manager'
+            - '@log'
         tags:
             - { name: console.command }
 
     console.command.extension.enable:
         class: phpbb\console\command\extension\enable
         arguments:
-            - @user
-            - @ext.manager
-            - @log
+            - '@user'
+            - '@ext.manager'
+            - '@log'
         tags:
             - { name: console.command }
 
     console.command.extension.purge:
         class: phpbb\console\command\extension\purge
         arguments:
-            - @user
-            - @ext.manager
-            - @log
+            - '@user'
+            - '@ext.manager'
+            - '@log'
         tags:
             - { name: console.command }
 
     console.command.extension.show:
         class: phpbb\console\command\extension\show
         arguments:
-            - @user
-            - @ext.manager
-            - @log
+            - '@user'
+            - '@ext.manager'
+            - '@log'
         tags:
             - { name: console.command }
 
     console.command.fixup.recalculate_email_hash:
         class: phpbb\console\command\fixup\recalculate_email_hash
         arguments:
-            - @user
-            - @dbal.conn
+            - '@user'
+            - '@dbal.conn'
         tags:
             - { name: console.command }
 
     console.command.reparser.list:
         class: phpbb\console\command\reparser\list_all
         arguments:
-            - @user
-            - @text_reparser_collection
+            - '@user'
+            - '@text_reparser_collection'
         tags:
             - { name: console.command }
 
     console.command.reparser.reparse:
         class: phpbb\console\command\reparser\reparse
         arguments:
-            - @user
-            - @text_reparser_collection
-            - @config_text
+            - '@user'
+            - '@text_reparser.lock'
+            - '@text_reparser.manager'
+            - '@text_reparser_collection'
         tags:
             - { name: console.command }
 
     console.command.thumbnail.delete:
         class: phpbb\console\command\thumbnail\delete
         arguments:
-            - @user
-            - @dbal.conn
-            - %core.root_path%
+            - '@user'
+            - '@dbal.conn'
+            - '%core.root_path%'
         tags:
             - { name: console.command }
 
     console.command.thumbnail.generate:
         class: phpbb\console\command\thumbnail\generate
         arguments:
-            - @user
-            - @dbal.conn
-            - @cache
-            - %core.root_path%
-            - %core.php_ext%
+            - '@user'
+            - '@dbal.conn'
+            - '@cache'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: console.command }
 
     console.command.thumbnail.recreate:
         class: phpbb\console\command\thumbnail\recreate
         arguments:
-            - @user
+            - '@user'
         tags:
             - { name: console.command }

phpBB/config/default/container/services_content.yml

@@ -2,71 +2,71 @@ services:
     content.visibility:
         class: phpbb\content_visibility
         arguments:
-            - @auth
-            - @config
-            - @dispatcher
-            - @dbal.conn
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.forums%
-            - %tables.posts%
-            - %tables.topics%
-            - %tables.users%
+            - '@auth'
+            - '@config'
+            - '@dispatcher'
+            - '@dbal.conn'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%tables.forums%'
+            - '%tables.posts%'
+            - '%tables.topics%'
+            - '%tables.users%'
 
     groupposition.legend:
         class: phpbb\groupposition\legend
         arguments:
-            - @dbal.conn
-            - @user
+            - '@dbal.conn'
+            - '@user'
 
     groupposition.teampage:
         class: phpbb\groupposition\teampage
         arguments:
-            - @dbal.conn
-            - @user
-            - @cache.driver
+            - '@dbal.conn'
+            - '@user'
+            - '@cache.driver'
 
     message.form.admin:
         class: phpbb\message\admin_form
         arguments:
-            - @auth
-            - @config
-            - @config_text
-            - @dbal.conn
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@auth'
+            - '@config'
+            - '@config_text'
+            - '@dbal.conn'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     message.form.topic:
         class: phpbb\message\topic_form
         arguments:
-            - @auth
-            - @config
-            - @dbal.conn
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     message.form.user:
         class: phpbb\message\user_form
         arguments:
-            - @auth
-            - @config
-            - @dbal.conn
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     pagination:
         class: phpbb\pagination
         arguments:
-            - @template
-            - @user
-            - @controller.helper
-            - @dispatcher
+            - '@template'
+            - '@user'
+            - '@controller.helper'
+            - '@dispatcher'
 
     viewonline_helper:
         class: phpbb\viewonline_helper
         arguments:
-            - @filesystem
+            - '@filesystem'

phpBB/config/default/container/services_cron.yml

@@ -2,32 +2,32 @@ services:
     cron.manager:
         class: phpbb\cron\manager
         arguments:
-            - @cron.task_collection
-            - %core.root_path%
-            - %core.php_ext%
+            - '@cron.task_collection'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     cron.lock_db:
         class: phpbb\lock\db
         arguments:
             - cron_lock
-            - @config
-            - @dbal.conn
+            - '@config'
+            - '@dbal.conn'
 
 # ----- Cron tasks -----
     cron.task_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: cron.task }
 
     cron.task.core.prune_all_forums:
         class: phpbb\cron\task\core\prune_all_forums
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @config
-            - @dbal.conn
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@config'
+            - '@dbal.conn'
         calls:
             - [set_name, [cron.task.core.prune_all_forums]]
         tags:
@@ -36,10 +36,10 @@ services:
     cron.task.core.prune_forum:
         class: phpbb\cron\task\core\prune_forum
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @config
-            - @dbal.conn
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@config'
+            - '@dbal.conn'
         calls:
             - [set_name, [cron.task.core.prune_forum]]
         tags:
@@ -48,12 +48,12 @@ services:
     cron.task.core.prune_shadow_topics:
         class: phpbb\cron\task\core\prune_shadow_topics
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @config
-            - @dbal.conn
-            - @log
-            - @user
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@config'
+            - '@dbal.conn'
+            - '@log'
+            - '@user'
         calls:
             - [set_name, [cron.task.core.prune_shadow_topics]]
         tags:
@@ -62,8 +62,8 @@ services:
     cron.task.core.prune_notifications:
         class: phpbb\cron\task\core\prune_notifications
         arguments:
-            - @config
-            - @notification_manager
+            - '@config'
+            - '@notification_manager'
         calls:
             - [set_name, [cron.task.core.prune_notifications]]
         tags:
@@ -72,9 +72,9 @@ services:
     cron.task.core.queue:
         class: phpbb\cron\task\core\queue
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @config
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@config'
         calls:
             - [set_name, [cron.task.core.queue]]
         tags:
@@ -83,8 +83,8 @@ services:
     cron.task.core.tidy_cache:
         class: phpbb\cron\task\core\tidy_cache
         arguments:
-            - @config
-            - @cache.driver
+            - '@config'
+            - '@cache.driver'
         calls:
             - [set_name, [cron.task.core.tidy_cache]]
         tags:
@@ -93,9 +93,9 @@ services:
     cron.task.core.tidy_database:
         class: phpbb\cron\task\core\tidy_database
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @config
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@config'
         calls:
             - [set_name, [cron.task.core.tidy_database]]
         tags:
@@ -104,8 +104,10 @@ services:
     cron.task.core.tidy_plupload:
         class: phpbb\cron\task\core\tidy_plupload
         arguments:
-            - %core.root_path%
-            - @config
+            - '%core.root_path%'
+            - '@config'
+            - '@log'
+            - '@user'
         calls:
             - [set_name, [cron.task.core.tidy_plupload]]
         tags:
@@ -114,13 +116,13 @@ services:
     cron.task.core.tidy_search:
         class: phpbb\cron\task\core\tidy_search
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @auth
-            - @config
-            - @dbal.conn
-            - @user
-            - @dispatcher
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@user'
+            - '@dispatcher'
         calls:
             - [set_name, [cron.task.core.tidy_search]]
         tags:
@@ -129,8 +131,8 @@ services:
     cron.task.core.tidy_sessions:
         class: phpbb\cron\task\core\tidy_sessions
         arguments:
-            - @config
-            - @user
+            - '@config'
+            - '@user'
         calls:
             - [set_name, [cron.task.core.tidy_sessions]]
         tags:
@@ -139,10 +141,80 @@ services:
     cron.task.core.tidy_warnings:
         class: phpbb\cron\task\core\tidy_warnings
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @config
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@config'
         calls:
             - [set_name, [cron.task.core.tidy_warnings]]
         tags:
             - { name: cron.task }
+
+    cron.task.text_reparser.pm_text:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - '@config'
+            - '@config_text'
+            - '@text_reparser.lock'
+            - '@text_reparser.manager'
+            - '@text_reparser_collection'
+        calls:
+            - [set_name, [cron.task.text_reparser.pm_text]]
+            - [set_reparser, [text_reparser.pm_text]]
+        tags:
+            - { name: cron.task }
+
+    cron.task.text_reparser.poll_option:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - '@config'
+            - '@config_text'
+            - '@text_reparser.lock'
+            - '@text_reparser.manager'
+            - '@text_reparser_collection'
+        calls:
+            - [set_name, [cron.task.text_reparser.poll_option]]
+            - [set_reparser, [text_reparser.poll_option]]
+        tags:
+            - { name: cron.task }
+
+    cron.task.text_reparser.poll_title:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - '@config'
+            - '@config_text'
+            - '@text_reparser.lock'
+            - '@text_reparser.manager'
+            - '@text_reparser_collection'
+        calls:
+            - [set_name, [cron.task.text_reparser.poll_title]]
+            - [set_reparser, [text_reparser.poll_title]]
+        tags:
+            - { name: cron.task }
+
+    cron.task.text_reparser.post_text:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - '@config'
+            - '@config_text'
+            - '@text_reparser.lock'
+            - '@text_reparser.manager'
+            - '@text_reparser_collection'
+        calls:
+            - [set_name, [cron.task.text_reparser.post_text]]
+            - [set_reparser, [text_reparser.post_text]]
+        tags:
+            - { name: cron.task }
+
+    cron.task.text_reparser.user_signature:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - '@config'
+            - '@config_text'
+            - '@text_reparser.lock'
+            - '@text_reparser.manager'
+            - '@text_reparser_collection'
+        calls:
+            - [set_name, [cron.task.text_reparser.user_signature]]
+            - [set_reparser, [text_reparser.user_signature]]
+        tags:
+            - { name: cron.task }

phpBB/config/default/container/services_db.yml

@@ -2,12 +2,12 @@ services:
     dbal.conn:
         class: phpbb\db\driver\factory
         arguments:
-            - @service_container
+            - '@service_container'
 
     dbal.conn.driver:
-        class: %dbal.driver.class%
+        class: '%dbal.driver.class%'
         calls:
-            - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
+            - [sql_connect, ['%dbal.dbhost%', '%dbal.dbuser%', '%dbal.dbpasswd%', '%dbal.dbname%', '%dbal.dbport%', false, '%dbal.new_link%']]
 
 # ----- DB Tools -----
     dbal.tools.factory:
@@ -15,20 +15,20 @@ services:
 
     dbal.tools:
         class: phpbb\db\tools\tools_interface
-        factory: ["@dbal.tools.factory", get]
+        factory: ['@dbal.tools.factory', get]
         arguments:
-            - @dbal.conn.driver
+            - '@dbal.conn.driver'
 
 # ----- DB Extractor -----
     dbal.extractor.factory:
         class: phpbb\db\extractor\factory
         arguments:
-            - @dbal.conn.driver
-            - @service_container
+            - '@dbal.conn.driver'
+            - '@service_container'
 
     dbal.extractor:
         class: phpbb\db\extractor\extractor_interface
-        factory: ["@dbal.extractor.factory", get]
+        factory: ['@dbal.extractor.factory', get]
 
 # ----- DB Extractors for different drivers -----
 # Scope MUST be prototype for all the handlers to work correctly.
@@ -36,46 +36,46 @@ services:
         class: phpbb\db\extractor\mssql_extractor
         scope: prototype
         arguments:
-            - %core.root_path%
-            - @request
-            - @dbal.conn.driver
+            - '%core.root_path%'
+            - '@request'
+            - '@dbal.conn.driver'
 
     dbal.extractor.extractors.mysql_extractor:
         class: phpbb\db\extractor\mysql_extractor
         scope: prototype
         arguments:
-            - %core.root_path%
-            - @request
-            - @dbal.conn.driver
+            - '%core.root_path%'
+            - '@request'
+            - '@dbal.conn.driver'
 
     dbal.extractor.extractors.oracle_extractor:
         class: phpbb\db\extractor\oracle_extractor
         scope: prototype
         arguments:
-            - %core.root_path%
-            - @request
-            - @dbal.conn.driver
+            - '%core.root_path%'
+            - '@request'
+            - '@dbal.conn.driver'
 
     dbal.extractor.extractors.postgres_extractor:
         class: phpbb\db\extractor\postgres_extractor
         scope: prototype
         arguments:
-            - %core.root_path%
-            - @request
-            - @dbal.conn.driver
+            - '%core.root_path%'
+            - '@request'
+            - '@dbal.conn.driver'
 
     dbal.extractor.extractors.sqlite3_extractor:
         class: phpbb\db\extractor\sqlite3_extractor
         scope: prototype
         arguments:
-            - %core.root_path%
-            - @request
-            - @dbal.conn.driver
+            - '%core.root_path%'
+            - '@request'
+            - '@dbal.conn.driver'
 
     dbal.extractor.extractors.sqlite_extractor:
         class: phpbb\db\extractor\sqlite_extractor
         scope: prototype
         arguments:
-            - %core.root_path%
-            - @request
-            - @dbal.conn.driver
+            - '%core.root_path%'
+            - '@request'
+            - '@dbal.conn.driver'

phpBB/config/default/container/services_event.yml

@@ -2,13 +2,13 @@ services:
     dispatcher:
         class: phpbb\event\dispatcher
         arguments:
-            - @service_container
+            - '@service_container'
 
     kernel_exception_subscriber:
         class: phpbb\event\kernel_exception_subscriber
         arguments:
-            - @template
-            - @language
+            - '@template'
+            - '@language'
         tags:
             - { name: kernel.event_subscriber }
 

phpBB/config/default/container/services_feed.yml

@@ -2,112 +2,112 @@ services:
     phpbb.feed.controller:
         class: phpbb\feed\controller\feed
         arguments:
-            - @template.twig.environment
-            - @symfony_request
-            - @controller.helper
-            - @config
-            - @dbal.conn
-            - @service_container
-            - @feed.helper
-            - @user
-            - @auth
-            - %core.php_ext%
+            - '@template.twig.environment'
+            - '@symfony_request'
+            - '@controller.helper'
+            - '@config'
+            - '@dbal.conn'
+            - '@service_container'
+            - '@feed.helper'
+            - '@user'
+            - '@auth'
+            - '%core.php_ext%'
 
     feed.helper:
         class: phpbb\feed\helper
         arguments:
-            - @config
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@config'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     feed.forum:
         class: phpbb\feed\forum
         scope: prototype
         arguments:
-            - @feed.helper
-            - @config
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @content.visibility
-            - %core.php_ext%
+            - '@feed.helper'
+            - '@config'
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '@user'
+            - '@auth'
+            - '@content.visibility'
+            - '%core.php_ext%'
 
     feed.forums:
         class: phpbb\feed\forums
         scope: prototype
         arguments:
-            - @feed.helper
-            - @config
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @content.visibility
-            - %core.php_ext%
+            - '@feed.helper'
+            - '@config'
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '@user'
+            - '@auth'
+            - '@content.visibility'
+            - '%core.php_ext%'
 
     feed.news:
         class: phpbb\feed\news
         scope: prototype
         arguments:
-            - @feed.helper
-            - @config
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @content.visibility
-            - %core.php_ext%
+            - '@feed.helper'
+            - '@config'
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '@user'
+            - '@auth'
+            - '@content.visibility'
+            - '%core.php_ext%'
 
     feed.overall:
         class: phpbb\feed\overall
         scope: prototype
         arguments:
-            - @feed.helper
-            - @config
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @content.visibility
-            - %core.php_ext%
+            - '@feed.helper'
+            - '@config'
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '@user'
+            - '@auth'
+            - '@content.visibility'
+            - '%core.php_ext%'
 
     feed.topic:
         class: phpbb\feed\topic
         scope: prototype
         arguments:
-            - @feed.helper
-            - @config
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @content.visibility
-            - %core.php_ext%
+            - '@feed.helper'
+            - '@config'
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '@user'
+            - '@auth'
+            - '@content.visibility'
+            - '%core.php_ext%'
 
     feed.topics:
         class: phpbb\feed\topics
         scope: prototype
         arguments:
-            - @feed.helper
-            - @config
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @content.visibility
-            - %core.php_ext%
+            - '@feed.helper'
+            - '@config'
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '@user'
+            - '@auth'
+            - '@content.visibility'
+            - '%core.php_ext%'
 
     feed.topics_active:
         class: phpbb\feed\topics_active
         scope: prototype
         arguments:
-            - @feed.helper
-            - @config
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @content.visibility
-            - %core.php_ext%
+            - '@feed.helper'
+            - '@config'
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '@user'
+            - '@auth'
+            - '@content.visibility'
+            - '%core.php_ext%'

phpBB/config/default/container/services_files.yml

@@ -2,55 +2,55 @@ services:
     files.factory:
         class: phpbb\files\factory
         arguments:
-            - @service_container
+            - '@service_container'
 
     files.filespec:
         class: phpbb\files\filespec
         scope: prototype
         arguments:
-            - @filesystem
-            - @language
-            - @php_ini
-            - @upload_imagesize
-            - %core.root_path%
-            - @mimetype.guesser
-            - @plupload
+            - '@filesystem'
+            - '@language'
+            - '@php_ini'
+            - '@upload_imagesize'
+            - '%core.root_path%'
+            - '@mimetype.guesser'
+            - '@plupload'
 
     files.upload:
         class: phpbb\files\upload
         scope: prototype
         arguments:
-            - @filesystem
-            - @files.factory
-            - @language
-            - @php_ini
-            - @request
+            - '@filesystem'
+            - '@files.factory'
+            - '@language'
+            - '@php_ini'
+            - '@request'
 
     files.types.form:
         class: phpbb\files\types\form
         scope: prototype
         arguments:
-            - @files.factory
-            - @language
-            - @php_ini
-            - @plupload
-            - @request
+            - '@files.factory'
+            - '@language'
+            - '@php_ini'
+            - '@plupload'
+            - '@request'
 
     files.types.local:
         class: phpbb\files\types\form
         scope: prototype
         arguments:
-            - @files.factory
-            - @language
-            - @php_ini
-            - @request
+            - '@files.factory'
+            - '@language'
+            - '@php_ini'
+            - '@request'
 
     files.types.remote:
         class: phpbb\files\types\remote
         scope: prototype
         arguments:
-            - @files.factory
-            - @language
-            - @php_ini
-            - @request
-            - %core.root_path%
+            - '@files.factory'
+            - '@language'
+            - '@php_ini'
+            - '@request'
+            - '%core.root_path%'

phpBB/config/default/container/services_help.yml

@@ -2,26 +2,26 @@ services:
     phpbb.help.manager:
         class: phpbb\help\manager
         arguments:
-            - @dispatcher
-            - @language
-            - @template
+            - '@dispatcher'
+            - '@language'
+            - '@template'
 
     phpbb.help.controller.bbcode:
         class: phpbb\help\controller\bbcode
         arguments:
-            - @controller.helper
-            - @phpbb.help.manager
-            - @template
-            - @language
-            - %core.root_path%
-            - %core.php_ext%
+            - '@controller.helper'
+            - '@phpbb.help.manager'
+            - '@template'
+            - '@language'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     phpbb.help.controller.faq:
         class: phpbb\help\controller\faq
         arguments:
-            - @controller.helper
-            - @phpbb.help.manager
-            - @template
-            - @language
-            - %core.root_path%
-            - %core.php_ext%
+            - '@controller.helper'
+            - '@phpbb.help.manager'
+            - '@template'
+            - '@language'
+            - '%core.root_path%'
+            - '%core.php_ext%'

phpBB/config/default/container/services_hook.yml

@@ -2,6 +2,6 @@ services:
     hook_finder:
         class: phpbb\hook\finder
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @cache.driver
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@cache.driver'

phpBB/config/default/container/services_http.yml

@@ -2,16 +2,16 @@ services:
     http_kernel:
         class: Symfony\Component\HttpKernel\HttpKernel
         arguments:
-            - @dispatcher
-            - @controller.resolver
-            - @request_stack
+            - '@dispatcher'
+            - '@controller.resolver'
+            - '@request_stack'
 
     # WARNING: The Symfony request does not escape the input and should be used very carefully
     #           prefer the phpbb request (service @request) as possible
     symfony_request:
         class: phpbb\symfony_request
         arguments:
-            - @request
+            - '@request'
 
     request_stack:
         class: Symfony\Component\HttpFoundation\RequestStack
@@ -20,4 +20,4 @@ services:
         class: phpbb\request\request
         arguments:
             - null
-            - %core.disable_super_globals%
+            - '%core.disable_super_globals%'

phpBB/config/default/container/services_language.yml

@@ -2,21 +2,21 @@ services:
     language.helper.language_file:
         class: phpbb\language\language_file_helper
         arguments:
-            - %core.root_path%
+            - '%core.root_path%'
 
     language:
         class: phpbb\language\language
         arguments:
-            - @language.loader
+            - '@language.loader'
 
     language.loader_abstract:
         abstract: true
         class: phpbb\language\language_file_loader
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     language.loader:
         parent: language.loader_abstract
         calls:
-            - [set_extension_manager, ["@ext.manager"]]
+            - [set_extension_manager, ['@ext.manager']]

phpBB/config/default/container/services_migrator.yml

@@ -3,16 +3,16 @@ services:
     migrator:
         class: phpbb\db\migrator
         arguments:
-            - @service_container
-            - @config
-            - @dbal.conn
-            - @dbal.tools
-            - %tables.migrations%
-            - %core.root_path%
-            - %core.php_ext%
-            - %core.table_prefix%
-            - @migrator.tool_collection
-            - @migrator.helper
+            - '@service_container'
+            - '@config'
+            - '@dbal.conn'
+            - '@dbal.tools'
+            - '%tables.migrations%'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%core.table_prefix%'
+            - '@migrator.tool_collection'
+            - '@migrator.helper'
 
     migrator.helper:
         class: phpbb\db\migration\helper
@@ -21,44 +21,44 @@ services:
     migrator.tool_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: migrator.tool }
 
     migrator.tool.config:
         class: phpbb\db\migration\tool\config
         arguments:
-            - @config
+            - '@config'
         tags:
             - { name: migrator.tool }
 
     migrator.tool.config_text:
         class: phpbb\db\migration\tool\config_text
         arguments:
-            - @config_text
+            - '@config_text'
         tags:
             - { name: migrator.tool }
 
     migrator.tool.module:
         class: phpbb\db\migration\tool\module
         arguments:
-            - @dbal.conn
-            - @cache
-            - @user
-            - @module.manager
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.modules%
+            - '@dbal.conn'
+            - '@cache'
+            - '@user'
+            - '@module.manager'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%tables.modules%'
         tags:
             - { name: migrator.tool }
 
     migrator.tool.permission:
         class: phpbb\db\migration\tool\permission
         arguments:
-            - @dbal.conn
-            - @cache
-            - @auth
-            - %core.root_path%
-            - %core.php_ext%
+            - '@dbal.conn'
+            - '@cache'
+            - '@auth'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: migrator.tool }

phpBB/config/default/container/services_mimetype_guesser.yml

@@ -2,7 +2,7 @@ services:
     mimetype.guesser_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: mimetype.guessers }
 
@@ -19,18 +19,18 @@ services:
     mimetype.content_guesser:
         class: phpbb\mimetype\content_guesser
         calls:
-            - [set_priority, [%mimetype.guesser.priority.low%]]
+            - [set_priority, ['%mimetype.guesser.priority.low%']]
         tags:
             - { name: mimetype.guessers }
 
     mimetype.extension_guesser:
         class: phpbb\mimetype\extension_guesser
         calls:
-            - [set_priority, [%mimetype.guesser.priority.lowest%]]
+            - [set_priority, ['%mimetype.guesser.priority.lowest%']]
         tags:
             - { name: mimetype.guessers }
 
     mimetype.guesser:
         class: phpbb\mimetype\guesser
         arguments:
-            - @mimetype.guesser_collection
+            - '@mimetype.guesser_collection'

phpBB/config/default/container/services_module.yml

@@ -2,9 +2,9 @@ services:
     module.manager:
         class: phpbb\module\module_manager
         arguments:
-            - @cache.driver
-            - @dbal.conn
-            - @ext.manager
-            - %tables.modules%
-            - %core.root_path%
-            - %core.php_ext%
+            - '@cache.driver'
+            - '@dbal.conn'
+            - '@ext.manager'
+            - '%tables.modules%'
+            - '%core.root_path%'
+            - '%core.php_ext%'

phpBB/config/default/container/services_notification.yml

@@ -2,45 +2,45 @@ services:
     notification_manager:
         class: phpbb\notification\manager
         arguments:
-            - @notification.type_collection
-            - @notification.method_collection
-            - @service_container
-            - @user_loader
-            - @dispatcher
-            - @dbal.conn
-            - @cache
-            - @language
-            - @user
-            - %tables.notification_types%
-            - %tables.user_notifications%
+            - '@notification.type_collection'
+            - '@notification.method_collection'
+            - '@service_container'
+            - '@user_loader'
+            - '@dispatcher'
+            - '@dbal.conn'
+            - '@cache'
+            - '@language'
+            - '@user'
+            - '%tables.notification_types%'
+            - '%tables.user_notifications%'
 
 # ----- Notification's types -----
 # Scope MUST be prototype for all the plugins to work.
     notification.type_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: notification.type }
 
     notification.type.base:
         abstract: true
         arguments:
-            - @dbal.conn
-            - @language
-            - @user
-            - @auth
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.user_notifications%
+            - '@dbal.conn'
+            - '@language'
+            - '@user'
+            - '@auth'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%tables.user_notifications%'
 
     notification.type.admin_activate_user:
         class: phpbb\notification\type\admin_activate_user
         scope: prototype
         parent: notification.type.base
         calls:
-            - [set_user_loader, [@user_loader]]
-            - [set_config, [@config]]
+            - [set_user_loader, ['@user_loader']]
+            - [set_config, ['@config']]
         tags:
             - { name: notification.type }
 
@@ -84,7 +84,7 @@ services:
         scope: prototype
         parent: notification.type.base
         calls:
-            - [set_user_loader, [@user_loader]]
+            - [set_user_loader, ['@user_loader']]
         tags:
             - { name: notification.type }
 
@@ -100,8 +100,8 @@ services:
         scope: prototype
         parent: notification.type.base
         calls:
-            - [set_user_loader, [@user_loader]]
-            - [set_config, [@config]]
+            - [set_user_loader, ['@user_loader']]
+            - [set_config, ['@config']]
         tags:
             - { name: notification.type }
 
@@ -110,8 +110,8 @@ services:
         scope: prototype
         parent: notification.type.base
         calls:
-            - [set_user_loader, [@user_loader]]
-            - [set_config, [@config]]
+            - [set_user_loader, ['@user_loader']]
+            - [set_config, ['@config']]
         tags:
             - { name: notification.type }
 
@@ -127,7 +127,7 @@ services:
         scope: prototype
         parent: notification.type.post
         calls:
-            - [set_utils, [@text_formatter.utils]]
+            - [set_utils, ['@text_formatter.utils']]
         tags:
             - { name: notification.type }
 
@@ -164,8 +164,8 @@ services:
         scope: prototype
         parent: notification.type.base
         calls:
-            - [set_user_loader, [@user_loader]]
-            - [set_config, [@config]]
+            - [set_user_loader, ['@user_loader']]
+            - [set_config, ['@config']]
         tags:
             - { name: notification.type }
 
@@ -181,7 +181,7 @@ services:
     notification.method_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: notification.method }
 
@@ -189,13 +189,13 @@ services:
         class: phpbb\notification\method\board
         scope: prototype # scope MUST be prototype for this to work!
         arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @config
-            - %tables.notification_types%
-            - %tables.notifications%
+            - '@user_loader'
+            - '@dbal.conn'
+            - '@cache.driver'
+            - '@user'
+            - '@config'
+            - '%tables.notification_types%'
+            - '%tables.notifications%'
         tags:
             - { name: notification.method }
 
@@ -203,11 +203,11 @@ services:
         class: phpbb\notification\method\email
         scope: prototype
         arguments:
-            - @user_loader
-            - @user
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
+            - '@user_loader'
+            - '@user'
+            - '@config'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: notification.method }
 
@@ -215,10 +215,10 @@ services:
         class: phpbb\notification\method\jabber
         scope: prototype
         arguments:
-            - @user_loader
-            - @user
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
+            - '@user_loader'
+            - '@user'
+            - '@config'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: notification.method }

phpBB/config/default/container/services_password.yml

@@ -3,10 +3,10 @@ services:
     passwords.manager:
         class: phpbb\passwords\manager
         arguments:
-            - @config
-            - @passwords.driver_collection
-            - @passwords.helper
-            - %passwords.algorithms%
+            - '@config'
+            - '@passwords.driver_collection'
+            - '@passwords.helper'
+            - '%passwords.algorithms%'
 
     passwords.helper:
         class: phpbb\passwords\helper
@@ -14,111 +14,111 @@ services:
     passwords.driver_helper:
         class: phpbb\passwords\driver\helper
         arguments:
-            - @config
+            - '@config'
 
 # ----- Password's drivers -----
     passwords.driver_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: passwords.driver }
 
     passwords.driver.bcrypt:
         class: phpbb\passwords\driver\bcrypt
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.bcrypt_2y:
         class: phpbb\passwords\driver\bcrypt_2y
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.bcrypt_wcf2:
         class: phpbb\passwords\driver\bcrypt_wcf2
         arguments:
-            - @passwords.driver.bcrypt
-            - @passwords.driver_helper
+            - '@passwords.driver.bcrypt'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.salted_md5:
         class: phpbb\passwords\driver\salted_md5
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.phpass:
         class: phpbb\passwords\driver\phpass
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.convert_password:
         class: phpbb\passwords\driver\convert_password
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.sha1_smf:
         class: phpbb\passwords\driver\sha1_smf
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.sha1_wcf1:
         class: phpbb\passwords\driver\sha1_wcf1
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.sha1:
         class: phpbb\passwords\driver\sha1
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.md5_phpbb2:
         class: phpbb\passwords\driver\md5_phpbb2
         arguments:
-            - @request
-            - @passwords.driver.salted_md5
-            - @passwords.driver_helper
-            - %core.root_path%
-            - %core.php_ext%
+            - '@request'
+            - '@passwords.driver.salted_md5'
+            - '@passwords.driver_helper'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.md5_mybb:
         class: phpbb\passwords\driver\md5_mybb
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
 
     passwords.driver.md5_vb:
         class: phpbb\passwords\driver\md5_vb
         arguments:
-            - @config
-            - @passwords.driver_helper
+            - '@config'
+            - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }

phpBB/config/default/container/services_profilefield.yml

@@ -2,101 +2,101 @@ services:
     profilefields.manager:
         class: phpbb\profilefields\manager
         arguments:
-            - @auth
-            - @dbal.conn
-            - @dispatcher
-            - @request
-            - @template
-            - @profilefields.type_collection
-            - @user
-            - %tables.profile_fields%
-            - %tables.profile_fields_language%
-            - %tables.profile_fields_data%
+            - '@auth'
+            - '@dbal.conn'
+            - '@dispatcher'
+            - '@request'
+            - '@template'
+            - '@profilefields.type_collection'
+            - '@user'
+            - '%tables.profile_fields%'
+            - '%tables.profile_fields_language%'
+            - '%tables.profile_fields_data%'
 
     profilefields.lang_helper:
         class: phpbb\profilefields\lang_helper
         arguments:
-            - @dbal.conn
-            - %tables.profile_fields_options_language%
+            - '@dbal.conn'
+            - '%tables.profile_fields_options_language%'
 
 # ----- Profile fields types -----
     profilefields.type_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: profilefield.type }
 
     profilefields.type.bool:
         class: phpbb\profilefields\type\type_bool
         arguments:
-            - @profilefields.lang_helper
-            - @request
-            - @template
-            - @user
+            - '@profilefields.lang_helper'
+            - '@request'
+            - '@template'
+            - '@user'
         tags:
             - { name: profilefield.type }
 
     profilefields.type.date:
         class: phpbb\profilefields\type\type_date
         arguments:
-            - @request
-            - @template
-            - @user
+            - '@request'
+            - '@template'
+            - '@user'
         tags:
             - { name: profilefield.type }
 
     profilefields.type.dropdown:
         class: phpbb\profilefields\type\type_dropdown
         arguments:
-            - @profilefields.lang_helper
-            - @request
-            - @template
-            - @user
+            - '@profilefields.lang_helper'
+            - '@request'
+            - '@template'
+            - '@user'
         tags:
             - { name: profilefield.type }
 
     profilefields.type.googleplus:
         class: phpbb\profilefields\type\type_googleplus
         arguments:
-            - @request
-            - @template
-            - @user
+            - '@request'
+            - '@template'
+            - '@user'
         tags:
             - { name: profilefield.type }
 
     profilefields.type.int:
         class: phpbb\profilefields\type\type_int
         arguments:
-            - @request
-            - @template
-            - @user
+            - '@request'
+            - '@template'
+            - '@user'
         tags:
             - { name: profilefield.type }
 
     profilefields.type.string:
         class: phpbb\profilefields\type\type_string
         arguments:
-            - @request
-            - @template
-            - @user
+            - '@request'
+            - '@template'
+            - '@user'
         tags:
             - { name: profilefield.type }
 
     profilefields.type.text:
         class: phpbb\profilefields\type\type_text
         arguments:
-            - @request
-            - @template
-            - @user
+            - '@request'
+            - '@template'
+            - '@user'
         tags:
             - { name: profilefield.type }
 
     profilefields.type.url:
         class: phpbb\profilefields\type\type_url
         arguments:
-            - @request
-            - @template
-            - @user
+            - '@request'
+            - '@template'
+            - '@user'
         tags:
             - { name: profilefield.type }

phpBB/config/default/container/services_report.yml

@@ -3,30 +3,30 @@ services:
     phpbb.report.controller:
         class: phpbb\report\controller\report
         arguments:
-            - @config
-            - @user
-            - @template
-            - @controller.helper
-            - @request
-            - @captcha.factory
-            - @phpbb.report.handler_factory
-            - @phpbb.report.report_reason_list_provider
-            - %core.root_path%
-            - %core.php_ext%
+            - '@config'
+            - '@user'
+            - '@template'
+            - '@controller.helper'
+            - '@request'
+            - '@captcha.factory'
+            - '@phpbb.report.handler_factory'
+            - '@phpbb.report.report_reason_list_provider'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
 # ----- Report handler factory -----
     phpbb.report.handler_factory:
         class: phpbb\report\handler_factory
         arguments:
-            - @service_container
+            - '@service_container'
 
 # ----- Report UI provider -----
     phpbb.report.report_reason_list_provider:
         class: phpbb\report\report_reason_list_provider
         arguments:
-            - @dbal.conn.driver
-            - @template
-            - @user
+            - '@dbal.conn.driver'
+            - '@template'
+            - '@user'
 
 # ----- Report handlers -----
 # Scope MUST be prototype for all the handlers to work correctly.
@@ -34,20 +34,20 @@ services:
         class: phpbb\report\report_handler_pm
         scope: prototype
         arguments:
-            - @dbal.conn.driver
-            - @dispatcher
-            - @config
-            - @auth
-            - @user
-            - @notification_manager
+            - '@dbal.conn.driver'
+            - '@dispatcher'
+            - '@config'
+            - '@auth'
+            - '@user'
+            - '@notification_manager'
 
     phpbb.report.handlers.report_handler_post:
         class: phpbb\report\report_handler_post
         scope: prototype
         arguments:
-            - @dbal.conn.driver
-            - @dispatcher
-            - @config
-            - @auth
-            - @user
-            - @notification_manager
+            - '@dbal.conn.driver'
+            - '@dispatcher'
+            - '@config'
+            - '@auth'
+            - '@user'
+            - '@notification_manager'

phpBB/config/default/container/services_routing.yml

@@ -2,57 +2,57 @@ services:
     router:
         class: phpbb\routing\router
         arguments:
-            - @service_container
-            - @routing.chained_resources_locator
-            - @routing.delegated_loader
-            - %core.root_path%
-            - %core.php_ext%
-            - %core.environment%
+            - '@service_container'
+            - '@routing.chained_resources_locator'
+            - '@routing.delegated_loader'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%core.environment%'
 
     router.listener:
         class: Symfony\Component\HttpKernel\EventListener\RouterListener
         arguments:
-            - @router
+            - '@router'
             - null
             - null
-            - @request_stack
+            - '@request_stack'
         tags:
             - { name: kernel.event_subscriber }
 
     routing.helper:
         class: phpbb\routing\helper
         arguments:
-            - @config
-            - @router
-            - @symfony_request
-            - @request
-            - @filesystem
-            - %core.root_path%
-            - %core.php_ext%
+            - '@config'
+            - '@router'
+            - '@symfony_request'
+            - '@request'
+            - '@filesystem'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
 # ---- Route loaders ----
 
     routing.delegated_loader:
         class: Symfony\Component\Config\Loader\DelegatingLoader
         arguments:
-            - @routing.resolver
+            - '@routing.resolver'
 
     routing.resolver:
         class: phpbb\routing\loader_resolver
         arguments:
-            - @routing.loader.collection
+            - '@routing.loader.collection'
 
     routing.loader.collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: routing.loader }
 
     routing.loader.yaml:
         class: Symfony\Component\Routing\Loader\YamlFileLoader
         arguments:
-            - @file_locator
+            - '@file_locator'
         tags:
             - { name: routing.loader }
 
@@ -61,20 +61,20 @@ services:
     routing.chained_resources_locator:
         class: phpbb\routing\resources_locator\chained_resources_locator
         arguments:
-            - @routing.resources_locator.collection
+            - '@routing.resources_locator.collection'
 
     routing.resources_locator.collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: routing.resources_locator }
 
     routing.resources_locator.default:
         class: phpbb\routing\resources_locator\default_resources_locator
         arguments:
-            - %core.root_path%
-            - %core.environment%
-            - @ext.manager
+            - '%core.root_path%'
+            - '%core.environment%'
+            - '@ext.manager'
         tags:
             - { name: routing.resources_locator }

phpBB/config/default/container/services_text_formatter.yml

@@ -1,5 +1,5 @@
 parameters:
-    text_formatter.cache.dir: %core.root_path%cache/%core.environment%/
+    text_formatter.cache.dir: '%core.root_path%cache/%core.environment%/'
     text_formatter.cache.parser.key: _text_formatter_parser
     text_formatter.cache.renderer.key: _text_formatter_renderer
 
@@ -10,12 +10,12 @@ services:
     text_formatter.data_access:
         class: phpbb\textformatter\data_access
         arguments:
-            - @dbal.conn
-            - %tables.bbcodes%
-            - %tables.smilies%
-            - %tables.styles%
-            - %tables.words%
-            - %core.root_path%styles/
+            - '@dbal.conn'
+            - '%tables.bbcodes%'
+            - '%tables.smilies%'
+            - '%tables.styles%'
+            - '%tables.words%'
+            - '%core.root_path%styles/'
 
     text_formatter.parser:
         alias: text_formatter.s9e.parser
@@ -29,41 +29,45 @@ services:
     text_formatter.s9e.factory:
         class: phpbb\textformatter\s9e\factory
         arguments:
-            - @text_formatter.data_access
-            - @cache.driver
-            - @dispatcher
-            - @config
-            - %text_formatter.cache.dir%
-            - %text_formatter.cache.parser.key%
-            - %text_formatter.cache.renderer.key%
+            - '@text_formatter.data_access'
+            - '@cache.driver'
+            - '@dispatcher'
+            - '@config'
+            - '@text_formatter.s9e.link_helper'
+            - '%text_formatter.cache.dir%'
+            - '%text_formatter.cache.parser.key%'
+            - '%text_formatter.cache.renderer.key%'
+
+    text_formatter.s9e.link_helper:
+        class: phpbb\textformatter\s9e\link_helper
 
     text_formatter.s9e.parser:
         class: phpbb\textformatter\s9e\parser
         arguments:
-            - @cache.driver
-            - %text_formatter.cache.parser.key%
-            - @text_formatter.s9e.factory
-            - @dispatcher
+            - '@cache.driver'
+            - '%text_formatter.cache.parser.key%'
+            - '@text_formatter.s9e.factory'
+            - '@dispatcher'
 
     text_formatter.s9e.quote_helper:
         class: phpbb\textformatter\s9e\quote_helper
         arguments:
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     text_formatter.s9e.renderer:
         class: phpbb\textformatter\s9e\renderer
         arguments:
-            - @cache.driver
-            - %text_formatter.cache.dir%
-            - %text_formatter.cache.renderer.key%
-            - @text_formatter.s9e.factory
-            - @dispatcher
+            - '@cache.driver'
+            - '%text_formatter.cache.dir%'
+            - '%text_formatter.cache.renderer.key%'
+            - '@text_formatter.s9e.factory'
+            - '@dispatcher'
         calls:
-            - [configure_quote_helper, [@text_formatter.s9e.quote_helper]]
-            - [configure_smilies_path, [@config, @path_helper]]
-            - [configure_user, [@user, @config, @auth]]
+            - [configure_quote_helper, ['@text_formatter.s9e.quote_helper']]
+            - [configure_smilies_path, ['@config', '@path_helper']]
+            - [configure_user, ['@user', '@config', '@auth']]
 
     text_formatter.s9e.utils:
         class: phpbb\textformatter\s9e\utils

phpBB/config/default/container/services_text_reparser.yml

@@ -1,77 +1,91 @@
 services:
+    text_reparser.manager:
+        class: phpbb\textreparser\manager
+        arguments:
+            - '@config'
+            - '@config_text'
+            - '@text_reparser_collection'
+
+    text_reparser.lock:
+        class: phpbb\lock\db
+        arguments:
+            - reparse_lock
+            - '@config'
+            - '@dbal.conn'
+
     text_reparser_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: text_reparser.plugin }
 
     text_reparser.contact_admin_info:
         class: phpbb\textreparser\plugins\contact_admin_info
         arguments:
-            - @config_text
+            - '@config_text'
         tags:
             - { name: text_reparser.plugin }
 
     text_reparser.forum_description:
         class: phpbb\textreparser\plugins\forum_description
         arguments:
-            - @dbal.conn
-            - %tables.forums%
+            - '@dbal.conn'
+            - '%tables.forums%'
         tags:
             - { name: text_reparser.plugin }
 
     text_reparser.forum_rules:
         class: phpbb\textreparser\plugins\forum_rules
         arguments:
-            - @dbal.conn
-            - %tables.forums%
+            - '@dbal.conn'
+            - '%tables.forums%'
         tags:
             - { name: text_reparser.plugin }
 
     text_reparser.group_description:
         class: phpbb\textreparser\plugins\group_description
         arguments:
-            - @dbal.conn
-            - %tables.groups%
+            - '@dbal.conn'
+            - '%tables.groups%'
         tags:
             - { name: text_reparser.plugin }
 
     text_reparser.pm_text:
         class: phpbb\textreparser\plugins\pm_text
         arguments:
-            - @dbal.conn
-            - %tables.privmsgs%
+            - '@dbal.conn'
+            - '%tables.privmsgs%'
         tags:
             - { name: text_reparser.plugin }
 
     text_reparser.poll_option:
         class: phpbb\textreparser\plugins\poll_option
         arguments:
-            - @dbal.conn
+            - '@dbal.conn'
         tags:
             - { name: text_reparser.plugin }
 
     text_reparser.poll_title:
         class: phpbb\textreparser\plugins\poll_title
         arguments:
-            - @dbal.conn
-            - %tables.topics%
+            - '@dbal.conn'
+            - '%tables.topics%'
         tags:
             - { name: text_reparser.plugin }
 
     text_reparser.post_text:
         class: phpbb\textreparser\plugins\post_text
         arguments:
-            - @dbal.conn
-            - %tables.posts%
+            - '@dbal.conn'
+            - '%tables.posts%'
         tags:
             - { name: text_reparser.plugin }
 
     text_reparser.user_signature:
         class: phpbb\textreparser\plugins\user_signature
         arguments:
-            - @dbal.conn
-            - %tables.users%
+            - '@dbal.conn'
+            - '%tables.users%'
         tags:
             - { name: text_reparser.plugin }

phpBB/config/default/container/services_twig.yml

@@ -1,48 +1,48 @@
 parameters:
-    core.template.cache_path: %core.root_path%cache/%core.environment%/twig/
+    core.template.cache_path: '%core.root_path%cache/%core.environment%/twig/'
 
 services:
     template.twig.environment:
         class: phpbb\template\twig\environment
         arguments:
-            - @config
-            - @filesystem
-            - @path_helper
-            - @service_container
-            - %core.template.cache_path%
-            - @ext.manager
-            - @template.twig.loader
+            - '@config'
+            - '@filesystem'
+            - '@path_helper'
+            - '@service_container'
+            - '%core.template.cache_path%'
+            - '@ext.manager'
+            - '@template.twig.loader'
             - []
 
     template.twig.lexer:
         class: phpbb\template\twig\lexer
         arguments:
-            - @template.twig.environment
+            - '@template.twig.environment'
 
     template.twig.loader:
         class: phpbb\template\twig\loader
         arguments:
-            - @filesystem
+            - '@filesystem'
 
     template.twig.extensions.collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: twig.extension }
 
     template.twig.extensions.phpbb:
         class: phpbb\template\twig\extension
         arguments:
-            - @template_context
-            - @language
+            - '@template_context'
+            - '@language'
         tags:
             - { name: twig.extension }
 
     template.twig.extensions.routing:
         class: phpbb\template\twig\extension\routing
         arguments:
-            - @routing.helper
+            - '@routing.helper'
         tags:
             - { name: twig.extension }
 
@@ -52,14 +52,14 @@ services:
     template:
         class: phpbb\template\twig\twig
         arguments:
-            - @path_helper
-            - @config
-            - @template_context
-            - @template.twig.environment
-            - %core.template.cache_path%
-            - @user
-            - @template.twig.extensions.collection
-            - @ext.manager
+            - '@path_helper'
+            - '@config'
+            - '@template_context'
+            - '@template.twig.environment'
+            - '%core.template.cache_path%'
+            - '@user'
+            - '@template.twig.extensions.collection'
+            - '@ext.manager'
 
     template_context:
         class: phpbb\template\context

phpBB/config/default/container/services_user.yml

@@ -2,19 +2,19 @@ services:
     acl.permissions:
         class: phpbb\permissions
         arguments:
-            - @dispatcher
-            - @user
+            - '@dispatcher'
+            - '@user'
 
     user:
         class: phpbb\user
         arguments:
-            - @language
-            - %datetime.class%
+            - '@language'
+            - '%datetime.class%'
 
     user_loader:
         class: phpbb\user_loader
         arguments:
-            - @dbal.conn
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.users%
+            - '@dbal.conn'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%tables.users%'

phpBB/config/default/container/tables.yml

@@ -1,77 +1,78 @@
 parameters:
-    tables.acl_groups: %core.table_prefix%acl_groups
-    tables.acl_options: %core.table_prefix%acl_options
-    tables.acl_roles: %core.table_prefix%acl_roles
-    tables.acl_roles_data: %core.table_prefix%acl_roles_data
-    tables.acl_users: %core.table_prefix%acl_users
-    tables.attachments: %core.table_prefix%attachments
-    tables.auth_provider_oauth_token_storage: %core.table_prefix%oauth_tokens
-    tables.auth_provider_oauth_account_assoc: %core.table_prefix%oauth_accounts
-    tables.banlist: %core.table_prefix%banlist
-    tables.bbcodes: %core.table_prefix%bbcodes
-    tables.bookmarks: %core.table_prefix%bookmarks
-    tables.bots: %core.table_prefix%bots
-    tables.captcha_qa_questions: %core.table_prefix%captcha_questions
-    tables.captcha_qa_answers: %core.table_prefix%captcha_answers
-    tables.captcha_qa_confirm: %core.table_prefix%qa_confirm
-    tables.config: %core.table_prefix%config
-    tables.config_text: %core.table_prefix%config_text
-    tables.confirm: %core.table_prefix%confirm
-    tables.disallow: %core.table_prefix%disallow
-    tables.drafts: %core.table_prefix%drafts
-    tables.ext: %core.table_prefix%ext
-    tables.extensions: %core.table_prefix%extensions
-    tables.extension_groups: %core.table_prefix%extension_groups
-    tables.forums: %core.table_prefix%forums
-    tables.forums_access: %core.table_prefix%forums_access
-    tables.forums_track: %core.table_prefix%forums_track
-    tables.forums_watch: %core.table_prefix%forums_watch
-    tables.groups: %core.table_prefix%groups
-    tables.icons: %core.table_prefix%icons
-    tables.lang: %core.table_prefix%lang
-    tables.log: %core.table_prefix%log
-    tables.login_attempts: %core.table_prefix%login_attempts
-    tables.migrations: %core.table_prefix%migrations
-    tables.moderator_cache: %core.table_prefix%moderator_cache
-    tables.modules: %core.table_prefix%modules
-    tables.notification_types: %core.table_prefix%notification_types
-    tables.notifications: %core.table_prefix%notifications
-    tables.poll_options: %core.table_prefix%poll_options
-    tables.poll_votes: %core.table_prefix%poll_votes
-    tables.posts: %core.table_prefix%posts
-    tables.privmsgs: %core.table_prefix%privmsgs
-    tables.privmsgs_folder: %core.table_prefix%privmsgs_folder
-    tables.privmsgs_rules: %core.table_prefix%privmsgs_rules
-    tables.privmsgs_to: %core.table_prefix%privmsgs_to
-    tables.profile_fields: %core.table_prefix%profile_fields
-    tables.profile_fields_data: %core.table_prefix%profile_fields_data
-    tables.profile_fields_options_language: %core.table_prefix%profile_fields_lang
-    tables.profile_fields_language: %core.table_prefix%profile_lang
-    tables.ranks: %core.table_prefix%ranks
-    tables.reports: %core.table_prefix%reports
-    tables.reports_reasons: %core.table_prefix%reports_reasons
-    tables.search_results: %core.table_prefix%search_results
-    tables.search_wordlist: %core.table_prefix%search_wordlist
-    tables.search_wordmatch: %core.table_prefix%search_wordmatch
-    tables.sessions: %core.table_prefix%sessions
-    tables.sessions_keys: %core.table_prefix%sessions_keys
-    tables.sitelist: %core.table_prefix%sitelist
-    tables.smilies: %core.table_prefix%smilies
-    tables.sphinx: %core.table_prefix%sphinx
-    tables.styles: %core.table_prefix%styles
-    tables.styles_template: %core.table_prefix%styles_template
-    tables.styles_template_data: %core.table_prefix%styles_template_data
-    tables.styles_theme: %core.table_prefix%styles_theme
-    tables.styles_imageset: %core.table_prefix%styles_imageset
-    tables.styles_imageset_data: %core.table_prefix%styles_imageset_data
-    tables.teampage: %core.table_prefix%teampage
-    tables.topics: %core.table_prefix%topics
-    tables.topics_posted: %core.table_prefix%topics_posted
-    tables.topics_track: %core.table_prefix%topics_track
-    tables.topics_watch: %core.table_prefix%topics_watch
-    tables.user_group: %core.table_prefix%user_group
-    tables.user_notifications: %core.table_prefix%user_notifications
-    tables.users: %core.table_prefix%users
-    tables.warnings: %core.table_prefix%warnings
-    tables.words: %core.table_prefix%words
-    tables.zebra: %core.table_prefix%zebra
+    tables.acl_groups: '%core.table_prefix%acl_groups'
+    tables.acl_options: '%core.table_prefix%acl_options'
+    tables.acl_roles: '%core.table_prefix%acl_roles'
+    tables.acl_roles_data: '%core.table_prefix%acl_roles_data'
+    tables.acl_users: '%core.table_prefix%acl_users'
+    tables.attachments: '%core.table_prefix%attachments'
+    tables.auth_provider_oauth_token_storage: '%core.table_prefix%oauth_tokens'
+    tables.auth_provider_oauth_states: '%core.table_prefix%oauth_states'
+    tables.auth_provider_oauth_account_assoc: '%core.table_prefix%oauth_accounts'
+    tables.banlist: '%core.table_prefix%banlist'
+    tables.bbcodes: '%core.table_prefix%bbcodes'
+    tables.bookmarks: '%core.table_prefix%bookmarks'
+    tables.bots: '%core.table_prefix%bots'
+    tables.captcha_qa_questions: '%core.table_prefix%captcha_questions'
+    tables.captcha_qa_answers: '%core.table_prefix%captcha_answers'
+    tables.captcha_qa_confirm: '%core.table_prefix%qa_confirm'
+    tables.config: '%core.table_prefix%config'
+    tables.config_text: '%core.table_prefix%config_text'
+    tables.confirm: '%core.table_prefix%confirm'
+    tables.disallow: '%core.table_prefix%disallow'
+    tables.drafts: '%core.table_prefix%drafts'
+    tables.ext: '%core.table_prefix%ext'
+    tables.extensions: '%core.table_prefix%extensions'
+    tables.extension_groups: '%core.table_prefix%extension_groups'
+    tables.forums: '%core.table_prefix%forums'
+    tables.forums_access: '%core.table_prefix%forums_access'
+    tables.forums_track: '%core.table_prefix%forums_track'
+    tables.forums_watch: '%core.table_prefix%forums_watch'
+    tables.groups: '%core.table_prefix%groups'
+    tables.icons: '%core.table_prefix%icons'
+    tables.lang: '%core.table_prefix%lang'
+    tables.log: '%core.table_prefix%log'
+    tables.login_attempts: '%core.table_prefix%login_attempts'
+    tables.migrations: '%core.table_prefix%migrations'
+    tables.moderator_cache: '%core.table_prefix%moderator_cache'
+    tables.modules: '%core.table_prefix%modules'
+    tables.notification_types: '%core.table_prefix%notification_types'
+    tables.notifications: '%core.table_prefix%notifications'
+    tables.poll_options: '%core.table_prefix%poll_options'
+    tables.poll_votes: '%core.table_prefix%poll_votes'
+    tables.posts: '%core.table_prefix%posts'
+    tables.privmsgs: '%core.table_prefix%privmsgs'
+    tables.privmsgs_folder: '%core.table_prefix%privmsgs_folder'
+    tables.privmsgs_rules: '%core.table_prefix%privmsgs_rules'
+    tables.privmsgs_to: '%core.table_prefix%privmsgs_to'
+    tables.profile_fields: '%core.table_prefix%profile_fields'
+    tables.profile_fields_data: '%core.table_prefix%profile_fields_data'
+    tables.profile_fields_options_language: '%core.table_prefix%profile_fields_lang'
+    tables.profile_fields_language: '%core.table_prefix%profile_lang'
+    tables.ranks: '%core.table_prefix%ranks'
+    tables.reports: '%core.table_prefix%reports'
+    tables.reports_reasons: '%core.table_prefix%reports_reasons'
+    tables.search_results: '%core.table_prefix%search_results'
+    tables.search_wordlist: '%core.table_prefix%search_wordlist'
+    tables.search_wordmatch: '%core.table_prefix%search_wordmatch'
+    tables.sessions: '%core.table_prefix%sessions'
+    tables.sessions_keys: '%core.table_prefix%sessions_keys'
+    tables.sitelist: '%core.table_prefix%sitelist'
+    tables.smilies: '%core.table_prefix%smilies'
+    tables.sphinx: '%core.table_prefix%sphinx'
+    tables.styles: '%core.table_prefix%styles'
+    tables.styles_template: '%core.table_prefix%styles_template'
+    tables.styles_template_data: '%core.table_prefix%styles_template_data'
+    tables.styles_theme: '%core.table_prefix%styles_theme'
+    tables.styles_imageset: '%core.table_prefix%styles_imageset'
+    tables.styles_imageset_data: '%core.table_prefix%styles_imageset_data'
+    tables.teampage: '%core.table_prefix%teampage'
+    tables.topics: '%core.table_prefix%topics'
+    tables.topics_posted: '%core.table_prefix%topics_posted'
+    tables.topics_track: '%core.table_prefix%topics_track'
+    tables.topics_watch: '%core.table_prefix%topics_watch'
+    tables.user_group: '%core.table_prefix%user_group'
+    tables.user_notifications: '%core.table_prefix%user_notifications'
+    tables.users: '%core.table_prefix%users'
+    tables.warnings: '%core.table_prefix%warnings'
+    tables.words: '%core.table_prefix%words'
+    tables.zebra: '%core.table_prefix%zebra'

phpBB/config/default/routing/report.yml

@@ -3,7 +3,7 @@ phpbb_report_pm_controller:
     methods:          [GET, POST]
     defaults:
         _controller:  phpbb.report.controller:handle
-        mode:         "pm"
+        mode:         'pm'
     requirements:
         id:           \d+
 
@@ -12,6 +12,6 @@ phpbb_report_post_controller:
     methods:          [GET, POST]
     defaults:
         _controller:  phpbb.report.controller:handle
-        mode:         "post"
+        mode:         'post'
     requirements:
         id:           \d+

phpBB/config/default/routing/routing.yml

@@ -5,11 +5,11 @@
 #     defaults: { _controller: foo_sevice:method }
 #
 # The above will be accessed via app.php?controller=foo and it will
-# instantiate the "foo_service" service and call the "method" method.
+# instantiate the 'foo_service' service and call the 'method' method.
 #
 
 phpbb_feed_routing:
-    resource: "feed.yml"
+    resource: feed.yml
     prefix: /feed
 
 phpbb_feed_index:
@@ -17,8 +17,8 @@ phpbb_feed_index:
     defaults: { _controller: phpbb.feed.controller:overall }
 
 phpbb_help_routing:
-    resource: "help.yml"
+    resource: help.yml
     prefix: /help
 
 phpbb_report_routing:
-    resource: "report.yml"
+    resource: report.yml

phpBB/config/development/routing/environment.yml

@@ -1,2 +1,2 @@
 core.default:
-    resource: "../../default/routing/routing.yml"
+    resource: ../../default/routing/routing.yml

phpBB/config/installer/container/services.yml

@@ -9,6 +9,11 @@ imports:
     - { resource: ../../default/container/services_twig.yml }
 
 services:
+    cache.driver:
+        class: '%cache.driver.class%'
+        arguments:
+            - '%core.root_path%/cache/installer/'
+
     config:
         class: phpbb\config\config
         arguments:
@@ -17,15 +22,24 @@ services:
     controller.resolver:
         class: phpbb\controller\resolver
         arguments:
-            - @service_container
-            - %core.root_path%
-            - @template
+            - '@service_container'
+            - '%core.root_path%'
+            - '@template'
 
     file_locator:
         class: phpbb\routing\file_locator
         arguments:
-            - @filesystem
-            - %core.root_path%
+            - '@filesystem'
+            - '%core.root_path%'
+
+    kernel_exception_subscriber:
+        class: phpbb\install\event\kernel_exception_subscriber
+        arguments:
+            - '@phpbb.installer.controller.helper'
+            - '@language'
+            - '@template'
+        tags:
+            - { name: kernel.event_subscriber }
 
     language.loader:
         parent: language.loader_abstract
@@ -33,48 +47,48 @@ services:
     path_helper:
         class: phpbb\path_helper
         arguments:
-            - @symfony_request
-            - @filesystem
-            - @request
-            - %core.root_path%
-            - %core.php_ext%
+            - '@symfony_request'
+            - '@filesystem'
+            - '@request'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     routing.resources_locator.default:
         class: phpbb\routing\resources_locator\installer_resources_locator
         arguments:
-            - @filesystem
-            - %core.root_path%
-            - %core.environment%
+            - '@filesystem'
+            - '%core.root_path%'
+            - '%core.environment%'
         tags:
             - { name: routing.resources_locator }
 
     template:
         class: phpbb\template\twig\twig
         arguments:
-            - @path_helper
-            - @config
-            - @template_context
-            - @template.twig.environment
-            - %core.template.cache_path%
+            - '@path_helper'
+            - '@config'
+            - '@template_context'
+            - '@template.twig.environment'
+            - '%core.template.cache_path%'
             - null
-            - @template.twig.extensions.collection
+            - '@template.twig.extensions.collection'
 
     template.twig.environment:
         class: phpbb\template\twig\environment
         arguments:
-            - @config
-            - @filesystem
-            - @path_helper
-            - @service_container
-            - %core.template.cache_path%
+            - '@config'
+            - '@filesystem'
+            - '@path_helper'
+            - '@service_container'
+            - '%core.template.cache_path%'
             - null
-            - @template.twig.loader
+            - '@template.twig.loader'
             - []
 
     console.exception_subscriber:
         class: phpbb\console\exception_subscriber
         arguments:
-            - @language
-            - %debug.exceptions%
+            - '@language'
+            - '%debug.exceptions%'
         tags:
             - { name: kernel.event_subscriber }

phpBB/config/installer/container/services_file_updater.yml

@@ -2,37 +2,37 @@ services:
     installer.file_updater.factory:
         class: phpbb\install\helper\file_updater\factory
         arguments:
-            - @installer.file_updater.collection
+            - '@installer.file_updater.collection'
 
     installer.file_updater.collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: file_updater }
 
     installer.file_updater.compress:
         class: phpbb\install\helper\file_updater\compression_file_updater
         arguments:
-            - @installer.helper.update_helper
-            - %core.root_path%
-            - %core.php_ext%
+            - '@installer.helper.update_helper'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: file_updater }
 
     installer.file_updater.ftp:
         class: phpbb\install\helper\file_updater\ftp_file_updater
         arguments:
-            - @installer.helper.update_helper
-            - %core.root_path%
-            - %core.php_ext%
+            - '@installer.helper.update_helper'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: file_updater }
 
     installer.file_updater.file:
         class: phpbb\install\helper\file_updater\file_updater
         arguments:
-            - @filesystem
-            - %core.root_path%
+            - '@filesystem'
+            - '%core.root_path%'
         tags:
             - { name: file_updater }

phpBB/config/installer/container/services_install_console.yml

@@ -2,26 +2,26 @@ services:
     console.installer.command_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: console.installer.command }
 
     console.installer.command.install:
         class: phpbb\install\console\command\install\install
         arguments:
-            - @language
-            - @installer.helper.iohandler_factory
-            - @installer.installer.install
-            - @installer.helper.install_helper
+            - '@language'
+            - '@installer.helper.iohandler_factory'
+            - '@installer.installer.install'
+            - '@installer.helper.install_helper'
         tags:
             - { name: console.installer.command }
 
     console.installer.command.config.show:
         class: phpbb\install\console\command\install\config\show
         arguments:
-            - @language
-            - @installer.helper.iohandler_factory
-            - @installer.installer.install
+            - '@language'
+            - '@installer.helper.iohandler_factory'
+            - '@installer.installer.install'
         tags:
             - { name: console.installer.command }
 
@@ -29,8 +29,8 @@ services:
     console.installer.command.config.validate:
         class: phpbb\install\console\command\install\config\validate
         arguments:
-            - @language
-            - @installer.helper.iohandler_factory
-            - @installer.installer.install
+            - '@language'
+            - '@installer.helper.iohandler_factory'
+            - '@installer.installer.install'
         tags:
             - { name: console.installer.command }

phpBB/config/installer/container/services_install_controller.yml

@@ -2,50 +2,65 @@ services:
     phpbb.installer.controller.welcome:
         class: phpbb\install\controller\installer_index
         arguments:
-            - @phpbb.installer.controller.helper
-            - @language
-            - @template
-            - %core.root_path%
+            - '@phpbb.installer.controller.helper'
+            - '@language'
+            - '@template'
+            - '%core.root_path%'
 
     phpbb.installer.controller.helper:
         class: phpbb\install\controller\helper
         arguments:
-            - @installer.helper.config
-            - @language
-            - @language.helper.language_file
-            - @installer.navigation.provider
-            - @template
-            - @path_helper
-            - @request
-            - @symfony_request
-            - @router
-            - %core.root_path%
+            - '@installer.helper.config'
+            - '@language'
+            - '@language.helper.language_file'
+            - '@installer.navigation.provider'
+            - '@template'
+            - '@path_helper'
+            - '@request'
+            - '@symfony_request'
+            - '@router'
+            - '%core.root_path%'
 
     phpbb.installer.controller.install:
         class: phpbb\install\controller\install
         arguments:
-            - @phpbb.installer.controller.helper
-            - @installer.helper.iohandler_factory
-            - @installer.navigation.provider
-            - @language
-            - @template
-            - @request
-            - @installer.installer.install
-            - @installer.helper.install_helper
+            - '@phpbb.installer.controller.helper'
+            - '@installer.helper.iohandler_factory'
+            - '@installer.navigation.provider'
+            - '@language'
+            - '@template'
+            - '@request'
+            - '@installer.installer.install'
+            - '@installer.helper.install_helper'
 
     phpbb.installer.controller.update:
         class: phpbb\install\controller\update
         arguments:
-            - @phpbb.installer.controller.helper
-            - @installer.installer.update
-            - @installer.helper.install_helper
-            - @installer.helper.iohandler_factory
-            - @language
-            - @installer.navigation.provider
-            - @request
-            - @template
+            - '@phpbb.installer.controller.helper'
+            - '@installer.installer.update'
+            - '@installer.helper.install_helper'
+            - '@installer.helper.iohandler_factory'
+            - '@language'
+            - '@installer.navigation.provider'
+            - '@request'
+            - '@template'
 
     phpbb.installer.controller.file_downloader:
         class: phpbb\install\controller\archive_download
         arguments:
-            - @installer.helper.config
+            - '@installer.helper.config'
+
+    phpbb.installer.controller.convert:
+        class: phpbb\convert\controller\convertor
+        arguments:
+            - '@installer.helper.container_factory'
+            - '@installer.helper.database'
+            - '@phpbb.installer.controller.helper'
+            - '@installer.helper.install_helper'
+            - '@installer.helper.iohandler_factory'
+            - '@language'
+            - '@installer.navigation.provider'
+            - '@request'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'

phpBB/config/installer/container/services_install_data.yml

@@ -2,36 +2,36 @@ services:
     installer.install_data.add_bots:
         class: phpbb\install\module\install_data\task\add_bots
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @installer.helper.container_factory
-            - @language
-            - %core.root_path%
-            - %core.php_ext%
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@installer.helper.container_factory'
+            - '@language'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: install_data_install, order: 20 }
 
     installer.install_data.add_languages:
         class: phpbb\install\module\install_data\task\add_languages
         arguments:
-            - @installer.helper.iohandler
-            - @installer.helper.container_factory
-            - @language.helper.language_file
+            - '@installer.helper.iohandler'
+            - '@installer.helper.container_factory'
+            - '@language.helper.language_file'
         tags:
             - { name: install_data_install, order: 10 }
 
     installer.install_data.add_modules:
         class: phpbb\install\module\install_data\task\add_modules
         arguments:
-            - @installer.helper.iohandler
-            - @installer.helper.container_factory
+            - '@installer.helper.iohandler'
+            - '@installer.helper.container_factory'
         tags:
             - { name: install_data_install, order: 30 }
 
     installer.module.data_install_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: install_data_install, class_name_aware: true }
 
@@ -39,6 +39,6 @@ services:
         class: phpbb\install\module\install_data\module
         parent: installer.module_base
         arguments:
-            - @installer.module.data_install_collection
+            - '@installer.module.data_install_collection'
         tags:
             - { name: installer_install_module, order: 50 }

phpBB/config/installer/container/services_install_database.yml

@@ -2,43 +2,43 @@ services:
     installer.install_database.create_schema:
         class: phpbb\install\module\install_database\task\create_schema
         arguments:
-            - @installer.helper.config
-            - @installer.helper.database
-            - @filesystem
-            - @installer.helper.iohandler
-            - %core.root_path%
-            - %core.php_ext%
+            - '@installer.helper.config'
+            - '@installer.helper.database'
+            - '@filesystem'
+            - '@installer.helper.iohandler'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: install_database_install, order: 10 }
 
     installer.install_database.add_default_data:
         class: phpbb\install\module\install_database\task\add_default_data
         arguments:
-            - @installer.helper.database
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @installer.helper.container_factory
-            - @language
-            - %core.root_path%
+            - '@installer.helper.database'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@installer.helper.container_factory'
+            - '@language'
+            - '%core.root_path%'
         tags:
             - { name: install_database_install, order: 20 }
 
     installer.install_database.add_config_settings:
         class: phpbb\install\module\install_database\task\add_config_settings
         arguments:
-            - @filesystem
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @installer.helper.container_factory
-            - @language
-            - %core.root_path%
+            - '@filesystem'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@installer.helper.container_factory'
+            - '@language'
+            - '%core.root_path%'
         tags:
             - { name: install_database_install, order: 30 }
 
     installer.module.install_database_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: install_database_install, class_name_aware: true }
 
@@ -46,6 +46,6 @@ services:
         class: phpbb\install\module\install_database\module
         parent: installer.module_base
         arguments:
-            - @installer.module.install_database_collection
+            - '@installer.module.install_database_collection'
         tags:
             - { name: installer_install_module, order: 40 }

phpBB/config/installer/container/services_install_filesystem.yml

@@ -2,20 +2,20 @@ services:
     installer.install_filesystem.create_config_file:
         class: phpbb\install\module\install_filesystem\task\create_config_file
         arguments:
-            - @filesystem
-            - @installer.helper.config
-            - @installer.helper.database
-            - @installer.helper.iohandler
-            - %core.root_path%
-            - %core.php_ext%
-            - %installer.create_config_file.options%
+            - '@filesystem'
+            - '@installer.helper.config'
+            - '@installer.helper.database'
+            - '@installer.helper.iohandler'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%installer.create_config_file.options%'
         tags:
             - { name: install_filesystem_install, order: 10 }
 
     installer.module.install_filesystem_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: install_filesystem_install, class_name_aware: true }
 
@@ -23,6 +23,6 @@ services:
         class: phpbb\install\module\install_filesystem\module
         parent: installer.module_base
         arguments:
-            - @installer.module.install_filesystem_collection
+            - '@installer.module.install_filesystem_collection'
         tags:
             - { name: installer_install_module, order: 30 }

phpBB/config/installer/container/services_install_finish.yml

@@ -2,25 +2,25 @@ services:
     installer.install_finish.populate_migrations:
         class: phpbb\install\module\install_finish\task\populate_migrations
         arguments:
-            - @installer.helper.container_factory
+            - '@installer.helper.container_factory'
         tags:
             - { name: install_finish, order: 10 }
 
     installer.install_finish.notify_user:
         class: phpbb\install\module\install_finish\task\notify_user
         arguments:
-            - @installer.helper.container_factory
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - %core.root_path%
-            - %core.php_ext%
+            - '@installer.helper.container_factory'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: install_finish, order: 20 }
 
     installer.module.install_finish_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: install_finish, class_name_aware: true }
 
@@ -28,6 +28,6 @@ services:
         class: phpbb\install\module\install_filesystem\module
         parent: installer.module_base
         arguments:
-            - @installer.module.install_finish_collection
+            - '@installer.module.install_finish_collection'
         tags:
             - { name: installer_install_module, order: 60 }

phpBB/config/installer/container/services_install_navigation.yml

@@ -2,12 +2,12 @@ services:
     installer.navigation.provider:
         class: phpbb\install\helper\navigation\navigation_provider
         arguments:
-            - @installer.navigation.service_collection
+            - '@installer.navigation.service_collection'
 
     installer.navigation.service_collection:
             class: phpbb\di\service_collection
             arguments:
-                - @service_container
+                - '@service_container'
             tags:
                 - { name: service_collection, tag: installer.navigation }
 
@@ -20,7 +20,7 @@ services:
     installer.navigation.install_navigation:
         class: phpbb\install\helper\navigation\install_navigation
         arguments:
-            - @installer.helper.install_helper
+            - '@installer.helper.install_helper'
         scope: prototype
         tags:
             - { name: installer.navigation }
@@ -28,8 +28,15 @@ services:
     installer.navigation.update_navigation:
         class: phpbb\install\helper\navigation\update_navigation
         arguments:
-            - @installer.helper.install_helper
+            - '@installer.helper.install_helper'
         scope: prototype
         tags:
             - { name: installer.navigation }
 
+    installer.navigation.convertor_navigation:
+        class: phpbb\install\helper\navigation\convertor_navigation
+        arguments:
+            - '@installer.helper.install_helper'
+        scope: prototype
+        tags:
+            - { name: installer.navigation }

phpBB/config/installer/container/services_install_obtain_data.yml

@@ -2,56 +2,56 @@ services:
     installer.obtain_data.obtain_admin_data:
         class: phpbb\install\module\obtain_data\task\obtain_admin_data
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
         tags:
             - { name: install_obtain_data, order: 10 }
 
     installer.obtain_data.obtain_board_data:
         class: phpbb\install\module\obtain_data\task\obtain_board_data
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @language.helper.language_file
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@language.helper.language_file'
         tags:
             - { name: install_obtain_data, order: 50 }
 
     installer.obtain_data.obtain_database_data:
         class: phpbb\install\module\obtain_data\task\obtain_database_data
         arguments:
-            - @installer.helper.database
-            - @installer.helper.config
-            - @installer.helper.iohandler
+            - '@installer.helper.database'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
         tags:
             - { name: install_obtain_data, order: 20 }
 
     installer.obtain_data.obtain_email_data:
         class: phpbb\install\module\obtain_data\task\obtain_email_data
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
         tags:
             - { name: install_obtain_data, order: 40 }
 
     installer.obtain_data.obtain_imagick_path:
         class: phpbb\install\module\obtain_data\task\obtain_imagick_path
         arguments:
-            - @installer.helper.config
+            - '@installer.helper.config'
         tags:
             - { name: install_obtain_data, order: 60 }
 
     installer.obtain_data.obtain_server_data:
         class: phpbb\install\module\obtain_data\task\obtain_server_data
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
         tags:
             - { name: install_obtain_data, order: 30 }
 
     installer.module.install_obtain_data_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: install_obtain_data, class_name_aware: true }
 
@@ -59,7 +59,7 @@ services:
         class: phpbb\install\module\obtain_data\install_module
         parent: installer.module_base
         arguments:
-            - @installer.module.install_obtain_data_collection
+            - '@installer.module.install_obtain_data_collection'
             - true
             - false
         tags:

phpBB/config/installer/container/services_install_requirements.yml

@@ -2,18 +2,18 @@ services:
     installer.requirements.check_filesystem:
         class: phpbb\install\module\requirements\task\check_filesystem
         arguments:
-            - @filesystem
-            - @installer.helper.iohandler
-            - %core.root_path%
-            - %core.php_ext%
+            - '@filesystem'
+            - '@installer.helper.iohandler'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: installer_requirements, order: 10 }
 
     installer.requirements.check_server_environment:
         class: phpbb\install\module\requirements\task\check_server_environment
         arguments:
-            - @installer.helper.database
-            - @installer.helper.iohandler
+            - '@installer.helper.database'
+            - '@installer.helper.iohandler'
         tags:
             - { name: installer_requirements, order: 20 }
             - { name: update_requirements, order: 20 }
@@ -21,7 +21,7 @@ services:
     installer.module.install_requirements_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: installer_requirements, class_name_aware: true }
 
@@ -30,7 +30,7 @@ services:
         class: phpbb\install\module\requirements\install_module
         parent: installer.module_base
         arguments:
-            - @installer.module.install_requirements_collection
+            - '@installer.module.install_requirements_collection'
             - true
             - false
         tags:

phpBB/config/installer/container/services_installer.yml

@@ -19,34 +19,34 @@ services:
     installer.helper.config:
         class: phpbb\install\helper\config
         arguments:
-            - @filesystem
-            - @php_ini
-            - %core.root_path%
+            - '@filesystem'
+            - '@php_ini'
+            - '%core.root_path%'
 
     installer.helper.database:
         class: phpbb\install\helper\database
         arguments:
-            - @filesystem
-            - %core.root_path%
+            - '@filesystem'
+            - '%core.root_path%'
 
     installer.helper.iohandler_factory:
         class: phpbb\install\helper\iohandler\factory
         arguments:
-            - @service_container
+            - '@service_container'
 
     installer.helper.iohandler_abstract:
         abstract: true
         calls:
-            - [set_language, ["@language"]]
+            - [set_language, ['@language']]
 
     installer.helper.iohandler_ajax:
         class: phpbb\install\helper\iohandler\ajax_iohandler
         parent: installer.helper.iohandler_abstract
         arguments:
-            - @path_helper
-            - @request
-            - @template
-            - @router
+            - '@path_helper'
+            - '@request'
+            - '@template'
+            - '@router'
 
     installer.helper.iohandler_cli:
         class: phpbb\install\helper\iohandler\cli_iohandler
@@ -54,61 +54,62 @@ services:
 
     installer.helper.iohandler:
         class: phpbb\install\helper\iohandler\iohandler_interface
-        factory: ["@installer.helper.iohandler_factory", get]
+        factory: ['@installer.helper.iohandler_factory', get]
 
     installer.helper.container_factory:
         class: phpbb\install\helper\container_factory
         arguments:
-            - @language
-            - @request
-            - @installer.helper.update_helper
-            - %core.root_path%
-            - %core.php_ext%
+            - '@language'
+            - '@request'
+            - '@installer.helper.update_helper'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     installer.helper.install_helper:
         class: phpbb\install\helper\install_helper
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     installer.helper.update_helper:
         class: phpbb\install\helper\update_helper
         arguments:
-            - %core.root_path%
+            - '%core.root_path%'
 
 # -------- Installer --------------------------------
     installer.module_base:
         abstract: true
         calls:
-            - [setup, [@installer.helper.config, @installer.helper.iohandler]]
+            - [setup, ['@installer.helper.config', '@installer.helper.iohandler']]
 
     installer.installer.abstract:
         class: phpbb\install\installer
         abstract: true
         arguments:
-            - @installer.helper.config
-            - @path_helper
+            - '@cache.driver'
+            - '@installer.helper.config'
+            - '@path_helper'
 
     installer.install.module_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: installer_install_module }
 
     installer.update.module_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: installer_update_module }
 
     installer.installer.install:
         parent: installer.installer.abstract
         calls:
-            - [set_modules, [@installer.install.module_collection]]
+            - [set_modules, ['@installer.install.module_collection']]
 
     installer.installer.update:
         parent: installer.installer.abstract
         calls:
-            - [set_modules, [@installer.update.module_collection]]
+            - [set_modules, ['@installer.update.module_collection']]

phpBB/config/installer/container/services_update_database.yml

@@ -2,19 +2,19 @@ services:
     installer.update_database.update_task:
         class: phpbb\install\module\update_database\task\update
         arguments:
-            - @installer.helper.container_factory
-            - @filesystem
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @language
-            - %core.root_path%
+            - '@installer.helper.container_factory'
+            - '@filesystem'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@language'
+            - '%core.root_path%'
         tags:
             - { name: update_database_task, order: 10 }
 
     installer.module.update_database_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: update_database_task, class_name_aware: true }
 
@@ -22,7 +22,7 @@ services:
         class: phpbb\install\module\update_database\module
         parent: installer.module_base
         arguments:
-            - @installer.module.update_database_collection
+            - '@installer.module.update_database_collection'
             - true
             - false
         tags:

phpBB/config/installer/container/services_update_filesystem.yml

@@ -2,62 +2,62 @@ services:
     installer.update_filesystem.check_task:
         class: phpbb\install\module\update_filesystem\task\file_check
         arguments:
-            - @filesystem
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @installer.helper.update_helper
-            - %core.root_path%
+            - '@filesystem'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@installer.helper.update_helper'
+            - '%core.root_path%'
         tags:
             - { name: update_filesystem, order: 10 }
 
     installer.update_filesystem.diff_files:
         class: phpbb\install\module\update_filesystem\task\diff_files
         arguments:
-            - @installer.helper.container_factory
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @installer.helper.update_helper
-            - %core.root_path%
-            - %core.php_ext%
+            - '@installer.helper.container_factory'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@installer.helper.update_helper'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: update_filesystem, order: 20 }
 
     installer.update_filesystem.show_file_status:
         class: phpbb\install\module\update_filesystem\task\show_file_status
         arguments:
-            - @installer.helper.container_factory
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @filesystem
-            - @installer.file_updater.factory
+            - '@installer.helper.container_factory'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@filesystem'
+            - '@installer.file_updater.factory'
         tags:
             - { name: update_filesystem, order: 30 }
 
     installer.update_filesystem.update_files:
         class: phpbb\install\module\update_filesystem\task\update_files
         arguments:
-            - @installer.helper.container_factory
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @installer.file_updater.factory
-            - @installer.helper.update_helper
-            - %core.root_path%
+            - '@installer.helper.container_factory'
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@installer.file_updater.factory'
+            - '@installer.helper.update_helper'
+            - '%core.root_path%'
         tags:
             - { name: update_filesystem, order: 40 }
 
     installer.update_filesystem.download_updated_files:
         class: phpbb\install\module\update_filesystem\task\download_updated_files
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @filesystem
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@filesystem'
         tags:
             - { name: update_filesystem, order: 50 }
 
     installer.module.update_filesystem_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: update_filesystem, class_name_aware: true }
 
@@ -65,7 +65,7 @@ services:
         class: phpbb\install\module\update_filesystem\module
         parent: installer.module_base
         arguments:
-            - @installer.module.update_filesystem_collection
+            - '@installer.module.update_filesystem_collection'
             - true
             - false
         tags:

phpBB/config/installer/container/services_update_obtain_data.yml

@@ -2,43 +2,43 @@ services:
     installer.obtain_data.update_options:
         class: phpbb\install\module\obtain_data\task\obtain_update_settings
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
         tags:
             - { name: update_obtain_data, order: 10 }
 
     installer.obtain_data.file_updater_method:
         class: phpbb\install\module\obtain_data\task\obtain_file_updater_method
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
         tags:
             - { name: update_obtain_data, order: 20 }
 
     installer.obtain_data.update_files:
         class: phpbb\install\module\obtain_data\task\obtain_update_files
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - %core.root_path%
-            - %core.php_ext%
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: update_obtain_data, order: 30 }
 
     installer.obtain_data.update_ftp_settings:
         class: phpbb\install\module\obtain_data\task\obtain_update_ftp_data
         arguments:
-            - @installer.helper.config
-            - @installer.helper.iohandler
-            - @installer.helper.update_helper
-            - %core.php_ext%
+            - '@installer.helper.config'
+            - '@installer.helper.iohandler'
+            - '@installer.helper.update_helper'
+            - '%core.php_ext%'
         tags:
             - { name: update_obtain_data, order: 40 }
 
     installer.module.update_obtain_data_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: update_obtain_data, class_name_aware: true }
 
@@ -46,7 +46,7 @@ services:
         class: phpbb\install\module\obtain_data\update_module
         parent: installer.module_base
         arguments:
-            - @installer.module.update_obtain_data_collection
+            - '@installer.module.update_obtain_data_collection'
             - true
             - false
         tags:

phpBB/config/installer/container/services_update_requirements.yml

@@ -2,10 +2,10 @@ services:
     installer.requirements.check_filesystem_update:
         class: phpbb\install\module\requirements\task\check_filesystem
         arguments:
-            - @filesystem
-            - @installer.helper.iohandler
-            - %core.root_path%
-            - %core.php_ext%
+            - '@filesystem'
+            - '@installer.helper.iohandler'
+            - '%core.root_path%'
+            - '%core.php_ext%'
             - false
         tags:
             - { name: update_requirements, order: 10 }
@@ -13,19 +13,19 @@ services:
     installer.requirements.update_requirements:
         class: phpbb\install\module\requirements\task\check_update
         arguments:
-            - @installer.helper.container_factory
-            - @filesystem
-            - @installer.helper.iohandler
-            - @installer.helper.update_helper
-            - %core.root_path%
-            - %core.php_ext%
+            - '@installer.helper.container_factory'
+            - '@filesystem'
+            - '@installer.helper.iohandler'
+            - '@installer.helper.update_helper'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: update_requirements, order: 30 }
 
     installer.module.update_requirements_collection:
         class: phpbb\di\ordered_service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: update_requirements, class_name_aware: true }
 
@@ -33,7 +33,7 @@ services:
         class: phpbb\install\module\requirements\update_module
         parent: installer.module_base
         arguments:
-            - @installer.module.update_requirements_collection
+            - '@installer.module.update_requirements_collection'
             - true
             - false
         tags:

phpBB/config/installer/routing/environment.yml

@@ -1,2 +1,2 @@
 core.default:
-    resource: "installer.yml"
+    resource: installer.yml

phpBB/config/installer/routing/installer.yml

@@ -2,19 +2,19 @@ phpbb_installer_index:
     path: /
     defaults:
         _controller: phpbb.installer.controller.welcome:handle
-        mode: "intro"
+        mode: 'intro'
 
 phpbb_installer_license:
     path: /license
     defaults:
         _controller: phpbb.installer.controller.welcome:handle
-        mode: "license"
+        mode: 'license'
 
 phpbb_installer_support:
     path: /support
     defaults:
         _controller: phpbb.installer.controller.welcome:handle
-        mode: "support"
+        mode: 'support'
 
 phpbb_installer_install:
     path: /install
@@ -35,3 +35,28 @@ phpbb_installer_update_conflict_download:
     path: /download/conflict
     defaults:
         _controller: phpbb.installer.controller.file_downloader:conflict_archive
+
+phpbb_convert_intro:
+    path: /convert/{start_new}
+    defaults:
+        _controller: phpbb.installer.controller.convert:intro
+        start_new: 0
+
+phpbb_convert_settings:
+    path: /convert/settings/{convertor}
+    defaults:
+        _controller: phpbb.installer.controller.convert:settings
+    requirements:
+        converter: "[a-zA-Z0-9_]+"
+
+phpbb_convert_convert:
+    path: /convert/in_progress/{converter}
+    defaults:
+        _controller: phpbb.installer.controller.convert:convert
+    requirements:
+        converter: "[a-zA-Z0-9_]+"
+
+phpbb_convert_finish:
+    path: /convert/finished
+    defaults:
+        _controller: phpbb.installer.controller.convert:finish

phpBB/config/production/routing/environment.yml

@@ -1,2 +1,2 @@
 core.default:
-    resource: "../../default/routing/routing.yml"
+    resource: ../../default/routing/routing.yml

phpBB/config/test/routing/environment.yml

@@ -1,2 +1,2 @@
 core.default:
-    resource: "../../default/routing/routing.yml"
+    resource: ../../default/routing/routing.yml

phpBB/develop/add_permissions.php

@@ -389,7 +389,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 						foreach ($sql_subary as $sql)
 						{
 							$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) VALUES ($sql)";
-							$result = $db->sql_query($sql);
+							$db->sql_query($sql);
 							$sql = '';
 						}
 				}
@@ -397,7 +397,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 				if ($sql != '')
 				{
 					$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) $sql";
-					$result = $db->sql_query($sql);
+					$db->sql_query($sql);
 				}
 				break;
 
@@ -405,7 +405,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 			case 'delete':
 				foreach ($sql_subary as $sql)
 				{
-					$result = $db->sql_query($sql);
+					$db->sql_query($sql);
 					$sql = '';
 				}
 				break;

phpBB/develop/benchmark.php

@@ -143,7 +143,7 @@ function filldb($newposts)
 		if ((rand(0,30) < 1) || ($forum_topic_count[$forum] == 0))
 		{
 			// create a new topic 1 in 30 times (or when there are none);
-			$topic = make_topic($userid, "Testing topic $i", $forum);
+			make_topic($userid, "Testing topic $i", $forum);
 			$forum_topic_count[$forum]++;
 		} 
 		else 

phpBB/develop/create_schema_files.php

@@ -38,6 +38,7 @@ define('IN_PHPBB', true);
 $phpbb_root_path = dirname(__FILE__) . '/../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
+include($phpbb_root_path . 'vendor/autoload.php');
 include($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);

phpBB/develop/lang_migrate_help_lang.php

@@ -11,18 +11,13 @@
  *
  */
 
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-#die("Please read the first lines of this script for instructions on how to enable it");
+define('LANGUAGE_TO_MIGRATE', 'en');
+
+# NO CHANGES BELOW THIS LINE
 
 define('IN_PHPBB', true);
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
-$phpbb_root_path='./../';
+$phpbb_root_path = './../';
 include($phpbb_root_path . 'common.'.$phpEx);
 
 $help_bbcode = load_help('bbcode');
@@ -239,7 +234,7 @@ trigger_error('Successfully migrated help_bbcode and help_faq to help/bbcode and
 function load_help($help)
 {
 	global $phpbb_root_path;
-	include($phpbb_root_path . 'language/en/help_' . $help . '.php');
+	include($phpbb_root_path . 'language/' . LANGUAGE_TO_MIGRATE . '/help_' . $help . '.php');
 	return $help;
 }
 
@@ -250,7 +245,7 @@ function load_help($help)
 function write_help($help, array $lang)
 {
 	global $phpbb_root_path;
-	$fp = fopen($phpbb_root_path . 'language/en/help/' . $help . '.php', 'wb');
+	$fp = fopen($phpbb_root_path . 'language/' . LANGUAGE_TO_MIGRATE . '/help/' . $help . '.php', 'wb');
 	fwrite($fp, get_language_file_header());
 	fwrite($fp, '$lang = array_merge($lang, array(' . "\n");
 

phpBB/develop/unicode_testing.php

@@ -19,7 +19,7 @@ if (!headers_sent())
 function unicode_to_utf8($string)
 {
 	$utf8 = '';
-	$chars = array();
+
 	for ($i = 0; $i < strlen($string); $i++)
 	{
 		if (isset($string[$i + 5]) && substr($string, $i, 2) == '\\u' && ctype_xdigit(substr($string, $i + 2, 4)))

phpBB/docs/CHANGELOG.html

@@ -49,7 +49,11 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
+		<li><a href="#v320a2">Changes since 3.2.0-a2</a></li>
+		<li><a href="#v320a1">Changes since 3.2.0-a1</a></li>
 		<li><a href="#v31x">Changes since 3.1.x</a></li>
+		<li><a href="#v317">Changes since 3.1.7</a></li>
+		<li><a href="#v316">Changes since 3.1.6</a></li>
 		<li><a href="#v315">Changes since 3.1.5</a></li>
 		<li><a href="#v314">Changes since 3.1.4</a></li>
 		<li><a href="#v313">Changes since 3.1.3</a></li>
@@ -114,6 +118,88 @@
 
 		<div class="content">
 
+			<a name="v320a2"></a><h3>Changes since 3.2.0-a2</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10628">PHPBB3-10628</a>] - http:// prepended to &quot;www.&quot; urls (but not reflected in preview)</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11875">PHPBB3-11875</a>] - mediumint(8) too small for post_id</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12221">PHPBB3-12221</a>] - URLs Containing javascript: are Garbled</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14129">PHPBB3-14129</a>] - Adding custom extensions autoloaders feature slow downs the board</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14321">PHPBB3-14321</a>] - Fatal error on download the merged conflicts archive during update from 3.1.6 to 3.2-a1</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14323">PHPBB3-14323</a>] - Long urls are no longer shortened</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14368">PHPBB3-14368</a>] - Post Editors Text Should Be Black, Not Blue</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14371">PHPBB3-14371</a>] - Small fix for the aligment quick links</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14373">PHPBB3-14373</a>] - Do not use strpos() on arrays in iohandler_base::add_error_message()</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14378">PHPBB3-14378</a>] - Maintain consistent template var paths in 3.2 installer</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14380">PHPBB3-14380</a>] - Maintain consistent template var paths in 3.2 installer</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14402">PHPBB3-14402</a>] - Tidy plupload cron should not rely on user id/ip being available</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14403">PHPBB3-14403</a>] - phpbb\log should still work even when no user data is given</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14405">PHPBB3-14405</a>] - Text processor parses invalid use of url bbcode</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14419">PHPBB3-14419</a>] - Update composer dependencies and fix outdated composer lock file</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14420">PHPBB3-14420</a>] - Search Results pagination not up to date / broken</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14428">PHPBB3-14428</a>] - Use other links for files remote test</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14431">PHPBB3-14431</a>] - Remote avatar uploading does not support https</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14432">PHPBB3-14432</a>] - The lang() function needs to handle key array</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14434">PHPBB3-14434</a>] - Schema generator fails if extensions have non-migrations in migrations dir</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14436">PHPBB3-14436</a>] - Default data type migration misses oauth_states dependency</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14442">PHPBB3-14442</a>] - Use Goutte ~2.0 after allowing PHP &gt;= 5.4</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14444">PHPBB3-14444</a>] - Fatal error in functions_messenger.php</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14446">PHPBB3-14446</a>] - Add predefined placeholder variables to twig</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14452">PHPBB3-14452</a>] - Undefined $progressFillerText in installer.js</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14453">PHPBB3-14453</a>] - Missing dependency in the text_reparser migration</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13454">PHPBB3-13454</a>] - Remove unused variables, globals, parameters</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13733">PHPBB3-13733</a>] - Allow non-migration files inside migrations folder</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14177">PHPBB3-14177</a>] - Catch exceptions and display a nice error page</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14253">PHPBB3-14253</a>] - Show group requests pending aproval at the ACP groups summary</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14377">PHPBB3-14377</a>] - Allow extensions to register custom compiler pass</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14418">PHPBB3-14418</a>] - Add missing language string PM_TOOLS</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14445">PHPBB3-14445</a>] - Force page refresh before the installer generates the schema</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14250">PHPBB3-14250</a>] - Review/bump composer dependencies</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14262">PHPBB3-14262</a>] - Move converter code into a controller</li>
+			</ul>
+
+			<a name="v320a1"></a><h3>Changes since 3.2.0-a1</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9791">PHPBB3-9791</a>] - invalid [] - chars on search URI</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13451">PHPBB3-13451</a>] - A very long string inside message crashes PHP</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14273">PHPBB3-14273</a>] - Unnecessary core.root_path dependency in files.upload service</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14293">PHPBB3-14293</a>] - Responsive .postbody width not expanding</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14295">PHPBB3-14295</a>] - Icon on left side of &quot;Post awaiting approval&quot; inside messages is missing</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14311">PHPBB3-14311</a>] - Installer error messages not being reported back to client properly</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14317">PHPBB3-14317</a>] - Run lang_migrate_help_lang script on master</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14320">PHPBB3-14320</a>] - Language selector is broken in the installer</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14325">PHPBB3-14325</a>] - Renamed Event Variables Backwards Incompatible</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14326">PHPBB3-14326</a>] - Diffed files are not decoded at update</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14339">PHPBB3-14339</a>] - State support for PHP 7.0 in docs</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14344">PHPBB3-14344</a>] - Improve formatting of errors during install</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14345">PHPBB3-14345</a>] - Check if message description exists in install cli iohandler</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14349">PHPBB3-14349</a>] - Improve error messages and remove output of suppressed messages</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14350">PHPBB3-14350</a>] - Remove duplicate semi-colon from functions_user</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14358">PHPBB3-14358</a>] - Fatal error when running create_schema_files.php (missing composer autoloader)</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14359">PHPBB3-14359</a>] - Wrong service definition for console.command.reparser.reparse</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12649">PHPBB3-12649</a>] - Change sort &amp; display options in footers to dropdown menu</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14257">PHPBB3-14257</a>] - Reparse after update</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14269">PHPBB3-14269</a>] - Use http_exceptions instead of die() in installer controllers</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14310">PHPBB3-14310</a>] - Progress bar in new installer not very clear</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14340">PHPBB3-14340</a>] - Revert the workaround fix for segmentation fault error on phpBB 3.2 PHP 7 tests</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14247">PHPBB3-14247</a>] - Usage of @ at begining of an unquoted string in a yaml file is deprecated</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14341">PHPBB3-14341</a>] - Update to Symfony 2.8</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14348">PHPBB3-14348</a>] - Add an index.html to the install folder</li>
+			</ul>
+
 			<a name="v31x"></a><h3>Changes since 3.1.x</h3>
 			<h4>Bug</h4>
 			<ul>
@@ -351,6 +437,123 @@
 				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14265">PHPBB3-14265</a>] - Make all tables available in the container</li>
 			</ul>
 
+			<a name="v317"></a><h3>Changes since 3.1.7</h3>
+
+	<h4>Security Issue</h4>
+	<ul>
+		<li>[SECURITY-188] - Check form key in acp_bbcodes</li>
+	</ul>
+	<h4>Bug</h4>
+	<ul>
+		<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-14343">PHPBB3-14343</a>] - Undefined variable $phpbb_dispatcher when (un-)locking a topic or post</li>
+	</ul>
+
+			<a name="v316"></a><h3>Changes since 3.1.6</h3>
+
+	<h4>Bug</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8839">PHPBB3-8839</a>] - Wrong new status of subforumlink on index</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8920">PHPBB3-8920</a>] - PM-Report for every moderator</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9153">PHPBB3-9153</a>] - New member can delete pm just in one way</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9252">PHPBB3-9252</a>] - Conflict when (dis)approving a post by two moderators at the same time</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11468">PHPBB3-11468</a>] - Controllers can not set additional parameters of page_header()</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11971">PHPBB3-11971</a>] - Validating not correctly in Spambot countermeasures</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12616">PHPBB3-12616</a>] - Report notification is not removed when post is disapproved or deleted</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13202">PHPBB3-13202</a>] - dead code in sessions.php</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13423">PHPBB3-13423</a>] - Driver sqlite3 failed periodically</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13636">PHPBB3-13636</a>] - Unexpect return to previous page behaviour</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13656">PHPBB3-13656</a>] - database_upgrade.php fails when database password contains a % character</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13748">PHPBB3-13748</a>] - Wrong tooltip after poll vote change</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13759">PHPBB3-13759</a>] - submit_post doesn't take $data['post_time'] - into account</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13799">PHPBB3-13799</a>] - Avatar gallery subfolders paths are handled incorrectly</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13831">PHPBB3-13831</a>] - Post deletion reason is not appearing on moderation logs</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13835">PHPBB3-13835</a>] - File upload of large files where filename contains umlauts fails</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13846">PHPBB3-13846</a>] - Permissions around soft deleting are inconsistently handled</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13851">PHPBB3-13851</a>] - &quot;Can ignore flood limit&quot; permission not taking effect</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13892">PHPBB3-13892</a>] - &quot;Someone reports a post&quot; notification setting has no effect</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13945">PHPBB3-13945</a>] - Account re-activation does not create a notification</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13950">PHPBB3-13950</a>] - If disabled extension - no hidden permission set</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13960">PHPBB3-13960</a>] - Profile field validation may break</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13976">PHPBB3-13976</a>] - Fix comment typo in salted_md5 driver</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13988">PHPBB3-13988</a>] - Atom feeds use relative links for image attachments</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13992">PHPBB3-13992</a>] - Fix html5 error from output on w3.org its new validator</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14058">PHPBB3-14058</a>] - subsilver2 Contact us form doesn't have an email subject field</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14070">PHPBB3-14070</a>] - Disabled avatar types is still displayed on the forum</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14106">PHPBB3-14106</a>] - Sorting is unworkable while moderating forum (merge topics)</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14114">PHPBB3-14114</a>] - Inconsistency in install.html in 3.1.x Automatic uopdate package</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14127">PHPBB3-14127</a>] - Error in the BBCode FAQ in 'Linking to another site'</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14142">PHPBB3-14142</a>] - Remove unused ignore_configs from avatar drivers</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14143">PHPBB3-14143</a>] - Flush the in-memory mail queue when writing it to the disk</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14153">PHPBB3-14153</a>] - Notifications dropdown header doesn't clear floats</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14159">PHPBB3-14159</a>] - Not accessible link on main ACP page</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14161">PHPBB3-14161</a>] - The core.download_file_send_to_browser_before - $vars - 'extension' it does not exist</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14163">PHPBB3-14163</a>] - Select All in code bug in Edge</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14181">PHPBB3-14181</a>] - Custom report/denial reason not shown in user notifications</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14186">PHPBB3-14186</a>] - Incorrect string concatenation in phpbb_mcp_sorting()</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14200">PHPBB3-14200</a>] - Allow hidden users to see theself on viewonline</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14215">PHPBB3-14215</a>] - [ticket/14212] - Adding event after users have been removed to a group</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14217">PHPBB3-14217</a>] - [ticket/13591] - Change SQL query into array to allow</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14224">PHPBB3-14224</a>] - Fix trailing whitespaces</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14228">PHPBB3-14228</a>] - Vertical align of numbers in polls</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14236">PHPBB3-14236</a>] - Race condition in the functional tests</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14242">PHPBB3-14242</a>] - Fix on memberlist the sort method.</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14249">PHPBB3-14249</a>] - Online list isn't sorted anymore</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14258">PHPBB3-14258</a>] - Add event in auth::Login</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14271">PHPBB3-14271</a>] - Update nginx sample config</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14276">PHPBB3-14276</a>] - Function get_folder_status not setup for use of plurals</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14287">PHPBB3-14287</a>] - Loading indicator not removed after confirming action that does not produce a message</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14297">PHPBB3-14297</a>] - Uppercase and lowercase when sorting topics</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14334">PHPBB3-14334</a>] - Do not use deprecated function get_user_avatar() in user_loader</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14339">PHPBB3-14339</a>] - State support for PHP 7.0 in docs</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14346">PHPBB3-14346</a>] - Improve version check output when phpbb.com is unreachable</li>
+	</ul>
+	<h4>Improvement</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7362">PHPBB3-7362</a>] - Title/Post Icons Need Attribute Text</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8800">PHPBB3-8800</a>] - Add &quot;mark topics read&quot; link to &quot;View unread posts&quot;</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10343">PHPBB3-10343</a>] - ACP: searching for users does not show inactive accounts</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13684">PHPBB3-13684</a>] - Only resize attached file comments vertically</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13934">PHPBB3-13934</a>] - Enctype clause for forms may be needed for profile fields</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14066">PHPBB3-14066</a>] - Add template events to search_body.html</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14073">PHPBB3-14073</a>] - Add core events to the several places in includes/functions_admin.php</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14075">PHPBB3-14075</a>] - Event in posting preview</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14080">PHPBB3-14080</a>] - Add template events to viewforum_body.html before/after/append/prepend the topic row</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14088">PHPBB3-14088</a>] - Add core events to the search.php</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14089">PHPBB3-14089</a>] - [Template] - posting_topic_title_after</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14098">PHPBB3-14098</a>] - Add core events to the search backends (fulltext_*.php)</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14102">PHPBB3-14102</a>] - Add core event to the mcp_topic.php</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14113">PHPBB3-14113</a>] - Add core events to the memberlist.php for customizing members search</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14117">PHPBB3-14117</a>] - Add core events to index.php to allow modifying birthdays list</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14123">PHPBB3-14123</a>] - Add more descriptive help to the CLI commands</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14126">PHPBB3-14126</a>] - Add viewtopic_topic_title_after template event</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14133">PHPBB3-14133</a>] - Comment fix for phpbb_get_user_rank()</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14154">PHPBB3-14154</a>] - Include &quot;Clean Name&quot; for disabled Extensions</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14155">PHPBB3-14155</a>] - Add row highlighting to extensions and style management</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14156">PHPBB3-14156</a>] - Add the Symfony ResponseListener</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14164">PHPBB3-14164</a>] - Helpful instructions for database updates</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14170">PHPBB3-14170</a>] - Fix mcp_change_poster_after event</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14201">PHPBB3-14201</a>] - Add ACP template events</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14213">PHPBB3-14213</a>] - [PHP] - core.group_add_user_after</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14219">PHPBB3-14219</a>] - Add email address into inactive user display in ACP</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14261">PHPBB3-14261</a>] - Pages served from app.php can't disable the update of session_page</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14283">PHPBB3-14283</a>] - Add a &quot;Manage Group&quot; link on a group page</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14313">PHPBB3-14313</a>] - Don't display quote button on unapproved posts</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14343">PHPBB3-14343</a>] - Add event when locking/unlocking posts/topics</li>
+	</ul>
+	<h4>New Feature</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14144">PHPBB3-14144</a>] - [Template] - quickreply_editor_subject_before</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14146">PHPBB3-14146</a>] - [Template] - viewtopic_body_post_subject_before</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14187">PHPBB3-14187</a>] - [ACP Template] - acp_styles_before_table</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14188">PHPBB3-14188</a>] - [PHP] - core.acp_styles_action_before</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14191">PHPBB3-14191</a>] - [PHP] - core.get_gravatar_url_after</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14192">PHPBB3-14192</a>] - [PHP] - core.memberlist_memberrow_before</li>
+	</ul>
+	<h4>Task</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14140">PHPBB3-14140</a>] - Update Symfony to benefit from improvement to the console component</li>
+	</ul>
+
 			<a name="v315"></a><h3>Changes since 3.1.5</h3>
 
 	<h4>Bug</h4>

phpBB/docs/INSTALL.html

@@ -147,7 +147,7 @@
 			<li>Oracle</li>
 		</ul>
 		</li>
-		<li><strong>PHP 5.4.0+</strong> with support for the database you intend to use.</li>
+		<li><strong>PHP 5.4.0+</strong> and <strong>PHP < 7.1</strong> with support for the database you intend to use.</li>
 		<li>The following PHP modules are required:
 		<ul>
 			<li>json</li>

phpBB/docs/README.html

@@ -323,7 +323,7 @@
 
 		<div class="content">
 
-	<p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.4.0.</p>
+	<p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.4.0 and the maximum supported version is PHP 7.0.</p>
 
 	<p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
 

phpBB/docs/events.md

@@ -1,3 +1,15 @@
+acp_ban_cell_append
+===
+* Location: adm/style/acp_ban.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the end of the ban cell area
+
+acp_ban_cell_prepend
+===
+* Location: adm/style/acp_ban.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the start of the ban cell area
+
 acp_bbcodes_actions_append
 ===
 * Location: adm/style/acp_bbcodes.html
@@ -16,6 +28,30 @@ acp_bbcodes_edit_fieldsets_after
 * Since: 3.1.0-a3
 * Purpose: Add settings to BBCode add/edit form
 
+acp_email_group_options_append
+===
+* Location: adm/style/acp_email.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the end of the group options select box 
+
+acp_email_group_options_prepend
+===
+* Location: adm/style/acp_email.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the start of the group options select box 
+
+acp_email_find_username_append
+===
+* Location: adm/style/acp_email.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the end of the fimd username link
+
+acp_email_find_username_prepend
+===
+* Location: adm/style/acp_email.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the start of the fimd username link
+
 acp_email_options_after
 ===
 * Location: adm/style/acp_email.html
@@ -64,6 +100,18 @@ acp_forums_prune_settings_prepend
 * Since: 3.1.2-RC1
 * Purpose: Add settings to forums before prune settings section
 
+acp_forums_quick_select_button_append
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the quick select forum submit button
+
+acp_forums_quick_select_button_prepend
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the quick select forum submit button
+
 acp_forums_rules_settings_append
 ===
 * Location: adm/style/acp_forums.html
@@ -88,6 +136,66 @@ acp_group_options_after
 * Since: 3.1.0-b4
 * Purpose: Add addtional options to group settings (after GROUP_RECEIVE_PM)
 
+acp_groups_find_username_append
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the end of the find username link
+
+acp_groups_find_username_prepend
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the start of the find username link
+
+acp_groups_manage_after
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the manage groups table
+
+acp_groups_manage_before
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the manage groups table
+
+acp_groups_position_legend_add_button_after
+===
+* Location: adm/style/acp_groups_position.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after adding group to legend submit button
+
+acp_groups_position_legend_add_button_before
+===
+* Location: adm/style/acp_groups_position.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before adding group to legend submit button
+
+acp_groups_position_teampage_add_button_after
+===
+* Location: adm/style/acp_groups_position.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after adding group to teampage submit button
+
+acp_groups_position_teampage_add_button_before
+===
+* Location: adm/style/acp_groups_position.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before adding group to teampage submit button
+
+acp_logs_quick_select_forum_button_append
+===
+* Location: adm/style/acp_logs.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the quick forum select form submit button
+
+acp_logs_quick_select_forum_button_prepend
+===
+* Location: adm/style/acp_logs.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the quick forum select form submit button
+
 acp_main_actions_append
 ===
 * Location: adm/style/acp_main.html
@@ -125,6 +233,102 @@ acp_overall_header_stylesheets_after
 * Purpose: Add assets after stylesheets within the `<head>` tags in the ACP.
 Note that INCLUDECSS will not work with this event.
 
+acp_permission_forum_copy_src_forum_append
+===
+* Location: adm/style/permission_forum_copy.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the sourse forum select form
+
+acp_permission_forum_copy_src_forum_prepend
+===
+* Location: adm/style/permission_forum_copy.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the sourse forum select form
+
+acp_permission_forum_copy_dest_forum_append
+===
+* Location: adm/style/permission_forum_copy.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the destiny forum select form
+
+acp_permission_forum_copy_dest_forum_prepend
+===
+* Location: adm/style/permission_forum_copy.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the destiny forum select form
+
+acp_permissions_add_group_options_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the group multiple select form
+
+acp_permissions_add_group_options_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the group multiple select form
+
+acp_permissions_find_username_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the find username link
+
+acp_permissions_find_username_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the find username link
+
+acp_permissions_select_forum_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the forum select form label
+
+acp_permissions_select_forum_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the forum select form label
+
+acp_permissions_select_group_after
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the group select form in usergroup view
+
+acp_permissions_select_group_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the group select form label
+
+acp_permissions_select_group_before
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the group select form in usergroup view
+
+acp_permissions_select_group_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the group select form label
+
+acp_permissions_select_multiple_forum_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the forum multiple select form label
+
+acp_permissions_select_multiple_forum_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the forum multiple select form label
+
 acp_posting_buttons_after
 ===
 * Locations:
@@ -146,6 +350,34 @@ acp_profile_contact_before
 * Since: 3.1.6-RC1
 * Purpose: Add extra options to custom profile field configuration in the ACP
 
+acp_prune_forums_append
+===
+* Locations:
+    + adm/style/acp_prune_forums.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the forum select form label
+
+acp_prune_forums_prepend
+===
+* Locations:
+    + adm/style/acp_prune_forums.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the forum select form label
+
+acp_prune_users_find_username_append
+===
+* Locations:
+    + adm/style/acp_prune_users.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the find username link
+
+acp_prune_users_find_username_prepend
+===
+* Locations:
+    + adm/style/acp_prune_users.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the find username link
+
 acp_ranks_edit_after
 ===
 * Locations:
@@ -297,6 +529,18 @@ acp_users_prefs_view_prepend
 * Since: 3.1.0-b3
 * Purpose: Add user options fieldset to the top of ACP users view prefs settings
 
+acp_users_select_group_after
+===
+* Location: adm/style/acp_users.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after group select form
+
+acp_users_select_group_before
+===
+* Location: adm/style/acp_users.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before group select form
+
 attachment_file_after
 ===
 * Locations:
@@ -784,6 +1028,20 @@ navbar_header_quick_links_before
 * Since: 3.1.0-RC2
 * Purpose: Add links to the top of the quick-links drop-down menu in the header
 
+navbar_header_user_profile_append
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.8-RC1
+* Purpose: Add links to the right of the user drop down area
+
+navbar_header_user_profile_prepend
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.8-RC1
+* Purpose: Add links to the left of the notification area
+
 navbar_header_username_append
 ===
 * Locations:
@@ -1184,6 +1442,13 @@ quickreply_editor_subject_before
 * Since: 3.1.7-RC1
 * Purpose: Add content before the quick reply subject textbox
 
+search_body_form_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search form
+
 search_body_form_before
 ===
 * Locations:
@@ -1191,6 +1456,90 @@ search_body_form_before
 * Since: 3.1.5-RC1
 * Purpose: Add content before the search form
 
+search_body_recent_search_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the recent search queries list
+
+search_body_recent_search_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the recent search queries list
+
+search_body_search_display_options_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query display options fields set
+
+search_body_search_display_options_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query display options fields set
+
+search_body_search_options_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search query options fields set
+
+search_body_search_options_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query options fields set
+
+search_body_search_options_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the search query options fields set
+
+search_body_search_options_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query options fields set
+
+search_body_search_query_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search query fields set
+
+search_body_search_query_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query fields set
+
+search_body_search_query_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the search query fields set
+
+search_body_search_query_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query fields set
+
 search_results_header_after
 ===
 * Locations:
@@ -1883,6 +2232,41 @@ viewtopic_body_post_buttons_list_before
 * Purpose: Add post button custom list to posts (next to edit, quote etc),
 before the original list.
 
+viewtopic_body_post_subject_before
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add data before post icon and subject
+
+viewtopic_body_postrow_back2top_after
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.8-RC1
+* Purpose: Add content to the post's bottom after the back to top link 
+
+viewtopic_body_postrow_back2top_append
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.8-RC1
+* Purpose: Add content to the post's bottom directly before the back to top link 
+
+viewtopic_body_postrow_back2top_before
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.8-RC1
+* Purpose: Add content to the post's bottom before the back to top link 
+
+viewtopic_body_postrow_back2top_prepend
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.8-RC1
+* Purpose: Add content to the post's bottom directly before the back to top link 
+
 viewtopic_body_postrow_custom_fields_after
 ===
 * Locations:

phpBB/docs/nginx.sample.conf

@@ -64,6 +64,11 @@ http {
         location / {
             # phpbb uses index.htm
             index index.php index.html index.htm;
+            try_files $uri $uri/ @rewriteapp;
+        }
+
+        location @rewriteapp {
+            rewrite ^(.*)$ /app.php/$1 last;
         }
 
         # Deny access to internal phpbb files.
@@ -75,12 +80,16 @@ http {
         }
 
         # Pass the php scripts to fastcgi server specified in upstream declaration.
-        location ~ \.php$ {
-            fastcgi_pass php;
-            # Necessary for php.
-            fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+        location ~ \.php(/|$) {
             # Unmodified fastcgi_params from nginx distribution.
             include fastcgi_params;
+            # Necessary for php.
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            fastcgi_param PATH_INFO $fastcgi_path_info;
+            fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            try_files $uri $uri/ /app.php$is_args$args;
+            fastcgi_pass php;
         }
 
         # Deny access to version control system directories.

phpBB/includes/acp/acp_attachments.php

@@ -709,8 +709,6 @@ class acp_attachments
 							$forum_ids = array();
 						}
 
-						$extensions = array();
-
 						$sql = 'SELECT *
 							FROM ' . EXTENSIONS_TABLE . "
 							WHERE group_id = $group_id
@@ -1572,7 +1570,6 @@ class acp_attachments
 						if ($ip_2_counter == 0 && $ip_2_end == 254)
 						{
 							$ip_2_counter = 256;
-							$ip_2_fragment = 256;
 
 							$iplist[] = "'$ip_1_counter.*'";
 						}
@@ -1585,7 +1582,6 @@ class acp_attachments
 							if ($ip_3_counter == 0 && $ip_3_end == 254)
 							{
 								$ip_3_counter = 256;
-								$ip_3_fragment = 256;
 
 								$iplist[] = "'$ip_1_counter.$ip_2_counter.*'";
 							}
@@ -1598,7 +1594,6 @@ class acp_attachments
 								if ($ip_4_counter == 0 && $ip_4_end == 254)
 								{
 									$ip_4_counter = 256;
-									$ip_4_fragment = 256;
 
 									$iplist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.*'";
 								}

phpBB/includes/acp/acp_ban.php

@@ -195,7 +195,6 @@ class acp_ban
 			case 'user':
 
 				$field = 'username';
-				$l_ban_cell = $user->lang['USERNAME'];
 
 				$sql = 'SELECT b.*, u.user_id, u.username, u.username_clean
 					FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u
@@ -208,7 +207,6 @@ class acp_ban
 			case 'ip':
 
 				$field = 'ban_ip';
-				$l_ban_cell = $user->lang['IP_HOSTNAME'];
 
 				$sql = 'SELECT *
 					FROM ' . BANLIST_TABLE . '
@@ -221,7 +219,6 @@ class acp_ban
 			case 'email':
 
 				$field = 'ban_email';
-				$l_ban_cell = $user->lang['EMAIL_ADDRESS'];
 
 				$sql = 'SELECT *
 					FROM ' . BANLIST_TABLE . '

phpBB/includes/acp/acp_bbcodes.php

@@ -25,14 +25,15 @@ class acp_bbcodes
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template, $cache, $request, $phpbb_dispatcher, $phpbb_container;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_log;
+		global $db, $user, $template, $cache, $request, $phpbb_dispatcher, $phpbb_container;
+		global $phpbb_log;
 
 		$user->add_lang('acp/posting');
 
 		// Set up general vars
 		$action	= $request->variable('action', '');
 		$bbcode_id = $request->variable('bbcode', 0);
+		$submit = $request->is_set_post('submit');
 
 		$this->tpl_name = 'acp_bbcodes';
 		$this->page_title = 'ACP_BBCODES';
@@ -40,6 +41,11 @@ class acp_bbcodes
 
 		add_form_key($form_key);
 
+		if ($submit && !check_form_key($form_key))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
 		// Set up mode-specific vars
 		switch ($action)
 		{
@@ -367,7 +373,7 @@ class acp_bbcodes
 		*
 		* @event core.acp_bbcodes_display_form
 		* @var	string	action			Type of the action: modify|create
-		* @var	string	sql_ary			The SQL array to get custom bbcode data
+		* @var	array	sql_ary			The SQL array to get custom bbcode data
 		* @var	array	template_data	Array with form template data
 		* @var	string	u_action		The u_action link
 		* @since 3.1.0-a3

phpBB/includes/acp/acp_board.php

@@ -30,13 +30,12 @@ class acp_board
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template, $request;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+		global $user, $template, $request;
+		global $config, $phpbb_root_path, $phpEx;
 		global $cache, $phpbb_container, $phpbb_dispatcher, $phpbb_log;
 
 		$user->add_lang('acp/board');
 
-		$action	= $request->variable('action', '');
 		$submit = (isset($_POST['submit']) || isset($_POST['allow_quick_reply_enable'])) ? true : false;
 
 		$form_key = 'acp_board';
@@ -760,7 +759,7 @@ class acp_board
 	*/
 	function select_auth_method($selected_method, $key = '')
 	{
-		global $phpbb_root_path, $phpEx, $phpbb_container;
+		global $phpbb_container;
 
 		/* @var $auth_providers \phpbb\auth\provider_collection */
 		$auth_providers = $phpbb_container->get('auth.provider_collection');
@@ -940,8 +939,6 @@ class acp_board
 	*/
 	function board_disable($value, $key)
 	{
-		global $user;
-
 		$radio_ary = array(1 => 'YES', 0 => 'NO');
 
 		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '" />';
@@ -1051,8 +1048,6 @@ class acp_board
 	*/
 	function select_news_forums($value, $key)
 	{
-		global $user, $config;
-
 		$forum_list = make_forum_select(false, false, true, true, true, false, true);
 
 		// Build forum options
@@ -1070,8 +1065,6 @@ class acp_board
 
 	function select_exclude_forums($value, $key)
 	{
-		global $user, $config;
-
 		$forum_list = make_forum_select(false, false, true, true, true, false, true);
 
 		// Build forum options
@@ -1127,7 +1120,7 @@ class acp_board
 	*/
 	function enable_mod_rewrite($value, $key)
 	{
-		global $user, $config;
+		global $user;
 
 		// Determine whether mod_rewrite is enabled on the server
 		// NOTE: This only works on Apache servers on which PHP is NOT

phpBB/includes/acp/acp_bots.php

@@ -25,8 +25,8 @@ class acp_bots
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $auth, $template, $cache, $request, $phpbb_log;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
+		global $config, $db, $user, $template, $cache, $request, $phpbb_log;
+		global $phpbb_root_path, $phpEx;
 
 		$action = $request->variable('action', '');
 		$submit = (isset($_POST['submit'])) ? true : false;

phpBB/includes/acp/acp_captcha.php

@@ -25,8 +25,8 @@ class acp_captcha
 
 	function main($id, $mode)
 	{
-		global $user, $auth, $template, $phpbb_log, $request;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container;
+		global $user, $template, $phpbb_log, $request;
+		global $config, $phpbb_container;
 
 		$user->add_lang('acp/board');
 
@@ -178,7 +178,7 @@ class acp_captcha
 	*/
 	function deliver_demo($selected)
 	{
-		global $db, $user, $config, $phpbb_container;
+		global $phpbb_container;
 
 		$captcha = $phpbb_container->get('captcha.factory')->get_instance($selected);
 		$captcha->init(CONFIRM_REG);