Merge 0e0214a71d into b8c49f9711

phpbb_acl_groups and phpbb_acl_users have indexes
with the same names (auth_role_id) which can cause issues on SQLite/Postgres

PHPBB-17525

phpBB/includes/acp/acp_extensions.php

@@ -276,6 +276,12 @@ class acp_extensions
 				{
 					$this->template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($this->user));
 				}
+				catch (\Exception $e)
+				{
+					$stack_trace = phpbb_filter_root_path(str_replace("\n", '<br>', $e->getTraceAsString()));
+					$message = $e->getMessage();
+					$this->template->assign_var('MIGRATOR_ERROR', '<b>' . $message . '</b><br><br>' . $stack_trace);
+				}
 
 				$this->tpl_name = 'acp_ext_enable';
 

phpBB/includes/functions.php

@@ -2716,7 +2716,7 @@ function get_backtrace()
 		// Only show function arguments for include etc.
 		// Other parameters may contain sensible information
 		$argument = '';
-		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once')))
+		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once', 'try_apply')))
 		{
 			$argument = htmlspecialchars(phpbb_filter_root_path($trace['args'][0]), ENT_COMPAT);
 		}

phpBB/install/startup.php

@@ -107,7 +107,7 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline): bool
 				{
 					/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */
 					$iohandler = $phpbb_installer_container->get('installer.helper.iohandler');
-					$iohandler->add_error_message($msg);
+					$iohandler->add_error_message($msg, get_backtrace());
 					$iohandler->send_response(true);
 					exit();
 				}

phpBB/phpbb/db/migration/data/v400/rename_auth_role_id_index.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class rename_auth_role_id_index extends migration
+{
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev',
+		];
+	}
+
+	public function update_schema()
+	{
+		return [
+			'drop_keys' => [
+				$this->table_prefix . 'acl_users' => [
+					'auth_role_id',
+				],
+			],
+			'add_index'	=> [
+				$this->table_prefix . 'acl_users' => [
+					'usr_auth_role_id'	=> ['auth_role_id'],
+				],
+			],
+		];
+	}
+
+	public function revert_schema()
+	{
+		return [
+			'drop_keys' => [
+				$this->table_prefix . 'acl_users' => [
+					'usr_auth_role_id',
+				],
+			],
+			'add_index'	=> [
+				$this->table_prefix . 'acl_users' => [
+					'auth_role_id'	=> ['auth_role_id'],
+				],
+			],
+		];
+	}
+}

phpBB/phpbb/db/tools/doctrine.php

@@ -457,8 +457,6 @@ class doctrine implements tools_interface
 	 * @return bool|string[]
 	 */
 	protected function alter_schema(callable $callback)
-	{
-		try
 	{
 		$current_schema = $this->get_schema();
 		$new_schema = clone $current_schema;
@@ -481,12 +479,6 @@ class doctrine implements tools_interface
 
 		return true;
 	}
-		catch (Exception $e)
-		{
-			// @todo: check if it makes sense to properly handle the exception
-			return [$e->getMessage()];
-		}
-	}
 
 	/**
 	 * Alter table.

phpBB/phpbb/install/installer.php

@@ -280,7 +280,9 @@ class installer
 		}
 		catch (\Exception $e)
 		{
-			$this->iohandler->add_error_message($e->getMessage());
+			$stack_trace = phpbb_filter_root_path(str_replace("\n", '<br>', $e->getTraceAsString()));
+			$message = $e->getMessage();
+			$this->iohandler->add_error_message($message, $stack_trace);
 			$this->iohandler->send_response(true);
 			$fail_cleanup = true;
 		}