Changeset 887 for trunk/Modules/Meals

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/Meals/Meals.php (modified) (10 diffs)

trunk/Modules/Meals/Meals.php

@@ -3 +3 @@
 class PageEatingPlace extends Page
 {
-  var $FullTitle = 'Jídleníček jídelny Na kopečku';
-  var $ShortTitle = 'Jídelníček';
-  var $ParentClass = 'PagePortal';
   var $DayNames = array('Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota');
   var $DayNamesShort = array('NE', 'PO', 'ÚT', 'ST', 'ČT', 'PÁ', 'SO');
@@ -11 +8 @@
   var $DayCount = 20;    // počet dopředu zobrazených dnů
 
-  function Show()
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Jídleníček jídelny Na kopečku';
+    $this->ShortTitle = 'Jídelníček';
+    $this->ParentClass = 'PagePortal';
+  }
+
+  function Show(): string
   {
     if (count($this->System->PathItems) > 1)
@@ -21 +26 @@
   }
 
-  function ShowMenu()
+  function ShowMenu(): string
   {
     //echo('Dnes je '.HumanDate(date('Y-m-d')).'<br>');
@@ -43 +48 @@
   }
 
-  function ShowPrint()
+  function ShowPrint(): string
   {
     $this->ClearPage = true;
@@ -94 +99 @@
   }
 
-  function PrintTableRow($Row)
+  function PrintTableRow(array $Row): string
   {
     global $LastWeekOfYear;
@@ -120 +125 @@
   }
 
-  function ShowEdit()
+  function ShowEdit(): string
   {
     Header('Cache-Control: no-cache');
@@ -136 +141 @@
         }
         $Output .= '<div style="color: red; font-size: larger;">Menu uloženo!</div>';
-        $this->System->ModuleManager->Modules['Log']->NewRecord('EatingPlace', 'MenuSave');
+        ModuleLog::Cast($this->System->GetModule('Log'))->NewRecord('EatingPlace', 'MenuSave');
       }
       if ($_GET['action'] == 'saveinfo')
@@ -143 +148 @@
         $this->Database->insert('MealsInfo', array('Info' => $_POST['info'], 'Price' => $_POST['price']));
         $Output .= '<div style="color: red; font-size: larger;">Informační údaje uloženy!</div>';
-        $this->System->ModuleManager->Modules['Log']->NewRecord('EatingPlace', 'InfoSave');
+        ModuleLog::Cast($this->System->GetModule('Log'))->NewRecord('EatingPlace', 'InfoSave');
       }
     }
@@ -179 +184 @@
 class ModuleMeals extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -191 +196 @@
   }
 
-  function DoInstall()
-  {
-  }
-
-  function DoUnInstall()
-  {
-  }
-
-  function DoStart()
-  {
-    $this->System->RegisterPage('jidelna', 'PageEatingPlace');
+  function DoInstall(): void
+  {
+  }
+
+  function DoUnInstall(): void
+  {
+  }
+
+  function DoStart(): void
+  {
+    $this->System->RegisterPage(['jidelna'], 'PageEatingPlace');
   }
 }