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

trunk/Modules/Log/Log.php

@@ -3 +3 @@
 class ModuleLog extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
   }
 
-  function DoUnInstall()
+  function DoUnInstall(): void
   {
   }
 
-  function DoStart()
+  function DoStart(): void
   {
     $this->System->FormManager->RegisterClass('Log', array(
@@ -38 +38 @@
       ),
     ));
-    $this->System->ModuleManager->Modules['RSS']->RegisterRSS(array('Title' => 'Logs',
-      'Channel' => 'log', 'Callback' => array('ModuleLog', 'ShowRSS'),
+    ModuleRSS::Cast($this->System->GetModule('RSS'))->RegisterRSS(array('Title' => 'Logs',
+      'Channel' => 'log', 'Callback' => array($this, 'ShowRSS'),
       'Permission' => array('Module' => 'Log', 'Operation' => 'RSS')));
   }
 
-  function DoStop()
+  function DoStop(): void
   {
   }
 
-  function NewRecord($Module, $Operation, $Value = '')
+  function NewRecord(string $Module, string $Operation, string $Value = ''): void
   {
-    if (array_key_exists('User', $this->System->ModuleManager->Modules) and
-      array_key_exists('Id', $this->System->User->User))
-      $UserId = $this->System->User->User['Id'];
+    if ($this->System->ModuleManager->ModulePresent('User') and
+      array_key_exists('Id', ModuleUser::Cast($this->System->GetModule('User'))->User->User))
+      $UserId = ModuleUser::Cast($this->System->GetModule('User'))->User->User['Id'];
       else $UserId = NULL;
     if (array_key_exists('REMOTE_ADDR', $_SERVER)) $IPAddress = $_SERVER['REMOTE_ADDR'];
@@ -60 +60 @@
   }
 
-  function ShowRSS()
+  function ShowRSS(): string
   {
     $this->ClearPage = true;
@@ -98 +98 @@
     return $RSS->Generate();
   }
+
+  static function Cast(AppModule $AppModule): ModuleLog
+  {
+    if ($AppModule instanceof ModuleLog)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleLog type but got '.gettype($AppModule));
+  }
 }