From 377d562fe174bbb2c6037a5b673c6cfb497f8cc4 Mon Sep 17 00:00:00 2001
From: Paul Webster <paul@dabdig.com>
Date: Fri, 10 Feb 2023 15:44:20 +0000
Subject: [PATCH] PHP8

Chages for PHP8 and remain backward compatible

Deprecated: Optional parameter $password declared before required parameter $table is implicitly treated as a required parameter in tableManager.php
2 options ...
1) move $password to further down the list
Would require simple changes to all callers to reflect the new parameter order.
Best to make it the first optional in this case.

2) make it mandatory
Passwords is probably always set by caller - even if only an empty string
Probably no change to callers.

Testing of results in PDO operations needs to handle both int and string returns

For example:
validateTableName:
PHP7
array (size=1)
  0 =>
    array (size=1)
      'count' => string '1' (length=1)

PHP8
array(1) { [0]=> array(1) { ["count"]=> int(1) } }

So change from === to == and let PHP juggle the types.

$mysqlDb needs to be declared at the top of the class to avoid "deprecated" warning
---
 tableManager.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tableManager.php b/tableManager.php
index 53755b6..d701587 100644
--- a/tableManager.php
+++ b/tableManager.php
@@ -52,6 +52,8 @@ class tableManager {
     var $nonceKey;
     /** @var array array holding key of field name and value of URL to wrap field in */
     var $fieldLinks;
+    /** @var PDO object handle to information_schema */
+    var $mysqlDb;
 
     /**
      * tableManager constructor - establishes a connection to a database and a specific table
@@ -64,7 +66,7 @@ class tableManager {
      * @param int string $port defaults to '3306'
      * @throws Exception if table name doesn't exist in database
      */
-    function __construct($host, $username, $password = '', $database, $table, $type = 'mysql', $port = '3306')
+    function __construct($host, $username, $password, $database, $table, $type = 'mysql', $port = '3306')
     {
         $this->host = $host;
         $this->username = $username;
@@ -538,7 +540,8 @@ public function valueExists($key, $value){
             $query->bindValue(':value', $value, PDO::PARAM_STR);
             $query->execute();
             $result = $query->fetch(PDO::FETCH_ASSOC);
-            if ($result['count'] === "0"){
+	    # use == rather than === because some versions return int and others string
+            if ($result['count'] == "0"){
                 return false;
             } else {
                 return true;
@@ -742,7 +745,8 @@ private function validateTableName($table){
         $query->bindValue(':database', $this->database, PDO::PARAM_STR);
         $query->execute();
         $result = $query->fetchAll(PDO::FETCH_ASSOC);
-        if ($result[0]['count'] === "1") {
+	# use == rather than === because some versions return int and others string
+        if ($result[0]['count'] == "1") {
             return true;
         } else {
             return false;
@@ -764,7 +768,8 @@ private function validateTableColumns($rowsArray){
             $query->bindValue(':column', $column, PDO::PARAM_STR);
             $query->execute();
             $result = $query->fetchAll(PDO::FETCH_ASSOC);
-            if ($result[0]['count'] !== "1") {
+	    # use != rather than !== because some versions return int and others string
+            if ($result[0]['count'] != "1") {
                 return false;
             }
         }