Changeset 887 for trunk/Modules/System/System.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/Modules/System/System.php (modified) (18 diffs)

trunk/Modules/System/System.php

@@ -3 +3 @@
 class PageModules extends Page
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -11 +11 @@
   }
 
-  function ShowList()
+  function ShowList(): string
   {
     $Output = '';
@@ -62 +62 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $Output = '';
@@ -69 +69 @@
       if ($_GET['A'] == 'SaveToDb')
       {
-        $Output .= $this->System->ModuleManager->Modules['System']->SaveToDatabase();
+        $Output .= ModuleSystem::Cast($this->System->GetModule('System'))->SaveToDatabase();
         $Output .= $this->SystemMessage('Načtení modulů', 'Seznam modulů v databázi zaktualizován');
       } else
@@ -78 +78 @@
         if ($ModuleName != '')
         {
-          $this->System->Modules[$ModuleName]->Install();
-          $this->System->ModuleManager->Init();
+          $this->System->ModuleManager->GetModule($ModuleName)->Install();
         } else $Output .= 'Modul id '.$_GET['Id'].' nenalezen';
 
@@ -88 +87 @@
         if ($ModuleName != '')
         {
-          $this->System->ModuleManager->Modules[$ModuleName]->UnInstall();
-          $this->System->ModuleManager->Init();
+          $this->System->ModuleManager->GetModule($ModuleName)->UnInstall();
         } else $Output .= 'Modul id '.$_GET['Id'].' nenalezen';
       } else $Output .= 'Neplatná akce';
@@ -100 +98 @@
 class ModuleSystem extends AppModule
 {
-  var $InstalledChecked;
-
-  function __construct($System)
+  public bool $InstalledChecked;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -113 +111 @@
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
     $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemVersion` (
@@ -164 +162 @@
   }
 
-  function DoUnInstall()
+  function DoUnInstall(): void
   {
     // Delete tables with reverse order
@@ -178 +176 @@
   }
 
-  function DoStart()
-  {
-    $this->System->RegisterPage('module', 'PageModules');
+  function DoStart(): void
+  {
+    $this->System->RegisterPage(['module'], 'PageModules');
     $this->System->FormManager->RegisterClass('Action', array(
       'Title' => 'Akce',
@@ -402 +400 @@
   }
 
-  function DoStop()
-  {
-  }
-
-  function IsInstalled()
+  function DoStop(): void
+  {
+  }
+
+  function IsInstalled(): bool
   {
     if ($this->InstalledChecked == false)
@@ -419 +417 @@
   }
 
-  function ModuleChange($Module)
+  function ModuleChange($Module): void
   {
     //if ($this->IsInstalled())
@@ -430 +428 @@
   }
 
-  function LoadFromDatabase()
+  function LoadFromDatabase(): void
   {
     //DebugLog('Loading modules...');
@@ -448 +446 @@
   }
 
-  function SaveToDatabase()
+  function SaveToDatabase(): string
   {
     $Output = '';
@@ -457 +455 @@
       $Modules[$DbRow['Name']] = $DbRow;
       if ($this->System->ModuleManager->ModulePresent($DbRow['Name']))
-        $this->System->ModuleManager->Modules[$DbRow['Name']]->Id = $DbRow['Id'];
+        $this->System->ModuleManager->GetModule($DbRow['Name'])->Id = $DbRow['Id'];
     }
 
@@ -470 +468 @@
           'Description' => $Module->Description, 'License' => $Module->License,
           'Installed' => $Module->Installed));
-        $this->System->ModuleManager->Modules[$Module->Name]->Id = $this->Database->insert_id;
+        $this->System->ModuleManager->GetModule($Module->Name)->Id = $this->Database->insert_id;
       }
       else $this->Database->update('Module', 'Name = "'.$Module->Name.'"', array(
@@ -512 +510 @@
       {
         if (!array_key_exists($Module->Id, $DbDependency) or
-        !in_array($this->System->ModuleManager->Modules[$Dependency]->Id, $DbDependency[$Module->Id]))
+        !in_array($this->System->ModuleManager->GetModule($Dependency)->Id, $DbDependency[$Module->Id]))
         {
-          if (array_key_exists($Dependency, $this->System->ModuleManager->Modules))
-            $DependencyId = $this->System->ModuleManager->Modules[$Dependency]->Id;
+          if ($this->System->ModuleManager->ModulePresent($Dependency))
+            $DependencyId = $this->System->ModuleManager->GetModule($Dependency)->Id;
             else throw new Exception('Dependent module '.$Dependency.' not found');
           $this->Database->insert('ModuleLink', array('Module' => $Module->Id,
@@ -534 +532 @@
     return $Output;
   }
+
+  static function Cast(AppModule $AppModule): ModuleSystem
+  {
+    if ($AppModule instanceof ModuleSystem)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleSystem type but got '.gettype($AppModule));
+  }
 }