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

trunk/Packages/Common/Database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2016-01-11
+// Date: 2020-11-10
 
 function microtime_float()
@@ -13 +13 @@
 {
   var $PDOStatement;
-  var $num_rows = 0;
+  public int $num_rows = 0;
 
   function fetch_assoc()
@@ -33 +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;
 
   function __construct()
@@ -57 +57 @@
     $this->LogFile = dirname(__FILE__).'/../../Query.log';
   }
- 
-
-  function Connect($Host, $User, $Password, $Database)
+
+  function Connect(string $Host, string $User, string $Password, string $Database)
   {
     if ($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
@@ -79 +78 @@
   }
 
-  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'));
@@ -99 +98 @@
       $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);
@@ -112 +111 @@
       $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>');
@@ -122 +121 @@
   }
 
-  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)
   {
     $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
 
-  function insert($Table, $Data)
+  function insert(string $Table, array $Data)
   {
     $this->query($this->GetInsert($Table, $Data));
     $this->insert_id = $this->PDO->lastInsertId();
   }
-  
-  function GetInsert($Table, $Data)
+
+  function GetInsert(string $Table, array $Data): string
   {
     $Name = '';
@@ -157 +156 @@
   }
 
-  function update($Table, $Condition, $Data)
+  function update(string $Table, string $Condition, array $Data)
   {
     $this->query($this->GetUpdate($Table, $Condition, $Data));
   }
-  
-  function GetUpdate($Table, $Condition, $Data)
+
+  function GetUpdate(string $Table, string $Condition, array $Data): string
   {
     $Values = '';
@@ -178 +177 @@
   }
 
-  function replace($Table, $Data)
+  function replace(string $Table, array $Data)
   {
     $Name = '';
@@ -199 +198 @@
   }
 
-  function charset($Charset)
+  function charset(string $Charset)
   {
     $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);
@@ -222 +221 @@
   {
   }
-  
-  public function Transaction($Queries)
+
+  public function Transaction(array $Queries)
   {
     //echo('|'."\n");