Preparing the release 5.2.0 Beta 4

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 648e55bd68ec9bec9a3ef2b30a9974079c34bfc9..a9c2854c8d0ea879490a3cebd637f3ee90a4581e 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
                <packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
                <isapplication>1</isapplication>
-               <version>5.2.0 Beta 3</version> <!-- codename: hurricane -->
-               <date>2019-11-15</date>
+               <version>5.2.0 Beta 4</version> <!-- codename: hurricane -->
+               <date>2019-11-29</date>
        </packageinformation>
        
        <authorinformation>
@@ -50,13 +50,10 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="5.2.0 Beta 2">
+       <instructions type="update" fromversion="5.2.0 Beta 3">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
                
-               <instruction type="script">acp/update-com.woltlab.wcf_5.2.0_beta_3.php</instruction>
-               
-               <instruction type="language" />
+               <instruction type="page" />
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_2.php b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_2.php
deleted file mode 100644 (file)
index 6a57311..0000000
--- a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_2.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-use wcf\system\database\table\column\DefaultFalseBooleanDatabaseTableColumn;
-use wcf\system\database\table\column\DefaultTrueBooleanDatabaseTableColumn;
-use wcf\system\database\table\column\NotNullVarchar255DatabaseTableColumn;
-use wcf\system\database\table\DatabaseTable;
-use wcf\system\database\table\DatabaseTableChangeProcessor;
-use wcf\system\package\plugin\ScriptPackageInstallationPlugin;
-use wcf\system\WCF;
-
-/**
- * Updates the database table layout from WoltLab Suite Core 5.2.0 Beta 1 to 5.2.0 Beta 2
- * 
- * @author     Alexander Ebert, Matthias Schmidt
- * @copyright  2001-2019 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-
-$tables = [
-       DatabaseTable::create('wcf1_reaction_type')
-               ->columns([
-                       NotNullVarchar255DatabaseTableColumn::create('title'),
-                       NotNullVarchar255DatabaseTableColumn::create('iconFile')
-                               ->defaultValue(''),
-                       DefaultTrueBooleanDatabaseTableColumn::create('isAssignable'),
-                       
-                       DefaultFalseBooleanDatabaseTableColumn::create('isDisabled')
-                               ->drop()
-               ]),
-];
-
-(new DatabaseTableChangeProcessor(
-       /** @var ScriptPackageInstallationPlugin $this */
-       $this->installation->getPackage(),
-       $tables,
-       WCF::getDB()->getEditor())
-)->process();

diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_3.php b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_3.php
deleted file mode 100644 (file)
index dee5ddc..0000000
--- a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_3.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-use wcf\system\database\table\DatabaseTableChangeProcessor;
-use wcf\system\database\table\index\DatabaseTableIndex;
-use wcf\system\database\table\PartialDatabaseTable;
-use wcf\system\package\plugin\ScriptPackageInstallationPlugin;
-use wcf\system\WCF;
-
-/**
- * Updates the database table layout from WoltLab Suite Core 5.2.0 Beta 2 to 5.2.0 Beta 3.
- *
- * @author     Matthias Schmidt
- * @copyright  2001-2019 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-
-$tables = [
-       PartialDatabaseTable::create('wcf1_package')
-               ->indices([
-                       DatabaseTableIndex::create('package')
-                               ->columns(['package'])
-                               ->drop(),
-                       
-                       DatabaseTableIndex::create()
-                               ->type(DatabaseTableIndex::UNIQUE_TYPE)
-                               ->columns(['package'])
-               ])
-];
-
-(new DatabaseTableChangeProcessor(
-/** @var ScriptPackageInstallationPlugin $this */
-       $this->installation->getPackage(),
-       $tables,
-       WCF::getDB()->getEditor())
-)->process();

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index db8d1c4789c5f55350c2e5d616a90aa30bf03e07..1283fd8c4464ebba9e2f38c09efb1edd00009b5b 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -49,7 +49,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '5.2.0 Beta 3');
+define('WCF_VERSION', '5.2.0 Beta 4');
 
 // define current API version
 // @deprecated 5.2