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

trunk/Modules/EmailQueue/EmailQueue.php

@@ -3 +3 @@
 class PageEmailQueueProcess extends Page
 {
-  var $FullTitle = 'Odeslání pošty z fronty';
-  var $ShortTitle = 'Fronta pošty';
-  var $ParentClass = 'PagePortal';
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Odeslání pošty z fronty';
+    $this->ShortTitle = 'Fronta pošty';
+    $this->ParentClass = 'PagePortal';
+  }
 
-  function Show()
+  function Show(): string
   {
-    $Output = $this->System->ModuleManager->Modules['EmailQueue']->Process();
+    $Output = ModuleEmailQueue::Cast($this->System->GetModule('EmailQueue'))->Process();
     $Output = $this->SystemMessage('Zpracování fronty emailů', 'Nové emaily byly odeslány').$Output;
     return $Output;
@@ -17 +21 @@
 class ModuleEmailQueue extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -28 +32 @@
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
   }
 
-  function DoUninstall()
+  function DoUninstall(): void
   {
   }
 
-  function DoStart()
+  function DoStart(): void
   {
-    $this->System->RegisterPage('fronta-posty', 'PageEmailQueueProcess');
+    $this->System->RegisterPage(['fronta-posty'], 'PageEmailQueueProcess');
     $this->System->FormManager->RegisterClass('Email', array(
         'Title' => 'Nový email',
@@ -70 +74 @@
   }
 
-  function DoStop()
+  function DoStop(): void
   {
   }
@@ -83 +87 @@
   }
 
-  function Process()
+  function Process(): string
   {
     $Output = '';
@@ -103 +107 @@
       $Mail->Send();
       $this->Database->update('EmailQueue', 'Id='.$DbRow['Id'], array('Archive' => 1));
-      $this->System->ModuleManager->Modules['Log']->NewRecord('System', 'SendEmail', $DbRow['Id']);
+      ModuleLog::Cast($this->System->GetModule('Log'))->NewRecord('System', 'SendEmail', $DbRow['Id']);
       $Output .= 'To: '.$DbRow['To'].'  Subject: '.$DbRow['Subject'].'<br />';
     }
     return $Output;
   }
+
+  static function Cast(AppModule $AppModule): ModuleEmailQueue
+  {
+    if ($AppModule instanceof ModuleEmailQueue)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleEmailQueue type but '.gettype($AppModule));
+  }
 }
-