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

trunk/Modules/TimeMeasure/Main.php

@@ -3 +3 @@
 class PageMeasure extends Page
 {
-  var $GraphTimeRanges;
-  var $DefaultVariables;
-  var $ImageHeight;
-  var $ImageWidth;
-
-  function __construct($System)
+  public array $GraphTimeRanges;
+  public array $DefaultVariables;
+  public int $ImageHeight;
+  public int $ImageWidth;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -23 +23 @@
     );
     $this->GraphTimeRanges = array
-  (
-    'hour' => array(
-      'caption' => 'Hodina',
-      'period' => 3600,
-    ),
-    'day' => array(
-      'caption' => 'Den',
-      'period' => 86400, // 3600 * 24,
-    ),
-    'week' => array(
-      'caption' => 'Týden',
-      'period' => 604800, // 3600 * 24 * 7,
-    ),
-    'month' => array(
-      'caption' => 'Měsíc',
-      'period' => 2592000, // 3600 * 24 * 30,
-    ),
-    'year' => array(
-      'caption' => 'Rok',
-      'period' => 31536000, // 3600 * 24 * 365,
-    ),
-    'years' => array(
-      'caption' => 'Desetiletí',
-      'period' => 315360000, // 3600 * 24 * 365 * 10,
-    ),
-  );
+    (
+      'hour' => array(
+        'caption' => 'Hodina',
+        'period' => 3600,
+      ),
+      'day' => array(
+        'caption' => 'Den',
+        'period' => 86400, // 3600 * 24,
+      ),
+      'week' => array(
+        'caption' => 'Týden',
+        'period' => 604800, // 3600 * 24 * 7,
+      ),
+      'month' => array(
+        'caption' => 'Měsíc',
+        'period' => 2592000, // 3600 * 24 * 30,
+      ),
+      'year' => array(
+        'caption' => 'Rok',
+        'period' => 31536000, // 3600 * 24 * 365,
+      ),
+      'years' => array(
+        'caption' => 'Desetiletí',
+        'period' => 315360000, // 3600 * 24 * 365 * 10,
+      ),
+    );
   }
 
@@ -114 +114 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $Debug = 0;
@@ -182 +182 @@
   }
 
-  function Graph()
+  function Graph(): string
   {
     $Output = '<strong>Graf:</strong><br/>';
@@ -194 +194 @@
   }
 
-  function MeasureTable()
+  function MeasureTable(): string
   {
     $PrefixMultiplier = new PrefixMultiplier();
@@ -266 +266 @@
 class PageMeasureAddValue extends Page
 {
-  function Show()
+  function Show(): string
   {
     $this->ClearPage = true;