Fix filenames of 5.3 -> 5.4 update scripts

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index aea2eab5ced7d89bdfea402fd6e9c50bd6885a73..cc98eb4b10d96683d88d40fd752f1d9bdbcdbde0 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -55,8 +55,8 @@
                <instruction type="acpTemplate" />
                <instruction type="template" />
                
-               <instruction type="script" run="standalone">acp/update_5.4_removeFiles.php</instruction>
-               <instruction type="script" run="standalone">acp/update_5.4_db.php</instruction>
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_removeFiles.php</instruction>
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_db.php</instruction>
                
                <instruction type="objectTypeDefinition" />
                <instruction type="option" />

diff --git a/wcfsetup/install/files/acp/update_5.4_db.php b/wcfsetup/install/files/acp/update_5.4_db.php
deleted file mode 100644 (file)
index 0571143..0000000
--- a/wcfsetup/install/files/acp/update_5.4_db.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-use wcf\system\database\table\column\BigintDatabaseTableColumn;
-use wcf\system\database\table\column\BinaryDatabaseTableColumn;
-use wcf\system\database\table\column\NotNullInt10DatabaseTableColumn;
-use wcf\system\database\table\column\TextDatabaseTableColumn;
-use wcf\system\database\table\DatabaseTable;
-use wcf\system\database\table\DatabaseTableChangeProcessor;
-use wcf\system\database\table\index\DatabaseTableIndex;
-use wcf\system\database\table\index\DatabaseTablePrimaryIndex;
-use wcf\system\database\table\PartialDatabaseTable;
-use wcf\system\package\plugin\ScriptPackageInstallationPlugin;
-
-$tables = [
-       DatabaseTable::create('wcf1_flood_control')
-               ->columns([
-                       BigintDatabaseTableColumn::create('logID')
-                               ->length(20)
-                               ->notNull()
-                               ->autoIncrement(),
-                       NotNullInt10DatabaseTableColumn::create('objectTypeID'),
-                       BinaryDatabaseTableColumn::create('identifier')
-                               ->length(16)
-                               ->notNull(),
-                       NotNullInt10DatabaseTableColumn::create('time'),
-               ])
-               ->indices([
-                       DatabaseTablePrimaryIndex::create()
-                               ->columns(['logID']),
-                       DatabaseTableIndex::create()
-                               ->columns(['identifier']),
-                       DatabaseTableIndex::create()
-                               ->columns(['time']),
-               ]),
-       
-       PartialDatabaseTable::create('wcf1_page_content')
-               ->columns([
-                       TextDatabaseTableColumn::create('metaKeywords')
-                               ->drop()
-               ]),
-];
-
-(new DatabaseTableChangeProcessor(
-       /** @var ScriptPackageInstallationPlugin $this */
-       $this->installation->getPackage(),
-       $tables,
-       WCF::getDB()->getEditor())
-)->process();

diff --git a/wcfsetup/install/files/acp/update_5.4_removeFiles.php b/wcfsetup/install/files/acp/update_5.4_removeFiles.php
deleted file mode 100644 (file)
index df79c3b..0000000
--- a/wcfsetup/install/files/acp/update_5.4_removeFiles.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-use wcf\data\package\PackageCache;
-use wcf\system\WCF;
-
-$files = [
-       'lib/system/database/table/DatabaseTableUtil.class.php',
-];
-
-$sql = "SELECT  packageID
-       FROM    wcf" . WCF_N . "_package_installation_file_log
-       WHERE   filename = ?";
-$searchStatement = WCF::getDB()->prepareStatement($sql);
-
-$sql = "DELETE FROM     wcf" . WCF_N . "_package_installation_file_log
-       WHERE           packageID = ?
-                       AND filename = ?";
-$deletionStatement = WCF::getDB()->prepareStatement($sql);
-
-$packageID = $this->installation->getPackageID();
-
-foreach ($files as $file) {
-       $searchStatement->execute([$file]);
-       $filePackageID = $searchStatement->fetchSingleColumn();
-       if ($filePackageID !== null && $filePackageID != $packageID) {
-               throw new \UnexpectedValueException("File '{$file}' does not belong to package '{$this->installation->getPackage()->package}' but to package '" . PackageCache::getInstance()->getPackage($filePackageID)->package . "'.");
-       }
-       
-       if (file_exists(WCF_DIR . $file)) {
-               unlink(WCF_DIR . $file);
-       }
-       
-       $deletionStatement->execute([
-               $packageID,
-               $file,
-       ]);
-}

diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
new file mode 100644 (file)
index 0000000..0571143
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
@@ -0,0 +1,47 @@
+<?php
+use wcf\system\database\table\column\BigintDatabaseTableColumn;
+use wcf\system\database\table\column\BinaryDatabaseTableColumn;
+use wcf\system\database\table\column\NotNullInt10DatabaseTableColumn;
+use wcf\system\database\table\column\TextDatabaseTableColumn;
+use wcf\system\database\table\DatabaseTable;
+use wcf\system\database\table\DatabaseTableChangeProcessor;
+use wcf\system\database\table\index\DatabaseTableIndex;
+use wcf\system\database\table\index\DatabaseTablePrimaryIndex;
+use wcf\system\database\table\PartialDatabaseTable;
+use wcf\system\package\plugin\ScriptPackageInstallationPlugin;
+
+$tables = [
+       DatabaseTable::create('wcf1_flood_control')
+               ->columns([
+                       BigintDatabaseTableColumn::create('logID')
+                               ->length(20)
+                               ->notNull()
+                               ->autoIncrement(),
+                       NotNullInt10DatabaseTableColumn::create('objectTypeID'),
+                       BinaryDatabaseTableColumn::create('identifier')
+                               ->length(16)
+                               ->notNull(),
+                       NotNullInt10DatabaseTableColumn::create('time'),
+               ])
+               ->indices([
+                       DatabaseTablePrimaryIndex::create()
+                               ->columns(['logID']),
+                       DatabaseTableIndex::create()
+                               ->columns(['identifier']),
+                       DatabaseTableIndex::create()
+                               ->columns(['time']),
+               ]),
+       
+       PartialDatabaseTable::create('wcf1_page_content')
+               ->columns([
+                       TextDatabaseTableColumn::create('metaKeywords')
+                               ->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.4_removeFiles.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_removeFiles.php
new file mode 100644 (file)
index 0000000..df79c3b
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_removeFiles.php
@@ -0,0 +1,36 @@
+<?php
+use wcf\data\package\PackageCache;
+use wcf\system\WCF;
+
+$files = [
+       'lib/system/database/table/DatabaseTableUtil.class.php',
+];
+
+$sql = "SELECT  packageID
+       FROM    wcf" . WCF_N . "_package_installation_file_log
+       WHERE   filename = ?";
+$searchStatement = WCF::getDB()->prepareStatement($sql);
+
+$sql = "DELETE FROM     wcf" . WCF_N . "_package_installation_file_log
+       WHERE           packageID = ?
+                       AND filename = ?";
+$deletionStatement = WCF::getDB()->prepareStatement($sql);
+
+$packageID = $this->installation->getPackageID();
+
+foreach ($files as $file) {
+       $searchStatement->execute([$file]);
+       $filePackageID = $searchStatement->fetchSingleColumn();
+       if ($filePackageID !== null && $filePackageID != $packageID) {
+               throw new \UnexpectedValueException("File '{$file}' does not belong to package '{$this->installation->getPackage()->package}' but to package '" . PackageCache::getInstance()->getPackage($filePackageID)->package . "'.");
+       }
+       
+       if (file_exists(WCF_DIR . $file)) {
+               unlink(WCF_DIR . $file);
+       }
+       
+       $deletionStatement->execute([
+               $packageID,
+               $file,
+       ]);
+}