From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 29 Aug 2020 21:37:42 +0000 (+0200)
Subject: Resolved some issues during the upgrade, first successful upgrade
X-Git-Tag: 5.3.0_Alpha_1~16^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd8f7cbc88f3e204fb0b00e9c3dc78f654249a8d;p=GitHub%2FWoltLab%2FWCF.git

Resolved some issues during the upgrade, first successful upgrade
---

diff --git a/com.woltlab.wcf/files_pre.tar b/com.woltlab.wcf/files_pre.tar
index 87e6a520ae..7d79221d99 100644
Binary files a/com.woltlab.wcf/files_pre.tar and b/com.woltlab.wcf/files_pre.tar differ
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 42a73de5d9..f3ea210b97 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -55,16 +55,16 @@
 		     Guzzle can not be found during the development of the regular file PIP. -->
 		<instruction type="file" run="standalone">files_pre.tar</instruction>
 		
+		<!-- Deploy the database changes as early as possible to avoid any conflicts by calls to
+		     tables that do not exist in 5.2, in particular `wcfN_devtools_missing_language_item`.-->
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3.php</instruction>
+		
 		<instruction type="file" />
 		<instruction type="acpTemplate" />
 		<instruction type="template" />
 		
 		<instruction type="option" run="standalone" />
 		
-		<instruction type="script">acp/update_com.woltlab.wcf_5.3.php</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf_5.3_invalidateMailForm.php</instruction>
-		<instruction type="sql">update_5.3.sql</instruction>
-		
 		<instruction type="acpMenu" />
 		<instruction type="clipboardAction" />
 		<instruction type="mediaProvider" />
@@ -72,12 +72,17 @@
 		<instruction type="userMenu" />
 		<instruction type="page" />
 		
+		<!-- TODO: Verify that this step is idempotent! -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_style.php</instruction>
+		
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_emailConfirmation.php</instruction>
 		
+		<!-- The internal data structure of sitemaps have been modified, this script must be run before
+		     the `objectType` pip to prevent any data corruption. -->
+		<instruction type="script">acp/update_com.woltlab.wcf_5.3_sitemaps.php</instruction>
+		
 		<instruction type="objectTypeDefinition" />
 		<instruction type="objectType" />
-		<instruction type="script">acp/update_com.woltlab.wcf_5.3_sitemaps.php</instruction>
 		
 		<instruction type="userNotificationEvent" />
 		<instruction type="userOption" />
@@ -85,5 +90,11 @@
 		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
 		
 		<instruction type="language" />
+		
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_invalidateMailForm.php</instruction>
+		
+		<!-- This SQL step purges the legacy package servers, this must come last to make sure that an early
+		     abort of the core upgrade does not brick the installation. -->
+		<instruction type="sql">update_5.3.sql</instruction>
 	</instructions>
 </package>