Changeset 887 for trunk/Application/View.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/Application/View.php (modified) (8 diffs)

trunk/Application/View.php

@@ -6 +6 @@
 {
   var $TimeStart;
-  var $FormatHTML = false;
-  var $ShowRuntimeInfo = false;
-  var $ClearPage = false;
-  var $BasicHTML = false;
-  var $ParentClass = '';
-  var $ShortTitle;
-  var $FullTitle;
-  var $Encoding;
-  var $Style;
+  public bool $FormatHTML = false;
+  public bool $ShowRuntimeInfo = false;
+  public bool $ClearPage = false;
+  public bool $BasicHTML = false;
+  public string $ParentClass = '';
+  public string $ShortTitle;
+  public string $FullTitle;
+  public string $Encoding;
+  public string $Style;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -36 +36 @@
   }
 
-  function SystemMessage($Title, $Text)
+  function SystemMessage(string $Title, string $Text): string
   {
     return '<table align="center"><tr><td><div class="SystemMessage"><h3>'.$Title.'</h3><div>'.$Text.'</div></div></td></tr></table>';
@@ -43 +43 @@
   }
 
-  function ShowNavigation($Page)
+  function ShowNavigation(Page $Page): string
   {
     if (array_key_exists('REQUEST_URI', $_SERVER))
@@ -71 +71 @@
   }
 
-  function ShowHeader($Page)
+  function ShowHeader(Page $Page): string
   {
     $Title = $Page->FullTitle;
@@ -109 +109 @@
   }
 
-  function ShowFooter()
+  function ShowFooter(): string
   {
     global $ScriptTimeStart, $Revision, $ReleaseTime;
@@ -128 +128 @@
   }
 
-  function GetOutput($Page)
+  function GetOutput(Page $Page): string
   {
     $Page->OnSystemMessage = array($this->System->BaseView, 'SystemMessage');
@@ -141 +141 @@
   }
 
-  function NewPage($ClassName)
+  function NewPage(string $ClassName): Page
   {
     $Page = new $ClassName();
@@ -151 +151 @@
 
   // XML formating function
-  function FormatOutput($s)
+  function FormatOutput(string $s): string
   {
     $out = '';