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

trunk/Modules/Notify/Notify.php

@@ -5 +5 @@
 class ModuleNotify extends AppModule
 {
-  var $Checks;
-
-  function __construct($System)
+  public array $Checks;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -19 +19 @@
   }
 
-  function DoStart()
+  function DoStart(): void
   {
     $this->System->FormManager->RegisterClass('NotifyUser', array(
@@ -38 +38 @@
       ),
     ));
-    $this->System->RegisterCommandLine('notify', array($this, 'RunCheck'));
-    $this->System->ModuleManager->Modules['RSS']->RegisterRSS(array('Title' => 'Notify log',
-    'Channel' => 'notifylog', 'Callback' => array('ModuleNotify', 'ShowLogRSS'),
+    $this->System->RegisterCommandLine('notify', 'Perform notifications processing.', array($this, 'RunCheck'));
+    ModuleRSS::Cast($this->System->GetModule('RSS'))->RegisterRSS(array('Title' => 'Notify log',
+    'Channel' => 'notifylog', 'Callback' => array($this, 'ShowLogRSS'),
     'Permission' => array('Module' => 'Notify', 'Operation' => 'RSS')));
   }
 
-  function RegisterCheck($Name, $Callback)
+  function RegisterCheck(string $Name, callable $Callback): void
   {
     if (array_key_exists($Name, $this->Checks))
@@ -51 +51 @@
   }
 
-  function UnregisterCheck($Name)
+  function UnregisterCheck(string $Name): void
   {
     if (!array_key_exists($Name, $this->Checks))
@@ -58 +58 @@
   }
 
-  function Check()
+  function Check(): string
   {
     $Output = '';
@@ -123 +123 @@
   }
 
-  function RunCheck($Parameters)
+  function RunCheck(array $Parameters): void
   {
     RepeatFunction(30, array($this, 'Check'));
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
     $this->Database->query('CREATE TABLE IF NOT EXISTS `NotifyCategory` (
@@ -160 +160 @@
   }
 
-  function DoUninstall()
+  function DoUninstall(): void
   {
     $this->Database->query('DROP TABLE `NotifyUser`');
@@ -166 +166 @@
   }
 
-  function ShowLogRSS()
+  function ShowLogRSS(): string
   {
     $this->ClearPage = true;
@@ -197 +197 @@
     return $RSS->Generate();
   }
+
+  static function Cast(AppModule $AppModule): ModuleNotify
+  {
+    if ($AppModule instanceof ModuleNotify)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleNotify type but got '.gettype($AppModule));
+  }
 }