Changeset 888 for trunk/Packages/Common/Update.php

Timestamp:

Dec 27, 2022, 7:50:23 PM (2 years ago)

Author:

chronos

Message:

• Modified: Updated Common package to latest version.
• Modified: Fixes related to PHP 8.x.

File:

• trunk/Packages/Common/Update.php (modified) (7 diffs)

trunk/Packages/Common/Update.php

@@ -3 +3 @@
 class UpdateManager
 {
-  var $Revision;
-  var $Trace;
-  var $VersionTable;
-  /* @var Database */
-  var $Database;
-  var $InstallMethod;
+  public int $Revision;
+  public array $Trace;
+  public string $VersionTable;
+  public Database $Database;
+  public string $InstallMethod;
 
   function __construct()
@@ -19 +18 @@
   }
 
-  function GetDbVersion()
+  function GetDbVersion(): ?int
   {
     $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
@@ -26 +25 @@
   }
 
-  function IsInstalled()
+  function IsInstalled(): bool
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
@@ -32 +31 @@
   }
 
-  function IsUpToDate()
+  function IsUpToDate(): bool
   {
     return $this->Revision <= $this->GetDbVersion();
   }
 
-  function Upgrade()
+  function Upgrade(): string
   {
     $DbRevision = $this->GetDbVersion();
@@ -43 +42 @@
     while ($this->Revision > $DbRevision)
     {
+      if (!array_key_exists($DbRevision, $this->Trace))
+        die('Missing upgrade trace for revision '.$DbRevision);
       $TraceItem = $this->Trace[$DbRevision];
       $Output .= 'Aktualizace na verzi '.$TraceItem['Revision'].':<br/>';
@@ -57 +58 @@
   }
 
-  function Install()
+  function Install(): void
   {
     $InstallMethod = $this->InstallMethod;
     $InstallMethod($this);
-    $this->Update();
   }
 
-  function Uninstall()
+  function Uninstall(): void
   {
-
   }
 
-  function InsertSampleData()
+  function InsertSampleData(): void
   {
     $InstallMethod = $this->InsertSampleDataMethod;
@@ -75 +74 @@
   }
 
-  function Execute($Query)
+  function Execute(string $Query): DatabaseResult
   {
     echo($Query.';<br/>');