Changeset 887 for trunk/Packages/Common/Table.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/Packages/Common/Table.php (modified) (9 diffs)

trunk/Packages/Common/Table.php

@@ -5 +5 @@
   var $Name;
 
-  function Show()
+  function Show(): string
   {
     return '';
@@ -13 +13 @@
 class Table
 {
-  function GetCell($Y, $X)
+  function GetCell($Y, $X): string
   {
     return '';
@@ -26 +26 @@
   }
 
-  function RowsCount()
+  function RowsCount(): int
   {
     return 0;
@@ -34 +34 @@
 class TableMemory extends Table
 {
-  var $Cells;
+  public array $Cells;
 
-  function GetCell($Y, $X)
+  function GetCell($Y, $X): string
   {
     return $this->Cells[$Y][$X];
   }
 
-  function RowsCount()
+  function RowsCount(): int
   {
     return count($this->Cells);
@@ -49 +49 @@
 class TableSQL extends Table
 {
-  var $Query;
-  var $Database;
-  var $Cells;
+  public string $Query;
+  public Database $Database;
+  public array $Cells;
 
-  function GetCell($Y, $X)
+  function GetCell($Y, $X): string
   {
     return $this->Cells[$Y][$X];
@@ -73 +73 @@
   }
 
-  function RowsCount()
+  function RowsCount(): int
   {
     return count($this->Cells);
@@ -81 +81 @@
 class TableColumn
 {
-  var $Name;
-  var $Title;
+  public string $Name;
+  public string $Title;
 }
 
 class VisualTable extends Control
 {
-  var $Cells;
-  var $Columns;
-  var $OrderSQL;
-  var $OrderColumn;
-  var $OrderDirection;
-  var $OrderArrowImage;
-  var $DefaultColumn;
-  var $DefaultOrder;
-  var $Table;
-  var $Style;
+  public array $Cells;
+  public array $Columns;
+  public string $OrderSQL;
+  public string $OrderColumn;
+  public int $OrderDirection;
+  public array $OrderArrowImage;
+  public string $DefaultColumn;
+  public int $DefaultOrder;
+  public TableMemory $Table;
+  public string $Style;
 
   function __construct()
@@ -126 +126 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $Output = '<table class="'.$this->Style.'">';
@@ -148 +148 @@
   }
 
-  function GetOrderHeader()
+  function GetOrderHeader(): string
   {
     if (array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];