From 550e4e8c9abccc6be6428945ae6f99bc321d6372 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 8 Feb 2024 00:24:27 +0100 Subject: [PATCH] Fix compatibility Conflicts: htdocs/resource/class/dolresource.class.php --- htdocs/core/modules/facture/modules_facture.php | 2 +- htdocs/core/triggers/interface_20_all_Logevents.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index c4dd83ddb7e..4b61beba6b2 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -196,7 +196,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator * @param Translate $langs Translation object * @return int Height in mm of the bottom-page QR invoice. Can be zero if not on right page; not enabled */ - protected function getHeightForQRInvoice(int $pagenbr, Facture $object, Translate $langs): int + protected function getHeightForQRInvoice(int $pagenbr, Facture $object, Translate $langs) { if (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == 'bottom') { // Keep it, to reset it after QRinvoice getter diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 854d2c37cff..26d36a678db 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -88,7 +88,7 @@ class InterfaceLogevents extends DolibarrTriggers * @return int if KO: <0, if no trigger ran: 0, if OK: >0 * @throws Exception dol_syslog can throw Exceptions */ - public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf): int + public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf) { if (getDolGlobalString('MAIN_LOGEVENTS_DISABLE_ALL')) { return 0; // Log events is disabled (hidden features)