Changeset 8 for trunk/Packages/Common

Timestamp:

Jun 1, 2023, 12:18:18 AM (18 months ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Modified: Form types made as separate FormManager package.
• Fixed: PHP 8.1 support.

Location:

trunk/Packages/Common

Files:

• AppModule.php (deleted)
• Application.php (deleted)
• Base.php (modified) (1 diff)
• BigInt.php (added)
• Common.php (modified) (2 diffs)
• Config.php (modified) (5 diffs)
• Controller.php (added)
• Database.php (modified) (10 diffs)
• Error.php (modified) (7 diffs)
• Form (deleted)
• Generics.php (added)
• Image.php (modified) (9 diffs)
• Int128.php (added)
• Locale.php (modified) (17 diffs)
• Mail.php (modified) (11 diffs)
• Model.php (added)
• ModelDef.php (added)
• ModelDesc.php (added)
• Module.php (added)
• ModuleManager.php (added)
• Modules (added)
• Modules/ModuleAdmin.php (added)
• Modules/ModuleSetup.php (added)
• NetworkAddress.php (modified) (7 diffs)
• PackageCommon.php (added)
• Page.php (modified) (3 diffs)
• Paging.php (added)
• Pdf.php (added)
• PrefixMultiplier.php (modified) (2 diffs)
• Process.php (added)
• RSS.php (modified) (1 diff)
• Setup.php (deleted)
• System.php (added)
• Table.php (modified) (9 diffs)
• UTF8.php (modified) (3 diffs)
• Update.php (modified) (7 diffs)
• View.php (added)

trunk/Packages/Common/Base.php

@@ -1 +1 @@
 <?php
-
-class System
-{
-  /* @var Database */
-  var $Database;
-
-  function __construct()
-  {
-    $this->Database = new Database();
-  }
-}
 
 class Base
 {
-  /** @var Application */
-  var $System;
-  /* @var Database */
-  var $Database;
+  public System $System;
+  public Database $Database;
 
-  function __construct(Application $System)
+  function __construct(System $System)
   {
     $this->System = &$System;
     $this->Database = &$System->Database;
   }
+
+  static function GetClassName()
+  {
+    return get_called_class();
+  }
 }
-
-class Model extends Base
-{
-
-}
-
-class View extends Base
-{
-
-}
-
-class Controller extends Base
-{
-
-}

trunk/Packages/Common/Common.php

@@ -11 +11 @@
 include_once(dirname(__FILE__).'/Error.php');
 include_once(dirname(__FILE__).'/Base.php');
-include_once(dirname(__FILE__).'/Application.php');
-include_once(dirname(__FILE__).'/AppModule.php');
+include_once(dirname(__FILE__).'/View.php');
+include_once(dirname(__FILE__).'/Model.php');
+include_once(dirname(__FILE__).'/ModelDesc.php');
+include_once(dirname(__FILE__).'/Controller.php');
+include_once(dirname(__FILE__).'/System.php');
+include_once(dirname(__FILE__).'/Module.php');
+include_once(dirname(__FILE__).'/ModuleManager.php');
+include_once(dirname(__FILE__).'/ModelDef.php');
 include_once(dirname(__FILE__).'/Config.php');
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Locale.php');
 include_once(dirname(__FILE__).'/Update.php');
-include_once(dirname(__FILE__).'/Setup.php');
 include_once(dirname(__FILE__).'/Table.php');
-include_once(dirname(__FILE__).'/Form/Form.php');
+include_once(dirname(__FILE__).'/Process.php');
+include_once(dirname(__FILE__).'/Generics.php');
+include_once(dirname(__FILE__).'/BigInt.php');
+include_once(dirname(__FILE__).'/Int128.php');
+include_once(dirname(__FILE__).'/Pdf.php');
+include_once(dirname(__FILE__).'/Paging.php');
+include_once(dirname(__FILE__).'/Modules/Setup.php');
+include_once(dirname(__FILE__).'/Modules/ModuleManager.php');
 
 class PackageCommon
 {
-  var $Name;
-  var $Version;
-  var $ReleaseDate;
-  var $License;
-  var $Creator;
-  var $Homepage;
+  public string $Name;
+  public string $Version;
+  public int $ReleaseDate;
+  public string $License;
+  public string $Creator;
+  public string $Homepage;
 
   function __construct()
@@ -34 +46 @@
     $this->Name = 'Common';
     $this->Version = '1.2';
-    $this->ReleaseDate = strtotime('2016-01-22');
+    $this->ReleaseDate = strtotime('2023-05-31');
     $this->Creator = 'Chronos';
-    $this->License = 'GNU/GPL';
-    $this->Homepage = 'http://svn.zdechov.net/svn/PHPlib/Common/';
+    $this->License = 'GNU/GPLv3';
+    $this->Homepage = 'https://svn.zdechov.net/PHPlib/Common/';
   }
 }
-
-class Paging
-{
-  var $TotalCount;
-  var $ItemPerPage;
-  var $Around;
-  var $SQLLimit;
-  var $Page;
-
-  function __construct(Application $System)
-  {
-    $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
-    $this->Around = $System->Config['Web']['VisiblePagingItems'];
-  }
-
-  function Show()
-  {
-    $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-
-    $Result = '';
-    if (array_key_exists('all', $QueryItems))
-    {
-      $PageCount = 1;
-      $ItemPerPage = $this->TotalCount;
-    } else
-    {
-      $ItemPerPage = $this->ItemPerPage;
-      $Around = round($this->Around / 2);
-      $PageCount = floor($this->TotalCount / $ItemPerPage) + 1;
-    }
-
-    if (!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
-    if (array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
-    if ($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
-    if ($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
-    $CurrentPage = $_SESSION['Page'];
-
-    $Result .= 'Počet položek: <strong>'.$this->TotalCount.'</strong> &nbsp; Stránky: ';
-
-    $Result = '';
-    if ($PageCount > 1)
-    {
-      if ($CurrentPage > 0)
-      {
-        $QueryItems['page'] = 0;
-        $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&lt;&lt;</a> ';
-        $QueryItems['page'] = ($CurrentPage - 1);
-        $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&lt;</a> ';
-      }
-      $PagesMax = $PageCount - 1;
-      $PagesMin = 0;
-      if ($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
-      if ($PagesMin < ($CurrentPage - $Around))
-      {
-        $Result.= ' ... ';
-        $PagesMin = $CurrentPage - $Around;
-      }
-      for ($i = $PagesMin; $i <= $PagesMax; $i++)
-      {
-        if ($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
-        else {
-         $QueryItems['page'] = $i;
-         $Result .= '<a href="?'.SetQueryStringArray($QueryItems).'">'.($i + 1).'</a> ';
-        }
-      }
-      if ($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
-      if ($CurrentPage < ($PageCount - 1))
-      {
-        $QueryItems['page'] = ($CurrentPage + 1);
-        $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&gt;</a> ';
-        $QueryItems['page'] = ($PageCount - 1);
-        $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&gt;&gt;</a>';
-      }
-    }
-    $QueryItems['all'] = '1';
-    if ($PageCount > 1) $Result.= ' <a href="?'.SetQueryStringArray($QueryItems).'">Vše</a>';
-
-    $Result = '<div style="text-align: center">'.$Result.'</div>';
-    $this->SQLLimit = ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage;
-    $this->Page = $CurrentPage;
-    return $Result;
-  }
-}

trunk/Packages/Common/Config.php

@@ -3 +3 @@
 class Config
 {
-  var $Data;
+  public array $Data;
 
   function __construct()
@@ -10 +10 @@
   }
 
-  function ReadValue($Name)
+  function ReadValue(string $Name)
   {
     if (!is_array($Name)) $Name = explode('/', $Name);
@@ -22 +22 @@
   }
 
-  function WriteValue($Name, $Value)
+  function WriteValue(string $Name, $Value)
   {
     if (!is_array($Name)) $Name = explode('/', $Name);
@@ -34 +34 @@
   }
 
-  function LoadFromFile($FileName)
+  function LoadFromFile(string $FileName): void
   {
     $ConfigData = array();
@@ -40 +40 @@
     foreach ($this->Data as $Index => $Item)
     {
-      if (array_key_exits($Index, $ConfigData))
+      if (array_key_exists($Index, $ConfigData))
         $this->Data[$Index] = $ConfigData[$Index];
     }
   }
 
-  function SaveToFile($FileName)
+  function SaveToFile(string $FileName): void
   {
     file_put_contents($FileName, "<?php \n\n\$ConfigData = ".var_export($this->Data, true).";\n");
   }
 
-  function GetAsArray()
+  function GetAsArray(): array
   {
     return $this->Data;

trunk/Packages/Common/Database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2016-01-11
+// Date: 2020-11-10
+
+function microtime_float()
+{
+  list($usec, $sec) = explode(" ", microtime());
+  return (float)$usec + (float)$sec;
+}
 
 class DatabaseResult
 {
-  var $PDOStatement;
-  var $num_rows = 0;
+  public PDOStatement $PDOStatement;
+  public int $num_rows = 0;
 
   function fetch_assoc()
@@ -27 +33 @@
 class Database
 {
-  var $Prefix;
-  var $Functions;
-  var $Type;
-  var $PDO;
-  var $Error;
-  var $insert_id;
-  var $LastQuery;
-  var $ShowSQLError;
-  var $ShowSQLQuery;
-  var $LogSQLQuery;
-  var $LogFile;
+  public string $Prefix;
+  public array $Functions;
+  public string $Type;
+  public PDO $PDO;
+  public string $Error;
+  public string $insert_id;
+  public string $LastQuery;
+  public bool $ShowSQLError;
+  public bool $ShowSQLQuery;
+  public bool $LogSQLQuery;
+  public string $LogFile;
+  public string $Database;
 
   function __construct()
   {
     $this->Prefix = '';
-    $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+    $this->Functions = array('NOW(', 'CURDATE(', 'CURTIME(', 'UUID(', 'SHA1(');
     $this->Type = 'mysql';  // mysql, pgsql
     $this->Error = '';
@@ -50 +57 @@
     $this->LogSQLQuery = false;
     $this->LogFile = dirname(__FILE__).'/../../Query.log';
-  }
-
-  function Connect($Host, $User, $Password, $Database)
+    $this->Database = '';
+  }
+
+  function Connect(string $Host, string $User, string $Password, string $Database): void
   {
     if ($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
       else if ($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
       else $ConnectionString = '';
+    $this->Database = $Database;
     try {
       $this->PDO = new PDO($ConnectionString, $User, $Password);
-
     } catch (Exception $E)
     {
@@ -67 +75 @@
   }
 
-  function Disconnect()
+  function Disconnect(): void
   {
     unset($this->PDO);
   }
 
-  function Connected()
+  function Connected(): bool
   {
     return isset($this->PDO);
   }
 
-  function select_db($Database)
+  function select_db(string $Database)
   {
     $this->query('USE `'.$Database.'`');
   }
 
-  function query($Query)
+  function query($Query): DatabaseResult
   {
     if (!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
     $this->LastQuery = $Query;
     if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
-      $Duration = ' ; '.round(microtime() - $QueryStartTime, 4). ' s';
-    if ($this->LogSQLQuery == true)
+    {
+      $Time = round(microtime_float() - $QueryStartTime, 4);
+      $Duration = ' ; '.$Time. ' s';
+    }
+    if (($this->LogSQLQuery == true) and ($Time != 0))
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
     if ($this->ShowSQLQuery == true)
@@ -95 +106 @@
       'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
-    $Result->PDOStatement = $this->PDO->query($Query);
-    if ($Result->PDOStatement)
-    {
-      $Result->num_rows = $Result->PDOStatement->rowCount();
+    $Statement = $this->PDO->query($Query);
+    if ($Statement)
+    {
+      $Result->PDOStatement = $Statement;
+      $Result->num_rows = $Statement->rowCount();
       $this->insert_id = $this->PDO->lastInsertId();
     } else
     {
-      $this->Error = $this->PDO->errorInfo();
-      $this->Error = $this->Error[2];
+      $Error = $this->PDO->errorInfo();
+      $this->Error = $Error[2];
       if (($this->Error != '') and ($this->ShowSQLError == true))
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
@@ -111 +123 @@
   }
 
-  function select($Table, $What = '*', $Condition = 1)
+  function select(string $Table, string $What = '*', string $Condition = '1'): DatabaseResult
   {
     return $this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
 
-  function delete($Table, $Condition)
+  function delete(string $Table, string $Condition): void
   {
     $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
 
-  function insert($Table, $Data)
+  function insert(string $Table, array $Data): int
+  {
+    $this->query($this->GetInsert($Table, $Data));
+    $this->insert_id = $this->PDO->lastInsertId();
+    return $this->insert_id;
+  }
+
+  function IsFunction(string $Text): bool
+  {
+    $Pos = strpos($Text, '(');
+    return ($Pos !== false) && in_array(substr($Text, 0, $Pos + 1), $this->Functions);
+  }
+
+  function GetInsert(string $Table, array $Data): string
   {
     $Name = '';
@@ -128 +153 @@
     {
       $Name .= ',`'.$Key.'`';
-      if (!in_array($Value, $this->Functions))
+      if (is_null($Value)) $Value = 'NULL';
+      else if (!$this->IsFunction($Value))
       {
-        if (is_null($Value)) $Value = 'NULL';
-        else $Value = $this->PDO->quote($Value);
+        $Value = $this->PDO->quote($Value);
       }
       $Values .= ','.$Value;
@@ -137 +162 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
-    $this->insert_id = $this->PDO->lastInsertId();
-  }
-
-  function update($Table, $Condition, $Data)
+    return 'INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
+  }
+
+  function update(string $Table, string $Condition, array $Data): void
+  {
+    $this->query($this->GetUpdate($Table, $Condition, $Data));
+  }
+
+  function GetUpdate(string $Table, string $Condition, array $Data): string
   {
     $Values = '';
     foreach ($Data as $Key => $Value)
     {
-      if (!in_array($Value, $this->Functions))
+      if (is_null($Value)) $Value = 'NULL';
+      else if (!$this->IsFunction($Value))
       {
-        if (is_null($Value)) $Value = 'NULL';
-        else $Value = $this->PDO->quote($Value);
+        $Value = $this->PDO->quote($Value);
       }
       $Values .= ', `'.$Key.'`='.$Value;
     }
     $Values = substr($Values, 2);
-    $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
-  }
-
-  function replace($Table, $Data)
+    return 'UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')';
+  }
+
+  function replace(string $Table, array $Data): void
   {
     $Name = '';
@@ -163 +192 @@
     foreach ($Data as $Key => $Value)
     {
-      if (!in_array($Value, $this->Functions))
+      if (is_null($Value)) $Value = 'NULL';
+      else if (!$this->IsFunction($Value))
       {
-        if (is_null($Value)) $Value = 'NULL';
-        else $Value = $this->PDO->quote($Value);
+        $Value = $this->PDO->quote($Value);
       }
       $Name .= ',`'.$Key.'`';
@@ -173 +202 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br />');
     $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
-    //echo($this->error().'<br>');
-  }
-
-  function charset($Charset)
+  }
+
+  function charset(string $Charset): void
   {
     $this->query('SET NAMES "'.$Charset.'"');
   }
 
-  function real_escape_string($Text)
+  function real_escape_string(string $Text): string
   {
     return addslashes($Text);
   }
 
-  function quote($Text)
+  function quote(string $Text): string
   {
     return $this->PDO->quote($Text);
   }
 
-  public function __sleep()
+  public function __sleep(): array
   {
     return array('LastQuery');
   }
 
-  public function __wakeup()
-  {
+  public function __wakeup(): void
+  {
+  }
+
+  public function Transaction(array $Queries): void
+  {
+    $this->PDO->beginTransaction();
+    foreach ($Queries as $Query)
+    {
+      $Statement = $this->PDO->prepare($Query);
+      $Statement->execute();
+    }
+    $this->PDO->commit();
+  }
+
+  public function TableExists(string $Name): bool
+  {
+    $DbResult = $this->query('SELECT * FROM information_schema.tables  WHERE table_schema = "'.$this->Database.
+    '" AND table_name = "'.$Name.'" LIMIT 1');
+    return $DbResult->num_rows != 0;
   }
 }

trunk/Packages/Common/Error.php

@@ -3 +3 @@
 class ErrorHandler
 {
-  var $Encoding;
-  var $ShowError;
-  var $UserErrors;
-  var $OnError;
+  public string $Encoding;
+  public bool $ShowError;
+  public int $UserErrors;
+  public $OnError;
 
   function __construct()
@@ -16 +16 @@
   }
 
-  function Start()
+  function Start(): void
   {
     set_error_handler(array($this, 'ErrorHandler'));
@@ -22 +22 @@
   }
 
-  function Stop()
+  function Stop(): void
   {
     restore_error_handler();
@@ -28 +28 @@
   }
 
-  function ErrorHandler($Number, $Message, $FileName, $LineNumber, $Variables)
+  function ErrorHandler(int $Number, string $Message, string $FileName, int $LineNumber, array $Variables = array()): bool
   {
     $ErrorType = array
@@ -63 +63 @@
   }
 
-  function ExceptionHandler(Throwable $Exception)
+  function ExceptionHandler(Throwable $Exception): void
   {
     $Backtrace = $Exception->getTrace();
@@ -75 +75 @@
   }
 
-  function ShowDefaultError($Message)
+  function ShowDefaultError(string $Message): void
   {
     $Output = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".
@@ -88 +88 @@
   }
 
-  function Report($Backtrace)
+  function Report(array $Backtrace): void
   {
     $Date = date('Y-m-d H:i:s');

trunk/Packages/Common/Image.php

@@ -9 +9 @@
 class Font
 {
-  var $Size;
-  var $FileName;
-  var $Color;
+  public int $Size;
+  public string $FileName;
+  public int $Color;
 
   function __construct()
@@ -23 +23 @@
 class Pen
 {
-  var $Color;
-  var $X;
-  var $Y;
+  public int $Color;
+  public int $X;
+  public int $Y;
 
   function __construct()
@@ -38 +38 @@
 class Brush
 {
-  var $Color;
+  public int $Color;
 
   function __construct()
@@ -49 +49 @@
 class Image
 {
-  var $Image;
-  var $Type;
-  var $Font;
-  var $Pen;
+  public $Image;
+  public int $Type;
+  public Font $Font;
+  public Pen $Pen;
+  public Brush $Brush;
 
   function __construct()
@@ -63 +64 @@
   }
 
-  function SaveToFile($FileName)
+  function SaveToFile(string $FileName): void
   {
     if ($this->Type == IMAGETYPE_JPEG)
@@ -79 +80 @@
   }
 
-  function LoadFromFile($FileName)
+  function LoadFromFile(string $FileName): void
   {
     $ImageInfo = getimagesize($FileName);
@@ -89 +90 @@
     if ($this->Type == IMAGETYPE_GIF)
     {
-      $this->Image = imagecreatefromgif($FileName);
+      $this->Image = imagecreatefromgif ($FileName);
     } else
     if ( $this->Type == IMAGETYPE_PNG)
@@ -97 +98 @@
   }
 
-  function Output()
-  {
-    $this->SaveToFile(NULL);
-  }
-
-  function SetSize($Width, $Height)
+  function SetSize(int $Width, int $Height): void
   {
     $NewImage = imagecreatetruecolor($Width, $Height);
@@ -110 +106 @@
   }
 
-  function GetWidth()
+  function GetWidth(): int
   {
     return imagesx($this->Image);
   }
 
-  function GetHeight()
+  function GetHeight(): int
   {
     return imagesy($this->Image);
   }
 
-  function TextOut($X, $Y, $Text)
+  function TextOut(int $X, int $Y, string $Text): void
   {
     imagettftext($this->Image, $this->Font->Size, 0, $X, $Y, $this->ConvertColor($this->Font->Color), $this->Font->FileName, $Text);
   }
 
-  function ConvertColor($Color)
+  function ConvertColor(int $Color): int
   {
     return imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff);
   }
 
-  function FillRect($X1, $Y1, $X2, $Y2)
+  function FillRect(int $X1, int $Y1, int $X2, int $Y2): void
   {
     imagefilledrectangle($this->Image, $X1, $Y1, $X2, $Y2, $this->ConvertColor($this->Brush->Color));
   }
 
-  function Line($X1, $Y1, $X2, $Y2)
+  function Line(int $X1, int $Y1, int $X2, int $Y2): void
   {
     imageline($this->Image, $X1, $Y1, $X2, $Y2, $this->ConvertColor($this->Pen->Color));

trunk/Packages/Common/Locale.php

@@ -3 +3 @@
 class LocaleText
 {
-  var $Data;
-  var $Code;
-  var $Title;
+  public array $Data;
+  public string $Code;
+  public string $Title;
 
   function __construct()
@@ -14 +14 @@
   }
 
-  function Load()
-  {
-  }
-
-  function Translate($Text, $Group = '')
+  function Load(): void
+  {
+  }
+
+  function Translate(string $Text, string $Group = ''): string
   {
     if (array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
@@ -25 +25 @@
   }
 
-  function TranslateReverse($Text, $Group = '')
+  function TranslateReverse(string $Text, string $Group = ''): string
   {
     $Key = array_search($Text, $this->Data[$Group]);
@@ -35 +35 @@
 class LocaleFile extends Model
 {
-  var $Texts;
-  var $Dir;
+  public LocaleText $Texts;
+  public string $Dir;
 
   function __construct(System $System)
@@ -44 +44 @@
   }
 
-  function Load($Language)
+  function Load(string $Language): void
   {
     $FileName = $this->Dir.'/'.$Language.'.php';
@@ -55 +55 @@
   }
 
-  function AnalyzeCode($Path)
+  function AnalyzeCode(string $Path): void
   {
     // Search for php files
@@ -75 +75 @@
             $Previous = strtolower(substr($Content, strpos($Content, 'T(') - 1, 1));
             $Content = substr($Content, strpos($Content, 'T(') + 2);
-            $Ord = ord($Previous);
-            //echo($Ord.',');
+            $Ord = ord($Previous);            
             if (!(($Ord >= ord('a')) and ($Ord <= ord('z'))))
             {
@@ -98 +97 @@
   }
 
-  function SaveToFile($FileName)
+  function SaveToFile(string $FileName): void
   {
     $Content = '<?php'."\n".
@@ -119 +118 @@
   }
 
-  function LoadFromDatabase($Database, $LangCode)
+  function LoadFromDatabase(Database $Database, string $LangCode): void
   {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
@@ -132 +131 @@
   }
 
-  function SaveToDatabase(Database $Database, $LangCode)
-  {
-    $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
+  function SaveToDatabase(string $LangCode): void
+  {
+    $DbResult = $this->Database->select('Language', '*', 'Code='.$this->Database->quote($LangCode));
     if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
-      $Database->delete('Locale', '`Language`='.$Language['Id']);
+      $this->Database->delete('Locale', '`Language`='.$Language['Id']);
       foreach ($this->Texts->Data as $Index => $Item)
-        $Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
-        'VALUES('.$Language['Id'].','.$Database->quote($Index).','.$Database->quote($Item).')');
-    }
-  }
-
-  function UpdateToDatabase(Database $Database, $LangCode)
-  {
-    $DbResult = $Database->select('Language', '*', '`Code`='.$Database->quote($LangCode));
+        $this->Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
+        'VALUES('.$Language['Id'].','.$this->Database->quote($Index).','.$this->Database->quote($Item).')');
+    }
+  }
+
+  function UpdateToDatabase(string $LangCode): void
+  {
+    $DbResult = $this->Database->select('Language', '*', '`Code`='.$this->Database->quote($LangCode));
     if ($DbResult->num_rows > 0)
     {
@@ -153 +152 @@
       foreach ($this->Texts->Data as $Index => $Item)
       {
-        $DbResult = $Database->select('Locale', '*', '(`Original` ='.$Database->quote($Index).
+        $DbResult = $this->Database->select('Locale', '*', '(`Original` ='.$this->Database->quote($Index).
           ') AND (`Language`='.($Language['Id']).')');
         if ($DbResult->num_rows > 0)
-        $Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
-          '(`Original` ='.$Database->quote($Index).')', array('Translated' => $Item));
-        else $Database->insert('Locale', array('Language' => $Language['Id'],
+        $this->Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
+          '(`Original` ='.$this->Database->quote($Index).')', array('Translated' => $Item));
+        else $this->Database->insert('Locale', array('Language' => $Language['Id'],
          'Original' => $Index, 'Translated' => $Item));
       }
@@ -167 +166 @@
 class LocaleManager extends Model
 {
-  var $CurrentLocale;
-  var $Codes;
-  var $Dir;
-  var $LangCode;
-  var $DefaultLangCode;
-  var $Available;
+  public LocaleFile $CurrentLocale;
+  public array $Codes;
+  public string $Dir;
+  public string $LangCode;
+  public string $DefaultLangCode;
+  public array $Available;
 
   function __construct(System $System)
@@ -182 +181 @@
     $this->DefaultLangCode = 'en';
     $this->Available = array();
-  }
-
-  function LoadAvailable()
+    $this->Dir = '';
+  }
+
+  function LoadAvailable(): void
   {
     $this->Available = array();
@@ -201 +201 @@
   }
 
-  function UpdateAll($Directory)
+  function UpdateAll(string $Directory): void
   {
     $Locale = new LocaleFile($this->System);
@@ -222 +222 @@
           if (!array_key_exists($Index, $Locale->Texts->Data))
             unset($FileLocale->Texts->Data[$Index]);
-        $FileLocale->UpdateToDatabase($this->System->Database, $FileLocale->Texts->Code);
+        $FileLocale->UpdateToDatabase($FileLocale->Texts->Code);
         $FileName = $this->Dir.'/'.$FileLocale->Texts->Code.'.php';
         $FileLocale->SaveToFile($FileName);
@@ -230 +230 @@
   }
 
-  function LoadLocale($Code)
+  function LoadLocale(string $Code): void
   {
     if (array_key_exists($Code, $this->Available))
@@ -241 +241 @@
 
 // Short named global translation function
-function T($Text, $Group = '')
+function T(string $Text, string $Group = ''): string
 {
   global $GlobalLocaleManager;

trunk/Packages/Common/Mail.php

@@ -9 +9 @@
 class Mail
 {
-  var $Priorities;
-  var $Subject;
-  var $From;
-  var $Recipients;
-  var $Bodies;
-  var $Attachments;
-  var $AgentIdent;
-  var $Organization;
-  var $ReplyTo;
-  var $Headers;
+  public string $Subject;
+  public string $From;
+  public array $Recipients;
+  public array $Bodies;
+  public array $Attachments;
+  public string $AgentIdent;
+  public string $Organization;
+  public string $ReplyTo;
+  public array $Headers;
+  private array $Priorities;
+  private string $Boundary;
+  public bool $TestMode;
+  public string $SenderAddress;
+  public string $SenderName;
 
   function __construct()
@@ -25 +29 @@
     $this->Boundary = md5(date('r', time()));
     $this->AgentIdent = 'PHP/Mail';
+    $this->TestMode = false;
     $this->Clear();
   }
 
-  function Clear()
+  function Clear(): void
   {
     $this->Bodies = array();
@@ -41 +46 @@
   }
 
-  function AddToCombined($Address)
+  function AddToCombined(string $Address): void
   {
     $this->Recipients[] = array('Address' => $Address, 'Type' => 'SendCombined');
   }
 
-  function AddTo($Address, $Name)
+  function AddTo(string $Address, string $Name): void
   {
     $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'Send');
   }
 
-  function AddCc($Address, $Name)
+  function AddCc(string $Address, string $Name): void
   {
     $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'Copy');
   }
 
-  function AddBcc($Address, $Name)
+  function AddBcc(string $Address, string $Name): void
   {
     $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'HiddenCopy');
   }
 
-  function AddBody($Content, $MimeType = 'text/plain', $Charset = 'utf-8')
+  function AddBody(string $Content, string $MimeType = 'text/plain', string $Charset = 'utf-8'): void
   {
     $this->Bodies[] = array('Content' => $Content, 'Type' => strtolower($MimeType),
@@ -67 +72 @@
   }
 
-  function Organization($org)
-  {
-    if (trim($org != '')) $this->xheaders['Organization'] = $org;
-  }
-
-  function Priority($Priority)
+  function Organization(string $org): void
+  {
+    if (trim($org != '')) $this->Headers['Organization'] = $org;
+  }
+
+  function Priority(int $Priority): bool
   {
     if (!intval($Priority)) return false;
 
-    if (!isset($this->priorities[$Priority - 1])) return false;
-
-    $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];
+    if (!isset($this->Priorities[$Priority - 1])) return false;
+
+    $this->Headers['X-Priority'] = $this->Priorities[$Priority - 1];
     return true;
   }
 
-  function AttachFile($FileName, $FileType, $Disposition = DISPOSITION_ATTACHMENT)
+  function AttachFile($FileName, $FileType, $Disposition = DISPOSITION_ATTACHMENT): void
   {
     $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType,
@@ -88 +93 @@
   }
 
-  function AttachData($FileName, $FileType, $Data, $Disposition = DISPOSITION_ATTACHMENT)
+  function AttachData($FileName, $FileType, $Data, $Disposition = DISPOSITION_ATTACHMENT): void
   {
     $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType,
@@ -94 +99 @@
   }
 
-  function Send()
+  function Send(): bool
   {
     if (count($this->Bodies) == 0) throw new Exception(T('Mail message need at least one text body'));
@@ -132 +137 @@
     if ($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
     if ($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
-    if ($this->From != '') $this->Headers['From'] = $this->From;
+    if ($this->From != '')
+    {
+      $IndexStart = strpos($this->From, '<');
+      if ($IndexStart !== false)
+      {
+        $this->Headers['From'] = '=?utf-8?Q?'.quoted_printable_encode(trim(substr($this->From, 0, $IndexStart))).'?= '.substr($this->From, $IndexStart);
+      } else
+      {
+        $this->Headers['From'] = $this->From;
+      }
+    }
 
     $Headers = '';
@@ -144 +159 @@
     if ($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
 
-
-    $res = mail($To, $this->Subject, $Body, $Headers);
+    if ($this->TestMode)
+    {
+      echo('to: '.$To.', subject: '.$this->Subject.', body: '.$Body.', headers: '.$Headers);
+      $res = true;
+    } else
+    {
+      $res = mail($To, $this->Subject, $Body, $Headers);
+    }
     return $res;
   }
 
-  function ValidEmail($Address)
-  {
-    if (ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
-    if (ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
+  function ValidEmail(string $Address): bool
+  {
+    if (preg_match(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
+    if (preg_match("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
       return true;
       else return false;
   }
 
-  function CheckAdresses($Addresses)
+  function CheckAdresses(array $Addresses): void
   {
     foreach ($Addresses as $Address)
     {
       if (!$this->ValidEmail($Address))
-  throw new Exception(sprintf(T('Mail message invalid address %s'), $Address));
-    }
-  }
-
-  private function ContentEncoding($Charset)
+      {
+        throw new Exception(sprintf(T('Mail message invalid address %s'), $Address));
+      }
+    }
+  }
+
+  private function ContentEncoding($Charset): string
   {
     if ($Charset != CHARSET_ASCII) return '8bit';
@@ -172 +195 @@
   }
 
-  private function BuildAttachment($Body)
+  private function BuildAttachment($Body): string
   {
     if (count($this->Attachments) > 0)
@@ -206 +229 @@
   }
 
-  private function BuildBody()
+  private function BuildBody(): string
   {
     $Result = '';
@@ -219 +242 @@
       $this->Headers['Content-Transfer-Encoding'] = $this->ContentEncoding($this->Bodies[0]['Charset']);
     }
-
 
     foreach ($this->Bodies as $Body)

trunk/Packages/Common/NetworkAddress.php

@@ -1 +1 @@
 <?php
+
+define('IPV4_BIT_WIDTH', 32);
 
 class NetworkAddressIPv4
 {
-  var $Address;
-  var $Prefix;
+  public int $Address;
+  public int $Prefix;
 
   function __construct()
@@ -12 +14 @@
   }
 
-  function GetNetMask()
+  function GetNetMask(): int
   {
-    return 0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1);
+    return ((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1);
   }
 
-  function AddressToString()
+  function AddressToString(): string
   {
     return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
   }
 
-  function AddressFromString($Value)
+  function AddressFromString(string $Value): void
   {
     $Parts = explode('.', $Value);
@@ -28 +30 @@
   }
 
-  function GetRange()
+  function GetRange(): array
   {
     $From = new NetworkAddressIPv4();
     $From->Address = $this->Address;
-    $From->Prefix = 32;
+    $From->Prefix = IPV4_BIT_WIDTH;
     $HostMask = 0xffffffff ^ $this->GetNetMask();
     $To = new NetworkAddressIPv4();
     $To->Address = $From->Address + $HostMask;
-    $To->Prefix = 32;
+    $To->Prefix = IPV4_BIT_WIDTH;
     return array('From' => $From, 'To' => $To);
   }
 
-  function ChangePrefix($NewPrefix)
+  function ChangePrefix(int $NewPrefix): void
   {
     $this->Prefix = $NewPrefix;
-    if ($this->Prefix > 32) $this->Prefix = 32;
+    if ($this->Prefix > IPV4_BIT_WIDTH) $this->Prefix = IPV4_BIT_WIDTH;
     if ($this->Prefix < 0) $this->Prefix = 0;
     $this->Address = $this->Address & $this->GetNetMask();
   }
 
-  function Contain($Address)
+  function Contain(NetworkAddressIPv4 $Address): bool
   {
     $UpperNetmask = $this->GetNetMask();
     if (($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
       else $Result = false;
-    //echo($Address->AddressToString().'/'.$Address->Prefix.' in '.$this->AddressToString().'/'.$this->Prefix.' '.$Result."\n");
     return $Result;
   }
 }
 
+define('IPV6_BIT_WIDTH', 128);
+
 class NetworkAddressIPv6
 {
-  var $Address;
-  var $Prefix;
+  public string $Address;
+  public int $Prefix;
 
   function __construct()
@@ -69 +72 @@
   }
 
-  function AddressToString()
+  function GetNetMask(): string
+  {
+    return Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
+      Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH - $this->Prefix)), IntToInt128(1)));
+  }
+
+  function AddressToString(): string
   {
     return inet_ntop($this->Address);
   }
 
-  function AddressFromString($Value)
+  function AddressFromString(string $Value)
   {
     $this->Address = inet_pton($Value);
   }
 
-  function GetOctets()
+  function ChangePrefix(int $NewPrefix): void
+  {
+    $this->Prefix = $NewPrefix;
+    if ($this->Prefix > IPV6_BIT_WIDTH) $this->Prefix = IPV6_BIT_WIDTH;
+    if ($this->Prefix < 0) $this->Prefix = 0;
+    $this->Address = Int128And($this->Address, $this->GetNetMask());
+  }
+
+  function GetOctets(): array
   {
     $Result = array();
@@ -85 +102 @@
     foreach ($Data as $Item)
     {
-
       $Result[] = dechex($Item & 15);
       $Result[] = dechex(($Item >> 4) & 15);
@@ -92 +108 @@
   }
 
-  function EncodeMAC($MAC)
+  function EncodeMAC(string $MAC): void
   {
     $MAC = explode(':', $MAC);
@@ -107 +123 @@
   }
 
+  function Contain(NetworkAddressIPv6 $Address): bool
+  {
+    $UpperNetmask = $this->GetNetMask();
+    if (($this->Prefix < $Address->Prefix) and ((Int128Equal(Int128And($Address->Address, $UpperNetmask), Int128And($this->Address, $UpperNetmask))))) $Result = true;
+      else $Result = false;
+    return $Result;
+  }
 }

trunk/Packages/Common/Page.php

@@ -3 +3 @@
 class Page extends View
 {
-  var $Title;
-  var $ParentClass;
-  var $RawPage;
-  var $OnSystemMessage;
+  public string $Title;
+  public string $Description;
+  public string $ParentClass;
+  public bool $RawPage;
+  public $OnSystemMessage;
+  public string $Load;
+  public string $Unload;
 
   function __construct(System $System)
@@ -13 +16 @@
     $this->RawPage = false;
     $this->OnSystemMessage = array();
+    $this->Title = "";
+    $this->Description = "";
+    $this->ParentClass = "";
   }
 
-  function Show()
+  function Show(): string
   {
     return '';
   }
 
-  function GetOutput()
+  function GetOutput(): string
   {
     $Output = $this->Show();
@@ -26 +32 @@
   }
 
-  function SystemMessage($Title, $Text)
+  function SystemMessage(string $Title, string $Text): string
   {
     return call_user_func_array($this->OnSystemMessage, array($Title, $Text));

trunk/Packages/Common/PrefixMultiplier.php

@@ -72 +72 @@
 class PrefixMultiplier
 {
-  function TruncateDigits($Value, $Digits = 4)
+  function TruncateDigits($Value, $Digits = 4): string
   {
     for ($II = 2; $II > -6; $II--)
@@ -87 +87 @@
   }
 
-  function Add($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal')
+  function Add($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal'): string
   {
     global $PrefixMultipliers;

trunk/Packages/Common/RSS.php

@@ -3 +3 @@
 class RSS
 {
-  var $Charset;
-  var $Title;
-  var $Link;
-  var $Description;
-  var $WebmasterEmail;
-  var $Items;
+  public string $Charset;
+  public string $Title;
+  public string $Link;
+  public string $Description;
+  public string $WebmasterEmail;
+  public array $Items;
 
   function __construct()
   {
     $this->Charset = 'utf8';
+    $this->Title = '';
+    $this->Link = '';
+    $this->Description = '';
+    $this->WebmasterEmail = '';
     $this->Items = array();
   }
 
-  function Generate()
+  function Generate(): string
   {
     $Result = '<?xml version="1.0" encoding="'.$this->Charset.'" ?>'."\n". //<?

trunk/Packages/Common/Table.php

@@ -3 +3 @@
 class Control
 {
-  var $Name;
+  public string $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;
+  private array $OrderDirSQL;
 
-  function __construct(Application $System)
+  function __construct()
   {
+    global $System;
+
     $this->Columns = array();
     $this->Table = new TableMemory();
@@ -124 +127 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $Output = '<table class="'.$this->Style.'">';
@@ -146 +149 @@
   }
 
-  function GetOrderHeader()
+  function GetOrderHeader(): string
   {
     if (array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];

trunk/Packages/Common/UTF8.php

@@ -526 +526 @@
   }
 
-  function ToUTF8($String, $Charset = 'iso2')
+  function ToUTF8(string $String, string $Charset = 'iso2'): string
   {
     $Result = '';
@@ -540 +540 @@
   }
 
-  function FromUTF8($String, $Charset = 'iso2')
+  function FromUTF8(string $String, string $Charset = 'iso2'): string
   {
     $Result = '';
@@ -546 +546 @@
     for ($I = 0; $I < strlen($String); $I++)
     {
-      if (ord($String{$I}) & 0x80) // UTF control character
+      if (ord($String[$I]) & 0x80) // UTF control character
       {
-        if (ord($String{$I}) & 0x40) // First
+        if (ord($String[$I]) & 0x40) // First
         {
           if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
-          $UTFPrefix = $String{$I};
+          $UTFPrefix = $String[$I];
         }
-        else $UTFPrefix .= $String{$I}; // Next
+        else $UTFPrefix .= $String[$I]; // Next
       } else
       {
         if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
         $UTFPrefix = '';
-        $Result .= $String{$I};
+        $Result .= $String[$I];
       }
     }

trunk/Packages/Common/Update.php

@@ -3 +3 @@
 class UpdateManager
 {
-  var $Revision;
-  var $Trace;
-  var $VersionTable;
-  /* @var Database */
-  var $Database;
-  var $InstallMethod;
+  public int $Revision;
+  public array $Trace;
+  public string $VersionTable;
+  public Database $Database;
+  public string $InstallMethod;
+  public $InsertSampleDataMethod;
 
   function __construct()
@@ -19 +19 @@
   }
 
-  function GetDbVersion()
+  function GetDbVersion(): ?int
   {
     $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
@@ -26 +26 @@
   }
 
-  function IsInstalled()
+  function IsInstalled(): bool
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
@@ -32 +32 @@
   }
 
-  function IsUpToDate()
+  function IsUpToDate(): bool
   {
     return $this->Revision <= $this->GetDbVersion();
   }
 
-  function Upgrade()
+  function Upgrade(): string
   {
     $DbRevision = $this->GetDbVersion();
@@ -43 +43 @@
     while ($this->Revision > $DbRevision)
     {
+      if (!array_key_exists($DbRevision, $this->Trace))
+        die('Missing upgrade trace for revision '.$DbRevision);
       $TraceItem = $this->Trace[$DbRevision];
       $Output .= 'Aktualizace na verzi '.$TraceItem['Revision'].':<br/>';
@@ -57 +59 @@
   }
 
-  function Install()
+  function Install(): void
   {
     $InstallMethod = $this->InstallMethod;
     $InstallMethod($this);
-    $this->Update();
   }
 
-  function Uninstall()
+  function Uninstall(): void
   {
-
   }
 
-  function InsertSampleData()
+  function InsertSampleData(): void
   {
     $InstallMethod = $this->InsertSampleDataMethod;
@@ -75 +75 @@
   }
 
-  function Execute($Query)
+  function Execute(string $Query): DatabaseResult
   {
     echo($Query.';<br/>');