[ticket/16345] Small improvements

PHPBB3-16346
phpbb · Aug 14, 2020 · 774c609 · 774c609
1 parent 3cceeb4
commit 774c609
Show file tree

Hide file tree

Showing 284 changed files with 1,380 additions and 835 deletions.
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
@@ -36,7 +36,7 @@
 
 			var j = 0;
 <!-- BEGIN m_names -->
-		
+
 			if (value == '{m_names.A_NAME}')
 			{
 	<!-- BEGIN modes -->
@@ -60,13 +60,6 @@ <h1>{L_TITLE} :: {MODULENAME}</h1>
 
 	<p>{L_EDIT_MODULE_EXPLAIN}</p>
 
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
 	<form id="moduleedit" method="post" action="{U_EDIT_ACTION}">
 
 	<fieldset>
@@ -111,7 +104,7 @@ <h3>{L_WARNING}</h3>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="{ACTION}" />
 		<input type="hidden" name="m" value="{MODULE_ID}" />
-		
+
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</p>
@@ -125,13 +118,6 @@ <h1>{L_ACP_MODULE_MANAGEMENT}</h1>
 
 	<p>{L_ACP_MODULE_MANAGEMENT_EXPLAIN}</p>
 
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
 	<table class="table1">
 	<tbody>
 	<tr>
@@ -154,7 +140,7 @@ <h3>{L_WARNING}</h3>
 					<span class="up"><a href="{modules.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
 					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
 					<span class="down"><a href="{modules.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
-					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
+					<a href="{modules.U_EDIT}">{ICON_EDIT}</a>
 					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 				</td>
 			</tr>
@@ -173,7 +159,7 @@ <h3>{L_WARNING}</h3>
 		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
 		<input class="button2" name="quickadd" type="submit" value="{L_ADD_MODULE}" />
 	</fieldset>
-	
+
 	</form>
 
 	<form id="module" method="post" action="{U_ACTION}">
@@ -182,17 +168,17 @@ <h3>{L_WARNING}</h3>
 		<input type="hidden" name="action" value="add" />
 		<input type="hidden" name="module_parent_id" value="{PARENT_ID}" />
 
-		<input type="text" name="module_langname" maxlength="255" /> 
+		<input type="text" name="module_langname" maxlength="255" />
 		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
 	</fieldset>
 
 	</form>
 
 	<div class="clearfix">&nbsp;</div><br style="clear: both;" />
-	
+
 	<form id="mselect" method="post" action="{U_SEL_ACTION}">
 	<fieldset class="quick">
-		{L_SELECT_MODULE}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
+		{L_SELECT_MODULE}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select>
 
 		<input class="button2" type="submit" value="{L_GO}" />
 	</fieldset>

diff --git a/phpBB/config/default/container/services_attachment.yml b/phpBB/config/default/container/services_attachment.yml
@@ -32,7 +32,6 @@ services:
             - '@config'
             - '@files.upload'
             - '@language'
-            - '@mimetype.guesser'
             - '@dispatcher'
             - '@plupload'
             - '@storage.attachment'

diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml
@@ -19,10 +19,7 @@ services:
             - '@config'
             - '@dbal.conn'
             - '@passwords.manager'
-            - '@request'
             - '@user'
-            - '%core.root_path%'
-            - '%core.php_ext%'
         tags:
             - { name: auth.provider }
 

diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml
@@ -18,13 +18,11 @@ services:
         class: phpbb\groupposition\legend
         arguments:
             - '@dbal.conn'
-            - '@user'
 
     groupposition.teampage:
         class: phpbb\groupposition\teampage
         arguments:
             - '@dbal.conn'
-            - '@user'
             - '@cache.driver'
 
     message.form.admin:

diff --git a/phpBB/config/default/container/services_cron.yml b/phpBB/config/default/container/services_cron.yml
@@ -167,7 +167,6 @@ services:
         class: phpbb\cron\task\text_reparser\reparser
         arguments:
             - '@config'
-            - '@config_text'
             - '@text_reparser.lock'
             - '@text_reparser.manager'
             - '@text_reparser_collection'
@@ -181,7 +180,6 @@ services:
         class: phpbb\cron\task\text_reparser\reparser
         arguments:
             - '@config'
-            - '@config_text'
             - '@text_reparser.lock'
             - '@text_reparser.manager'
             - '@text_reparser_collection'
@@ -195,7 +193,6 @@ services:
         class: phpbb\cron\task\text_reparser\reparser
         arguments:
             - '@config'
-            - '@config_text'
             - '@text_reparser.lock'
             - '@text_reparser.manager'
             - '@text_reparser_collection'
@@ -209,7 +206,6 @@ services:
         class: phpbb\cron\task\text_reparser\reparser
         arguments:
             - '@config'
-            - '@config_text'
             - '@text_reparser.lock'
             - '@text_reparser.manager'
             - '@text_reparser_collection'
@@ -223,7 +219,6 @@ services:
         class: phpbb\cron\task\text_reparser\reparser
         arguments:
             - '@config'
-            - '@config_text'
             - '@text_reparser.lock'
             - '@text_reparser.manager'
             - '@text_reparser_collection'

diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml
@@ -21,7 +21,6 @@ services:
         shared: false
         arguments:
             - '@language'
-            - '@php_ini'
             - '@upload_imagesize'
             - '@mimetype.guesser'
             - '@plupload'
@@ -30,7 +29,6 @@ services:
         class: phpbb\files\upload
         shared: false
         arguments:
-            - '@filesystem'
             - '@files.factory'
             - '@language'
             - '@php_ini'

diff --git a/phpBB/config/default/container/services_migrator.yml b/phpBB/config/default/container/services_migrator.yml
@@ -44,11 +44,8 @@ services:
         class: phpbb\db\migration\tool\module
         arguments:
             - '@dbal.conn'
-            - '@cache'
             - '@user'
             - '@module.manager'
-            - '%core.root_path%'
-            - '%core.php_ext%'
             - '%tables.modules%'
         tags:
             - { name: migrator.tool }

diff --git a/phpBB/config/default/container/services_profilefield.yml b/phpBB/config/default/container/services_profilefield.yml
@@ -9,7 +9,6 @@ services:
             - '@dispatcher'
             - '@language'
             - '@log'
-            - '@request'
             - '@template'
             - '@profilefields.type_collection'
             - '@user'

diff --git a/phpBB/config/installer/container/services_install_database.yml b/phpBB/config/installer/container/services_install_database.yml
@@ -27,7 +27,6 @@ services:
         arguments:
             - '@installer.helper.config'
             - '@installer.helper.database'
-            - '@filesystem'
             - '%core.root_path%'
         tags:
             - { name: install_database_install, order: 30 }

diff --git a/phpBB/config/installer/container/services_update_filesystem.yml b/phpBB/config/installer/container/services_update_filesystem.yml
@@ -41,7 +41,6 @@ services:
             - '@installer.helper.iohandler'
             - '@installer.file_updater.factory'
             - '@installer.helper.update_helper'
-            - '%core.root_path%'
         tags:
             - { name: update_filesystem, order: 40 }