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

Timestamp:

Nov 20, 2020, 12:08:12 AM (4 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/AppModule.php (modified) (26 diffs)

trunk/Packages/Common/AppModule.php

@@ -36 +36 @@
 class AppModule
 {
-  var $Id;
-  var $Name;
-  var $Title;
-  var $Version;
-  var $License;
-  var $Creator;
-  var $HomePage;
-  var $Description;
-  var $Running;
-  var $Enabled;
-  var $Installed;
-  var $InstalledVersion;
-  /** @var ModuleType */
-  var $Type;
-  var $Dependencies;
-  /** @var Database */
-  var $Database;
-  /** @var System */
-  var $System;
-  /** @var AppModuleManager */
-  var $Manager;
-  var $OnChange;
-
-  function __construct(System $System)
+  public int $Id;
+  public string $Name;
+  public string $Title;
+  public string $Version;
+  public string $License;
+  public string $Creator;
+  public string $HomePage;
+  public string $Description;
+  public bool $Running;
+  public bool $Enabled;
+  public bool $Installed;
+  public string $InstalledVersion;
+  public int $Type;
+  public array $Dependencies;
+  public Database $Database;
+  public Application $System;
+  public AppModuleManager $Manager;
+  public $OnChange;
+  public array $Models;
+
+  function __construct(Application $System)
   {
     $this->System = &$System;
@@ -73 +70 @@
     $this->Dependencies = array();
     $this->Type = ModuleType::Normal;
-  }
-
-  function Install()
+    $this->Models = array();
+  }
+
+  function Install(): void
   {
     if ($this->Installed) return;
@@ -87 +85 @@
   }
 
-  function Uninstall()
+  function Uninstall(): void
   {
     if (!$this->Installed) return;
@@ -98 +96 @@
   }
 
-  function Upgrade()
+  function Upgrade(): void
   {
     if (!$this->Installed) return;
@@ -108 +106 @@
   }
 
-  function Reinstall()
+  function Reinstall(): void
   {
     $this->Uninstall();
@@ -115 +113 @@
   }
 
-  function Start()
+  function Start(): void
   {
     if ($this->Running) return;
@@ -126 +124 @@
   }
 
-  function Stop()
+  function Stop(): void
   {
     if (!$this->Running) return;
@@ -136 +134 @@
   }
 
-  function Restart()
+  function Restart(): void
   {
     $this->Stop();
@@ -142 +140 @@
   }
 
-  function Enable()
+  function Enable(): void
   {
     if ($this->Enabled) return;
@@ -152 +150 @@
   }
 
-  function Disable()
+  function Disable(): void
   {
     if (!$this->Enabled) return;
@@ -162 +160 @@
   }
 
-  protected function DoStart()
-  {
-  }
-
-  protected function DoStop()
-  {
-  }
-
-  protected function DoInstall()
-  {
-  }
-
-  protected function DoUninstall()
-  {
-  }
-
-  protected function DoUpgrade()
-  {
-
+  protected function DoStart(): void
+  {
+  }
+
+  protected function DoStop(): void
+  {
+  }
+
+  protected function DoInstall(): void
+  {
+  }
+
+  protected function DoUninstall(): void
+  {
+  }
+
+  protected function DoUpgrade(): void
+  {
+  }
+
+  function AddModel(Model $Model): void
+  {
+    $this->Models[get_class($Model)] = $Model;
   }
 }
@@ -187 +189 @@
 class AppModuleManager
 {
-  var $Modules;
-  var $System;
-  var $FileName;
-  var $ModulesDir;
-  var $OnLoadModules;
+  public array $Modules;
+  public System $System;
+  public string $FileName;
+  public string $ModulesDir;
+  public $OnLoadModules;
 
   function __construct(System $System)
@@ -201 +203 @@
   }
 
-  function Perform($List, $Actions, $Conditions = array(ModuleCondition::All))
+  function Perform(array $List, array $Actions, array $Conditions = array(ModuleCondition::All)): void
   {
     foreach ($List as $Index => $Module)
@@ -227 +229 @@
   }
 
-  function EnumDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
+  function EnumDependenciesCascade(AppModule $Module, array &$List, array $Conditions = array(ModuleCondition::All))
   {
     foreach ($Module->Dependencies as $Dependency)
@@ -248 +250 @@
   }
 
-  function EnumSuperiorDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
+  function EnumSuperiorDependenciesCascade(AppModule $Module, array &$List, array $Conditions = array(ModuleCondition::All))
   {
     foreach ($this->Modules as $RefModule)
@@ -267 +269 @@
   }
 
-  function Start()
+  function Start(): void
   {
     $this->LoadModules();
@@ -274 +276 @@
   }
 
-  function StartAll()
+  function StartAll(): void
   {
     $this->Perform($this->Modules, array(ModuleAction::Start));
   }
 
-  function StartEnabled()
+  function StartEnabled(): void
   {
     $this->Perform($this->Modules, array(ModuleAction::Start), array(ModuleCondition::Enabled));
   }
 
-  function StopAll()
+  function StopAll(): void
   {
     $this->Perform($this->Modules, array(ModuleAction::Stop));
   }
 
-  function InstallAll()
+  function InstallAll(): void
   {
     $this->Perform($this->Modules, array(ModuleAction::Install));
@@ -295 +297 @@
   }
 
-  function UninstallAll()
+  function UninstallAll(): void
   {
     $this->Perform($this->Modules, array(ModuleAction::Uninstall));
@@ -301 +303 @@
   }
 
-  function EnableAll()
+  function EnableAll(): void
   {
     $this->Perform($this->Modules, array(ModuleAction::Enable));
@@ -307 +309 @@
   }
 
-  function DisableAll()
+  function DisableAll(): void
   {
     $this->Perform($this->Modules, array(ModuleAction::Disable));
@@ -313 +315 @@
   }
 
-  function ModulePresent($Name)
+  function ModulePresent(string $Name): bool
   {
     return array_key_exists($Name, $this->Modules);
   }
 
-  function ModuleEnabled($Name)
+  function ModuleEnabled(string $Name): bool
   {
     return array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled;
   }
 
-  function ModuleRunning($Name)
+  function ModuleRunning(string $Name): bool
   {
     return array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running;
   }
 
-  /* @return Module */
-  function SearchModuleById($Id)
+  function GetModule(string $Name): AppModule
+  {
+    return $this->Modules[$Name];
+  }
+
+  function SearchModuleById(int $Id): string
   {
     foreach ($this->Modules as $Module)
@@ -339 +345 @@
   }
 
-  function LoadState()
+  function LoadState(): void
   {
     $ConfigModules = array();
@@ -355 +361 @@
   }
 
-  function SaveState()
+  function SaveState(): void
   {
     $Data = array();
@@ -369 +375 @@
   }
 
-  function RegisterModule(AppModule $Module)
+  function RegisterModule(AppModule $Module): void
   {
     $this->Modules[$Module->Name] = &$Module;
@@ -376 +382 @@
   }
 
-  function UnregisterModule(AppModule $Module)
+  function UnregisterModule(AppModule $Module): void
   {
     unset($this->Modules[array_search($Module, $this->Modules)]);
   }
 
-  function LoadModulesFromDir($Directory)
+  function LoadModulesFromDir(string $Directory): void
   {
     $List = scandir($Directory);
@@ -395 +401 @@
   }
 
-  function LoadModules()
+  function LoadModules(): void
   {
     if (is_array($this->OnLoadModules) and (count($this->OnLoadModules) == 2) and method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
-      $this->OnLoadModules();
+      call_user_func($this->OnLoadModules);
     else $this->LoadModulesFromDir($this->ModulesDir);
   }