浏览代码

Fix compatibility

Conflicts:
	htdocs/resource/class/dolresource.class.php
Laurent Destailleur 1 年之前
父节点
当前提交
550e4e8c9a

+ 1 - 1
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

+ 1 - 1
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)