Merge branch 'hotfix/5.22'

ADOdb · Apr 15, 2023 · 1a008f9 · 1a008f9
2 parents 0461808 + 8968147
commit 1a008f9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/adodb-csvlib.inc.php b/adodb-csvlib.inc.php
@@ -76,6 +76,7 @@ function _rs2serialize(&$rs,$conn=false,$sql='')
 
 		$savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
 		$class = $rs->connection->arrayClass;
+		/** @var ADORecordSet $rs2 */
 		$rs2 = new $class(ADORecordSet::DUMMY_QUERY_ID);
 		$rs2->timeCreated = $rs->timeCreated; # memcache fix
 		$rs2->sql = $rs->sql;

diff --git a/adodb-loadbalancer.inc.php b/adodb-loadbalancer.inc.php
@@ -38,17 +38,17 @@ class ADOdbLoadBalancer
     /**
      * @var bool|array    All connections to each database.
      */
-    protected $connections = false;
+    protected $connections = [];
 
     /**
      * @var bool|array    Just connections to the write capable database.
      */
-    protected $connections_write = false;
+    protected $connections_write = [];
 
     /**
      * @var bool|array    Just connections to the readonly database.
      */
-    protected $connections_readonly = false;
+    protected $connections_readonly = [];
 
     /**
      * @var array    Counts of all connections and their types.
@@ -73,12 +73,12 @@ class ADOdbLoadBalancer
     /**
      * @var bool    Session variables that must be maintained across all connections, ie: SET TIME ZONE.
      */
-    protected $session_variables = false;
+    protected $session_variables = [];
 
     /**
      * @var bool    Called immediately after connecting to any DB.
      */
-    protected $user_defined_session_init_sql = false;
+    protected $user_defined_session_init_sql = [];
 
 
     /**
@@ -403,7 +403,7 @@ public function setSessionVariable($name, $value, $execute_immediately = true)
      */
     private function executeSessionVariables($adodb_obj = false)
     {
-        if (is_array($this->session_variables)) {
+        if (is_array($this->session_variables) && count($this->session_variables) > 0) {
             $sql = '';
             foreach ($this->session_variables as $name => $value) {
                 // $sql .= 'SET SESSION '. $name .' '. $value;

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -58,6 +58,8 @@ Older changelogs:
 
 - Creation of dynamic property deprecated warning in PHP 8.2
   [#954](https://github.com/ADOdb/ADOdb/issues/954)
+- loadbalancer: PHP 8.2 warnings
+  [#951](https://github.com/ADOdb/ADOdb/issues/951)
 
 
 ## [5.22.5] - 2023-04-03