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

trunk/Common/Global.php

@@ -20 +20 @@
 $YesNo = array(false => 'Ne', true => 'Ano');
 
-function HumanSize($Value)
+function HumanSize(int $Value): string
 {
   global $UnitNames;
@@ -33 +33 @@
 }
 
-function GetMicrotime()
+function GetMicrotime(): float
 {
   list($Usec, $Sec) = explode(' ', microtime());
@@ -39 +39 @@
 }
 
-function ShowArray($Pole)
+function ShowArray(array $Array): void
 {
   echo('<pre style="font-size: 8pt;">');
-  print_r($Pole);
+  print_r($Array);
   echo('</pre>');
 }
 
-function HumanDate($Time)
+function HumanDate(?string $Time): string
 {
   if ($Time != '')
@@ -58 +58 @@
 
 // Show page listing numbers
-function PagesList($URL, $Page, $TotalCount, $CountPerPage)
+function PagesList(string $URL, int $Page, int $TotalCount, int $CountPerPage): string
 {
   $Count = ceil($TotalCount / $CountPerPage);
@@ -94 +94 @@
 }
 
-function ExtractTime($Time)
+function ExtractTime($Time): array
 {
   return array(
@@ -106 +106 @@
 }
 
-function GetQueryStringArray($QueryString)
+function GetQueryStringArray(string $QueryString): array
 {
   $Result = array();
@@ -122 +122 @@
 }
 
-function SetQueryStringArray($QueryStringArray)
+function SetQueryStringArray(array $QueryStringArray): string
 {
   $Parts = array();
@@ -132 +132 @@
 }
 
-function GetPageList($ObjectName, $TotalCount)
+function GetPageList(string $ObjectName, int $TotalCount): array
 {
   global $System;
@@ -209 +209 @@
 $OrderArrowImage = array('sort_asc.png', 'sort_desc.png');
 
-function GetOrderTableHeader($ObjectName, $Columns, $DefaultColumn, $DefaultOrder = 0)
+function GetOrderTableHeader(string $ObjectName, array $Columns, string $DefaultColumn, int $DefaultOrder = 0): array
 {
   global $OrderDirSQL, $OrderArrowImage, $Config, $System;
@@ -262 +262 @@
 }
 
-function GetRemoteAddress()
+function GetRemoteAddress(): string
 {
   if (array_key_exists('REMOTE_ADDR', $_SERVER)) $IP = $_SERVER['REMOTE_ADDR'];
@@ -269 +269 @@
 }
 
-function IsInternetAddr()
+function IsInternetAddr(): bool
 {
   global $Config;
@@ -286 +286 @@
 }
 
-function GetMemberByIP($IP)
-{
-  global $Database;
-
+function GetMemberByIP(Database $Database, string $IP): string
+{
   $DbResult = $Database->query('SELECT `Id` FROM `Member` WHERE '.
   '(SELECT `Member` FROM `NetworkDevice` WHERE (SELECT `Device` FROM `NetworkInterface` '.
@@ -300 +298 @@
 }
 
-function CommandExist($Command)
+function CommandExist(string $Command): bool
 {
   $Result = shell_exec('which '.$Command);
@@ -306 +304 @@
 }
 
-function RemoveDiacritic($Text)
+function RemoveDiacritic(string $Text): string
 {
   return str_replace(
@@ -316 +314 @@
 }
 
-function RouterOSIdent($Name)
+function RouterOSIdent(string $Name): string
 {
   return strtr(strtolower(trim($Name)), array(' ' => '-', '.' => '', '(' => '-', ')' => '-', ',' => '-',
@@ -328 +326 @@
 }
 
-function NotBlank($Text)
+function NotBlank(string $Text): string
 {
   if ($Text == '') return '&nbsp';
@@ -334 +332 @@
 }
 
-function strip_cdata($string)
+function strip_cdata(string $string): string
 {
   preg_match_all('/<!\[cdata\[(.*?)\]\]>/is', $string, $matches);
@@ -351 +349 @@
 }
 
-function ProcessURL()
+function ProcessURL(): array
 {
   if (array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
@@ -365 +363 @@
 }
 
-function RepeatFunction($Period, $Callback)
+function RepeatFunction(int $Period, callable $Callback): void
 {
   while (1)
@@ -384 +382 @@
   return call_user_func_array('pack', array_merge(array($v), (array)$a));
 }
-