Changeset 887 for trunk/Common/Form/Types/Base.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/Common/Form/Types/Base.php (modified) (4 diffs)

trunk/Common/Form/Types/Base.php

@@ -3 +3 @@
 class TypeBase
 {
-  var $FormManager;
-  var $Database;
-  var $DatabaseCompareOperators = array();
-  var $Hidden;
+  public FormManager $FormManager;
+  public Database $Database;
+  public array $DatabaseCompareOperators = array();
+  public bool $Hidden;
 
-  function __construct($FormManager)
+  function __construct(FormManager $FormManager)
   {
     $this->FormManager = &$FormManager;
@@ -15 +15 @@
   }
 
-  function OnView($Item)
+  function OnView(array $Item): ?string
   {
     return '';
   }
 
-  function OnEdit($Item)
+  function OnEdit(array $Item): string
   {
     return '';
   }
 
-  function OnLoad($Item)
+  function OnLoad(array $Item): ?string
   {
     return '';
   }
 
-  function OnLoadDb($Item)
+  function OnLoadDb(array $Item): ?string
   {
     return $Item['Value'];
   }
 
-  function OnSaveDb($Item)
+  function OnSaveDb(array $Item): ?string
   {
     return $Item['Value'];
   }
 
-  function DatabaseEscape($Value)
+  function DatabaseEscape(string $Value): string
   {
     return addslashes($Value);
   }
 
-  function OnFilterName($Item)
+  function OnFilterName(array $Item): string
   {
     if (array_key_exists('SQL', $Item) and ($Item['SQL'] != ''))
@@ -53 +53 @@
   }
 
-  function OnFilterNameQuery($Item)
+  function OnFilterNameQuery(array $Item): string
   {
     if (array_key_exists('SQL', $Item) and ($Item['SQL'] != ''))
@@ -61 +61 @@
   }
 
-  function Validate($Item)
+  function Validate(array $Item): bool
   {
     return true;
   }
 
-  function GetValidationFormat()
+  function GetValidationFormat(): string
   {
     return '';