From d12fd8d1757722d20dc28e99af0d38ad5b06b5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 6 Sep 2024 13:50:27 +0200 Subject: [PATCH] fix phpstan (#30869) * fix phpstan * fix phpstan --- htdocs/projet/class/task.class.php | 4 ++-- htdocs/societe/class/api_thirdparties.class.php | 2 +- htdocs/societe/paymentmodes.php | 2 +- phpstan.neon.dist | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 12cbf3f9dae..5ea2b5210db 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -805,7 +805,7 @@ class Task extends CommonObjectLine $projectstatic = new Project($this->db); $projectstatic->fetch($this->fk_project); - $dir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($this->id); + $dir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName((string) $this->id); dol_syslog(get_class($this)."::delete dir=".$dir, LOG_DEBUG); if (file_exists($dir)) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -2295,7 +2295,7 @@ class Task extends CommonObjectLine } $clone_task_dir = $conf->project->dir_output."/".dol_sanitizeFileName($clone_project_ref)."/".dol_sanitizeFileName($clone_task_ref); - $ori_task_dir = $conf->project->dir_output."/".dol_sanitizeFileName($ori_project_ref)."/".dol_sanitizeFileName($fromid); + $ori_task_dir = $conf->project->dir_output."/".dol_sanitizeFileName($ori_project_ref)."/".dol_sanitizeFileName((string) $fromid); $filearray = dol_dir_list($ori_task_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1); foreach ($filearray as $key => $file) { diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php index 64ea19bf2fd..57e44b578df 100644 --- a/htdocs/societe/class/api_thirdparties.class.php +++ b/htdocs/societe/class/api_thirdparties.class.php @@ -1648,7 +1648,7 @@ class Thirdparties extends DolibarrApi $moreparams = array( 'use_companybankid' => $accounts[0]->id, - 'force_dir_output' => $conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id) + 'force_dir_output' => $conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName((string) $this->company->id) ); $result = $this->company->generateDocument($model, $outputlangs, 0, 0, 0, $moreparams); diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index d6672501cc9..1aa4493ab52 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -522,7 +522,7 @@ if (empty($reshook)) { $action = 'builddoc'; $moreparams = array( 'use_companybankid' => GETPOST('companybankid'), - 'force_dir_output' => $conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id) + 'force_dir_output' => $conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName((string) $object->id) ); $_POST['lang_id'] = GETPOST('lang_idrib'.GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php $_POST['model'] = GETPOST('modelrib'.GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 9eeb26db20f..76671de572f 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -91,7 +91,6 @@ parameters: - '#pdf_writeLinkedObjects expects string, int given#' - '#dol_print_phone expects string, int given#' - '#load_fiche_titre expects string, int given#' - - '#dol_sanitizeFileName expects string, int given#' - '#dol_move expects string, int given#' - '#expects int, float#' - '#expects int, array\|string given.#'