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

trunk/Modules/WebCam/WebCam.php

@@ -3 +3 @@
 class PageWebcam extends Page
 {
-  var $FullTitle = 'Webová kamera';
-  var $ShortTitle = 'Kamera';
-  var $ParentClass = 'PagePortal';
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Webová kamera';
+    $this->ShortTitle = 'Kamera';
+    $this->ParentClass = 'PagePortal';
+  }
 
-  function Show()
+  function Show(): string
   {
-    if (file_exists($this->System->ModuleManager->Modules['WebCam']->ImageFileName))
+    if (file_exists(ModuleWebCam::Cast($this->System->GetModule('WebCam'))->ImageFileName))
     {
       $Output = '<script language="JavaScript">
-      var ImageURL = "'.$this->System->Config['Web']['RootFolder'].'/webcam/'.$this->System->Modules['Webcam']->ImageFileName.'";
+      var ImageURL = "'.$this->System->Config['Web']['RootFolder'].'/webcam/'.ModuleWebCam::Cast($this->System->GetModule('WebCam'))->ImageFileName.'";
 
       // Force an immediate image load
@@ -32 +36 @@
       </script>';
 
-      $Output .= '<br /><div align="center"><img name="theImage" src="" idth="640" height="480" alt="Webcam image"><br>Poslední aktualizace: '.date('j.n.Y G:i', filemtime($this->System->Modules['Webcam']->ImageFileName)).'<br>Obnovování po '.$this->System->Config['Web']['WebcamRefresh'].' sekundách</div><br />';
+      $Output .= '<br /><div align="center"><img name="theImage" src="" idth="640" height="480" alt="Webcam image"><br>Poslední aktualizace: '.
+        date('j.n.Y G:i', filemtime(ModuleWebCam::Cast($this->System->GetModule('WebCam'))->ImageFileName)).
+        '<br>Obnovování po '.$this->System->Config['Web']['WebcamRefresh'].' sekundách</div><br />';
     } else $Output = '<br />Obrázek nenalezen.<br /><br />';
 
@@ -44 +50 @@
 class ModuleWebCam extends AppModule
 {
-  var $ImageFileName = 'webcam.jpg';
+  public string $ImageFileName = 'webcam.jpg';
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -58 +64 @@
   }
 
-  function DoStart()
+  function DoStart(): void
   {
     $this->System->Pages['webcam'] = 'PageWebcam';
   }
 
- function ShowImage()
+ function ShowImage(): string
   {
     global $Config;
@@ -74 +80 @@
     return $Output;
   }
+
+  static function Cast(AppModule $AppModule): ModuleWebCam
+  {
+    if ($AppModule instanceof ModuleWebCam)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleWebCam type but got '.gettype($AppModule));
+  }
 }