Changeset 887 for trunk/Packages/Common/Setup.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

• trunk/Packages/Common/Setup.php (modified) (19 diffs)

trunk/Packages/Common/Setup.php

@@ -3 +3 @@
 class PageSetup extends Page
 {
-  var $UpdateManager;
-  var $ConfigDefinition;
-  var $Config;
-  var $DatabaseRevision;
-  var $Revision;
-  var $Updates;
-  var $ConfigDir;
-
-  function __construct($System)
+  public UpdateManager $UpdateManager;
+  public array $ConfigDefinition;
+  public array $Config;
+  public int $DatabaseRevision;
+  public int $Revision;
+  public string $ConfigDir;
+  public array $YesNo;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
-    $this->Title = T('Application setup');
+    $this->FullTitle = T('Application setup');
+    $this->ShortTitle = T('Application setup');
     //$this->ParentClass = 'PagePortal';
     $this->ConfigDir = dirname(dirname(dirname(__FILE__))).'/Config';
@@ -20 +21 @@
   }
 
-  function LoginPanel()
+  function LoginPanel(): string
   {
     $Output = '<h3>Přihlášení k instalaci</h3>'.
@@ -32 +33 @@
   }
 
-  function ControlPanel()
+  function ControlPanel(): string
   {
     $Output = '<h3>'.T('Instance management').'</h3>';
@@ -62 +63 @@
   }
 
-  function Show()
+  function Show(): string
   {
     global $ConfigDefinition, $DatabaseRevision, $Config, $Updates;
@@ -163 +164 @@
   }
 
-  function ShowModules()
+  function ShowModules(): string
   {
     $Output = '';
@@ -170 +171 @@
     if ($Operation == 'install')
     {
-      $this->System->ModuleManager->Modules[$_GET['name']]->Install();
+      $this->System->ModuleManager->GetModule($_GET['name'])->Install();
       $this->System->ModuleManager->SaveState();
       $Output .= 'Modul '.$_GET['name'].' instalován<br/>';
@@ -176 +177 @@
     if ($Operation == 'uninstall')
     {
-      $this->System->ModuleManager->Modules[$_GET['name']]->Uninstall();
+      $this->System->ModuleManager->GetModule($_GET['name'])->Uninstall();
       $this->System->ModuleManager->SaveState();
       $Output .= 'Modul '.$_GET['name'].' odinstalován<br/>';
@@ -182 +183 @@
     if ($Operation == 'enable')
     {
-      $this->System->ModuleManager->Modules[$_GET['name']]->Enable();
+      $this->System->ModuleManager->GetModule($_GET['name'])->Enable();
       $this->System->ModuleManager->SaveState();
       $Output .= 'Modul '.$_GET['name'].' povolen<br/>';
@@ -188 +189 @@
     if ($Operation == 'disable')
     {
-      $this->System->ModuleManager->Modules[$_GET['name']]->Disable();
+      $this->System->ModuleManager->GetModule($_GET['name'])->Disable();
       $this->System->ModuleManager->SaveState();
       $Output .= 'Modul '.$_GET['name'].' zakázán<br/>';
@@ -194 +195 @@
     if ($Operation == 'upgrade')
     {
-      $this->System->ModuleManager->Modules[$_GET['name']]->Upgrade();
+      $this->System->ModuleManager->GetModule($_GET['name'])->Upgrade();
       $this->System->ModuleManager->SaveState();
       $Output .= 'Modul '.$_GET['name'].' povýšen<br/>';
@@ -203 +204 @@
   }
 
-  function ShowList()
+  function ShowList(): string
   {
     $Output = '';
@@ -247 +248 @@
   }
 
-  function PrepareConfig($Config)
+  function PrepareConfig($Config): string
   {
     $Output = '';
@@ -322 +323 @@
   }
 
-  function CreateConfig($Config)
+  function CreateConfig($Config): string
   {
     $Output = "<?php\n\n".
@@ -359 +360 @@
 class PageSetupRedirect extends Page
 {
-  function Show()
+  function Show(): string
   {
     $Output = '';
@@ -377 +378 @@
 class Setup extends Model
 {
-  var $UpdateManager;
+  public UpdateManager $UpdateManager;
 
   function Start()
@@ -383 +384 @@
     global $DatabaseRevision;
 
-    $this->System->RegisterPage('', 'PageSetupRedirect');
-    $this->System->RegisterPage('setup', 'PageSetup');
+    $this->System->RegisterPage([''], 'PageSetupRedirect');
+    $this->System->RegisterPage(['setup'], 'PageSetup');
 
     // Check database persistence structure
@@ -396 +397 @@
   {
     unset($this->UpdateManager);
-    $this->System->UnregisterPage('');
-    $this->System->UnregisterPage('setup');
-  }
-
-  function CheckState()
+    $this->System->UnregisterPage(['']);
+    $this->System->UnregisterPage(['setup']);
+  }
+
+  function CheckState(): bool
   {
     return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
@@ -432 +433 @@
   }
 
-  function IsInstalled()
+  function IsInstalled(): bool
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->UpdateManager->VersionTable.'"');
@@ -438 +439 @@
   }
 
-  function Upgrade()
+  function Upgrade(): string
   {
     $Updates = new Updates();