From e760c5989f3be5a11b34f144d5b9eb993512f265 Mon Sep 17 00:00:00 2001
From: Prasad <prasad@vtiger.com>
Date: Wed, 21 Sep 2022 18:00:25 +0530
Subject: [PATCH] Static specifier added to function signature for php 8.x
compatability
---
modules/Calendar/models/Module.php | 2 +-
modules/Settings/LayoutEditor/models/Module.php | 2 +-
modules/Settings/Workflows/models/Module.php | 2 +-
modules/Vtiger/models/ListView.php | 6 +++---
modules/Vtiger/uitypes/Reminder.php | 3 ++-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php
index 8cccc7648..4d8193247 100644
--- a/modules/Calendar/models/Module.php
+++ b/modules/Calendar/models/Module.php
@@ -714,7 +714,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
* @param type $currentUserId
* @param type $sharedIds
*/
- public function getSharedType($currentUserId){
+ public static function getSharedType($currentUserId){
$db = PearDatabase::getInstance();
$query = "SELECT calendarsharedtype FROM vtiger_users WHERE id=?";
diff --git a/modules/Settings/LayoutEditor/models/Module.php b/modules/Settings/LayoutEditor/models/Module.php
index bedc5ffbf..52da4fe49 100644
--- a/modules/Settings/LayoutEditor/models/Module.php
+++ b/modules/Settings/LayoutEditor/models/Module.php
@@ -21,7 +21,7 @@ class Settings_LayoutEditor_Module_Model extends Vtiger_Module_Model {
* Function that returns all the fields for the module
* @return <Array of Vtiger_Field_Model> - list of field models
*/
- public function getFields() {
+ public function getFields($blockInstance = false) {
if(empty($this->fields)){
$fieldList = array();
$blocks = $this->getBlocks();
diff --git a/modules/Settings/Workflows/models/Module.php b/modules/Settings/Workflows/models/Module.php
index e6db6fa8f..5c418c1c8 100644
--- a/modules/Settings/Workflows/models/Module.php
+++ b/modules/Settings/Workflows/models/Module.php
@@ -108,7 +108,7 @@ class Settings_Workflows_Module_Model extends Settings_Vtiger_Module_Model {
* Function to get the count of active workflows
* @return <Integer> count of active workflows
*/
- public function getActiveWorkflowCount($moduleCount = false){
+ public static function getActiveWorkflowCount($moduleCount = false){
$db = PearDatabase::getInstance();
$query = 'SELECT count(*) AS count, vtiger_tab.tabid FROM com_vtiger_workflows
diff --git a/modules/Vtiger/models/ListView.php b/modules/Vtiger/models/ListView.php
index 0d5bf538c..1953acd92 100644
--- a/modules/Vtiger/models/ListView.php
+++ b/modules/Vtiger/models/ListView.php
@@ -533,15 +533,15 @@ class Vtiger_ListView_Model extends Vtiger_Base_Model {
$this->get('query_generator', $queryGenerator);
}
- public function getSortParamsSession($key) {
+ public static function getSortParamsSession($key) {
return isset($_SESSION[$key]) ? $_SESSION[$key] : null;
}
- public function setSortParamsSession($key, $params) {
+ public static function setSortParamsSession($key, $params) {
$_SESSION[$key] = $params;
}
- public function deleteParamsSession($key, $params) {
+ public static function deleteParamsSession($key, $params) {
if(!is_array($params)) {
$params = array($params);
}
diff --git a/modules/Vtiger/uitypes/Reminder.php b/modules/Vtiger/uitypes/Reminder.php
index 033d14e1e..457087b97 100644
--- a/modules/Vtiger/uitypes/Reminder.php
+++ b/modules/Vtiger/uitypes/Reminder.php
@@ -53,6 +53,7 @@ class Vtiger_Reminder_UIType extends Vtiger_Date_UIType {
* @return converted value
*/
public function getEditViewDisplayValue($value) {
+ $value = (float)$value; /* typecast for php8.x */
if($value != 0 ){
$rem_days = floor($value/(24*60));
$rem_hrs = floor(($value-$rem_days*24*60)/60);
@@ -68,4 +69,4 @@ class Vtiger_Reminder_UIType extends Vtiger_Date_UIType {
return 'uitypes/FieldSearchView.tpl';
}
-}
\ No newline at end of file
+}
--
GitLab