PHP 8.1 compatibility fixes.

ivantcholakov · Aug 27, 2022 · 1fe21a3 · 1fe21a3
1 parent 56a7eac
commit 1fe21a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/platform/common/core/Common.php b/platform/common/core/Common.php
@@ -648,7 +648,7 @@ function html_attr_remove_class($attributes, $class, $return_as_array = false) {
 
         $attr->removeClass($class);
 
-        if (trim($attr->getAttribute('class')) == '') {
+        if (trim((string) $attr->getAttribute('class')) == '') {
             $attr->removeAttribute('class');
         }
 

diff --git a/platform/common/core/Core_Model.php b/platform/common/core/Core_Model.php
@@ -554,7 +554,7 @@ public function update($primary_value, $data, $skip_validation = FALSE, $escape
                 ->set($data, '', $escape);
 
             // See http://www.sqlite.org/compile.html#enable_update_delete_limit
-            if (strpos($this->_dbdriver, 'sqlite') === false && strpos($this->_subdriver, 'sqlite') === false) {
+            if (strpos((string) $this->_dbdriver, 'sqlite') === false && strpos((string) $this->_subdriver, 'sqlite') === false) {
                 $this->_database->limit(1);
             }
 
@@ -655,7 +655,7 @@ public function update_by()
             $this->_database->set($data, '', $escape);
 
             // See http://www.sqlite.org/compile.html#enable_update_delete_limit
-            if (strpos($this->_dbdriver, 'sqlite') === false && strpos($this->_subdriver, 'sqlite') === false) {
+            if (strpos((string) $this->_dbdriver, 'sqlite') === false && strpos((string) $this->_subdriver, 'sqlite') === false) {
                 $this->_database->limit(1);
             }
 
@@ -774,7 +774,7 @@ public function delete($id)
         if ($this->soft_delete)
         {
             // See http://www.sqlite.org/compile.html#enable_update_delete_limit
-            if (strpos($this->_dbdriver, 'sqlite') === false && strpos($this->_subdriver, 'sqlite') === false) {
+            if (strpos((string) $this->_dbdriver, 'sqlite') === false && strpos((string) $this->_subdriver, 'sqlite') === false) {
                 $this->_database->limit(1);
             }
 
@@ -790,7 +790,7 @@ public function delete($id)
         else
         {
             // See http://www.sqlite.org/compile.html#enable_update_delete_limit
-            if (strpos($this->_dbdriver, 'sqlite') === false && strpos($this->_subdriver, 'sqlite') === false) {
+            if (strpos((string) $this->_dbdriver, 'sqlite') === false && strpos((string) $this->_subdriver, 'sqlite') === false) {
                 $this->_database->limit(1);
             }
 
@@ -824,7 +824,7 @@ public function delete_by()
         if ($this->soft_delete)
         {
             // See http://www.sqlite.org/compile.html#enable_update_delete_limit
-            if (strpos($this->_dbdriver, 'sqlite') === false && strpos($this->_subdriver, 'sqlite') === false) {
+            if (strpos((string) $this->_dbdriver, 'sqlite') === false && strpos((string) $this->_subdriver, 'sqlite') === false) {
                 $this->_database->limit(1);
             }
 
@@ -841,7 +841,7 @@ public function delete_by()
         else
         {
             // See http://www.sqlite.org/compile.html#enable_update_delete_limit
-            if (strpos($this->_dbdriver, 'sqlite') === false && strpos($this->_subdriver, 'sqlite') === false) {
+            if (strpos((string) $this->_dbdriver, 'sqlite') === false && strpos((string) $this->_subdriver, 'sqlite') === false) {
                 $this->_database->limit(1);
             }
 
@@ -2220,9 +2220,9 @@ public function trigger($event, $data = FALSE, $last = TRUE)
         {
             foreach ($this->$event as $method)
             {
-                if (strpos($method, '('))
+                if (strpos((string) $method, '('))
                 {
-                    preg_match('/([a-zA-Z0-9\_\-]+)(\(([a-zA-Z0-9\_\-\., ]+)\))?/', $method, $matches);
+                    preg_match('/([a-zA-Z0-9\_\-]+)(\(([a-zA-Z0-9\_\-\., ]+)\))?/', (string) $method, $matches);
 
                     $method = $matches[1];
                     $this->callback_parameters = explode(',', $matches[3]);