Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

fix phpstan (#28609)

Browse Source 
* fix phpstan

* Update emailsenderprofile.class.php
This commit is contained in:
Frédéric FRANCE
2024-03-04 18:27:20 +01:00
committed by GitHub
parent 6878a834a5
commit 7090af2b51
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/emailsenderprofile.class.php
View File

@@ -3,7 +3,6 @@
* Copyright (C) 2014-2016 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2014-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2015 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) ---Put here your own copyright and developer email---
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr> * Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@@ -28,8 +27,6 @@
// Put here all includes required by your class file // Put here all includes required by your class file
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
/** /**
@@ -48,7 +45,7 @@ class EmailSenderProfile extends CommonObject
public $table_element = 'c_email_senderprofile'; public $table_element = 'c_email_senderprofile';
/** /**
* @var array Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * @var int|string Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/ */
public $ismultientitymanaged = 1; public $ismultientitymanaged = 1;

8
htdocs/core/lib/functions.lib.php
View File

@@ -7684,7 +7684,7 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
* *
* @param string $stringtoclean String to clean * @param string $stringtoclean String to clean
* @param array $disallowed_tags Array of tags not allowed * @param array $disallowed_tags Array of tags not allowed
* @param string $cleanalsosomestyles Clean also some tags * @param int $cleanalsosomestyles Clean also some tags
* @return string String cleaned * @return string String cleaned
* *
* @see dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_onlythesehtmltags() dol_string_onlythesehtmlattributes() * @see dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_onlythesehtmltags() dol_string_onlythesehtmlattributes()
@@ -8048,7 +8048,7 @@ function dol_htmlcleanlastbr($stringtodecode)
* @param string $a Operand a * @param string $a Operand a
* @param string $b Operand b (ENT_QUOTES|ENT_HTML5=convert simple, double quotes, colon, e accent, ...) * @param string $b Operand b (ENT_QUOTES|ENT_HTML5=convert simple, double quotes, colon, e accent, ...)
* @param string $c Operand c * @param string $c Operand c
* @param string $keepsomeentities Entities but &, <, >, " are not converted. * @param int $keepsomeentities Entities but &, <, >, " are not converted.
* @return string String decoded * @return string String decoded
*/ */
function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0) function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
@@ -8086,7 +8086,7 @@ function dol_htmlentities($string, $flags = ENT_QUOTES | ENT_SUBSTITUTE, $encodi
* Example, if string contains euro symbol that has ascii code 128 * Example, if string contains euro symbol that has ascii code 128
* *
* @param string $s String to check * @param string $s String to check
* @param string $clean Clean if it is not an ISO. Warning, if file is utf8, you will get a bad formatted file. * @param int $clean Clean if it is not an ISO. Warning, if file is utf8, you will get a bad formatted file.
* @return int|string 0 if bad iso, 1 if good iso, Or the clean string if $clean is 1 * @return int|string 0 if bad iso, 1 if good iso, Or the clean string if $clean is 1
* @deprecated Duplicate of ascii_check() * @deprecated Duplicate of ascii_check()
* @see ascii_check() * @see ascii_check()
@@ -9538,7 +9538,7 @@ function dol_htmloutput_errors($mesgstring = '', $mesgarray = array(), $keepembe
* *
* @param array $array Array to sort (array of array('key1'=>val1,'key2'=>val2,'key3'...) or array of objects) * @param array $array Array to sort (array of array('key1'=>val1,'key2'=>val2,'key3'...) or array of objects)
* @param string $index Key in array to use for sorting criteria * @param string $index Key in array to use for sorting criteria
* @param int $order Sort order ('asc' or 'desc') * @param string $order Sort order ('asc' or 'desc')
* @param int $natsort If values are strings (I said value not type): 0=Use alphabetical order, 1=use "natural" sort (natsort) * @param int $natsort If values are strings (I said value not type): 0=Use alphabetical order, 1=use "natural" sort (natsort)
* If values are numeric (I said value not type): 0=Use numeric order (even if type is string) so use a "natural" sort, 1=use "natural" sort too (same than 0), -1=Force alphabetical order * If values are numeric (I said value not type): 0=Use numeric order (even if type is string) so use a "natural" sort, 1=use "natural" sort too (same than 0), -1=Force alphabetical order
* @param int $case_sensitive 1=sort is case sensitive, 0=not case sensitive * @param int $case_sensitive 1=sort is case sensitive, 0=not case sensitive