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

trunk/Common/Form/Form.php

@@ -22 +22 @@
 class Form
 {
-  var $FormManager;
-  var $Definition;
-  var $Values;
-  var $ValuesValidate;
-  var $ValuesFilter;
-  var $OnSubmit;
-  var $Database;
-
-  function __construct($FormManager)
+  public FormManager $FormManager;
+  public Database $Database;
+  public array $Definition;
+  public array $Values;
+  public array $ValuesValidate;
+  public array $ValuesFilter;
+  public string $OnSubmit;
+
+  function __construct(FormManager $FormManager)
   {
     $this->FormManager = &$FormManager;
@@ -41 +41 @@
   }
 
-  function LoadDefaults()
+  function LoadDefaults(): void
   {
     foreach ($this->Definition['Items'] as $Index => $Item)
@@ -58 +58 @@
   }
 
-  function SetClass($Name)
+  function SetClass(string $Name): void
   {
     $this->Definition = &$this->FormManager->Classes[$Name];
@@ -64 +64 @@
   }
 
-  function GetValue($Index, $Event = 'OnView')
+  function GetValue(string $Index, string $Event = 'OnView'): string
   {
     $Item = $this->Definition['Items'][$Index];
@@ -82 +82 @@
   }
 
-  function ShowViewForm()
+  function ShowViewForm(): string
   {
     $Table = array(
@@ -116 +116 @@
   }
 
-  function ShowEditForm()
+  function ShowEditForm(): string
   {
     if (!array_key_exists('SubmitText', $this->Definition)) $this->Definition['SubmitText'] = 'Uložit';
@@ -125 +125 @@
   }
 
-  function ShowEditBlock($Context = '')
+  function ShowEditBlock(string $Context = ''): string
   {
     $Hidden = '';
@@ -182 +182 @@
   }
 
-  function LoadValuesFromDatabase($Id)
+  function LoadValuesFromDatabase(string $Id): void
   {
     foreach ($this->Definition['Items'] as $Index => $Item)
@@ -232 +232 @@
   }
 
-  function SaveValuesToDatabase($Id)
+  function SaveValuesToDatabase(string $Id)
   {
     $Values = array();
@@ -269 +269 @@
   }
 
-  function LoadValuesFromForm()
+  function LoadValuesFromForm(): void
   {
     $this->Values = $this->LoadValuesFromFormBlock();
   }
 
-  function LoadValuesFromFormBlock($Context = '')
+  function LoadValuesFromFormBlock(string $Context = ''): array
   {
     if ($Context != '') $Context = $Context.'-';
@@ -319 +319 @@
   }
 
-  function Validate()
+  function Validate(): bool
   {
     $Valid = true;
@@ -358 +358 @@
 
 
-function MakeLink($Target, $Title)
+function MakeLink(string $Target, string $Title): string
 {
   return '<a href="'.$Target.'">'.$Title.'</a>';
 }
 
-function Table($Table)
+function Table(array $Table): string
 {
   $Result = '<table class="BasicTable">';
@@ -389 +389 @@
 class FormManager
 {
-  var $Classes;
-  var $FormTypes;
-  var $Database;
-  var $Type;
-  var $RootURL;
-  var $ShowRelation;
-
-  function __construct($Database)
+  public array $Classes;
+  public array $FormTypes;
+  public Database $Database;
+  public Type $Type;
+  public string $RootURL;
+  public bool $ShowRelation;
+
+  function __construct(Database $Database)
   {
     $this->Database = &$Database;
@@ -405 +405 @@
   }
 
-  function RegisterClass($Name, $Class)
+  function RegisterClass(string $Name, array $Class): void
   {
     $this->Classes[$Name] = $Class;
   }
 
-  function UnregisterClass($Name)
+  function UnregisterClass(string $Name): void
   {
     unset($this->Classes[$Name]);
   }
 
-  function RegisterFormType($Name, $Class)
+  function RegisterFormType(string $Name, array $Class): void
   {
     $this->FormTypes[$Name] = $Class;
   }
 
-  function UnregisterFormType($Name)
+  function UnregisterFormType(string $Name): void
   {
     unset($this->FormTypes[$Name]);
   }
 
-  function UpdateSQLMeta()
+  function UpdateSQLMeta(): void
   {
     $this->Database->query('DELETE FROM ModelField');