Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix expects int (#30304)

Browse Source
This commit is contained in:
Frédéric FRANCE 2024-07-06 14:30:13 +02:00 committed by GitHub
parent eb5b3deddf
commit f99beb9023
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/adherents/agenda.php
View File

@ -5,6 +5,7 @@
* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -190,7 +191,7 @@ if ($object->id > 0) {
$param .= '&limit='.$limit;
}
print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $newcardbutton, '', 0, 1, 0);
print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 0);
// List of all actions
$filters = array();

3
htdocs/admin/external_rss.php
View File

@ -8,6 +8,7 @@
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2020 Tobias Sekan <tobias.sekan@startmail.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -320,7 +321,7 @@ if ($resql) {
}
// Active
$active = _isInBoxList($idrss, $boxlist) ? 'yes' : 'no';
$active = _isInBoxList((int) $idrss, $boxlist) ? 'yes' : 'no';
print '<tr class="oddeven">';
print '<td>'.$langs->trans('WidgetAvailable').'</td>';
print '<td>'.yn($active);

2
htdocs/admin/stock.php
View File

@ -494,7 +494,7 @@ if ($virtualdiffersfromphysical) {
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print "<td>".$langs->trans("RuleForStockReplenishment")." ".img_help('help', $langs->trans("VirtualDiffersFromPhysical"))."</td>\n";
print "<td>".$langs->trans("RuleForStockReplenishment")." ".img_help(1, $langs->trans("VirtualDiffersFromPhysical"))."</td>\n";
print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
print '</tr>'."\n";

10
htdocs/compta/bank/bankentries_list.php
View File

@ -659,21 +659,23 @@ if ($search_thirdparty_user) {
$sql .= " ( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
$sql .= " JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
$sql .= " JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)";
$sql .= " WHERE ". natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")";
$sql .= " WHERE ". natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, 0, 1).")";
$sql .= " OR b.rowid IN ";
$sql .= " ( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
$sql .= " JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
$sql .= " JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)";
$sql .= " WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1);
$sql .= " WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, 0, 1);
$sql .= "))";
}
if ($search_description) {
$search_description_to_use = $search_description;
$arrayoffixedlabels = array(
'payment_salary',
'CustomerInvoicePayment', 'CustomerInvoicePaymentBack',
'SupplierInvoicePayment', 'SupplierInvoicePaymentBack',
'CustomerInvoicePayment',
'CustomerInvoicePaymentBack',
'SupplierInvoicePayment',
'SupplierInvoicePaymentBack',
'DonationPayment',
'ExpenseReportPayment',
'SocialContributionPayment',

3
htdocs/core/lib/admin.lib.php
View File

@ -5,6 +5,7 @@
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2023 Eric Seigne <eric.seigne@cap-rel.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -1066,7 +1067,7 @@ function listOfSessions()
/**
* Purge existing sessions
*
* @param int $mysessionid To avoid to try to delete my own session
* @param string $mysessionid To avoid to try to delete my own session
* @return int >0 if OK, <0 if KO
*/
function purgeSessions($mysessionid)

2
htdocs/mrp/mo_production.php
View File

@ -999,7 +999,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$reg = [];
$qtyhourservice = 0;
if (preg_match('/^(\d+)([a-z]+)$/', $tmpproduct->duration, $reg)) {
$qtyhourservice = convertDurationtoHour($reg[1], $reg[2]);
$qtyhourservice = convertDurationtoHour($reg[1], (string) $reg[2]);
}
$qtyhourforline = 0;
if ($line->fk_unit) {

4
htdocs/ticket/card.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2013-2016 Jean-François FERRY <hello@librethic.io>
* Copyright (C) 2016 Christophe Battarel <christophe@altairis.fr>
* Copyright (C) 2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2021-2024 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2021-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2021 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2022-2023 Charlene Benke <charlene@patas-monkey.com>
* Copyright (C) 2023 Benjamin Falière <benjamin.faliere@altairis.fr>
@ -1060,7 +1060,7 @@ if ($action == 'create' || $action == 'presend') {
print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
print $langs->trans("AssignedTo");
if (isset($object->status) && $object->status < $object::STATUS_CLOSED && GETPOST('set', 'alpha') != "assign_ticket" && $user->hasRight('ticket', 'manage')) {
print '</td><td class="right"><a class="editfielda" href="'.$url_page_current.'?track_id='.urlencode($object->track_id).'&set=assign_ticket">'.img_edit($langs->trans('Modify'), '').'</a>';
print '</td><td class="right"><a class="editfielda" href="'.$url_page_current.'?track_id='.urlencode($object->track_id).'&set=assign_ticket">'.img_edit($langs->trans('Modify')).'</a>';
}
print '</td></tr></table>';
print '</td><td>';

17
phpstan.neon.dist
View File

@ -69,7 +69,22 @@ parameters:
- '#expects int\|#'
- '#expects int<-2, 2>, bool given.#'
- '#expects int<0, 1>#'
- '#expects int, string#'
- '#print.* expects int, string#'
- '#tax_by.* expects int, string#'
- '#load.* expects int, string#'
- '#ajax.* expects int, string#'
- '#measu.* expects int, string#'
- '#color.* expects int, string#'
- '#imap.* expects int, string#'
- '#show.* expects int, string#'
- '#pdf.* expects int, string#'
- '#dol.* expects int, string#'
- '#get.* expects int, string#'
- '#send.* expects int, string#'
- '#convert.* expects int, string#'
- '#constructor expects int, string#'
- '#\(\) expects int, string#'
- '#run_sql expects int, string#'
- '#expects int, float#'
- '#expects int, null#'
- '#expects int, bool given.#'