diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php index b5c6a65aa87..bb18f59f2ff 100644 --- a/dev/tools/phan/config.php +++ b/dev/tools/phan/config.php @@ -421,6 +421,7 @@ return [ 'PhanCompatibleNegativeStringOffset', // return false positive 'PhanPluginConstantVariableBool', // a lot of false positive, in most cases, we want to keep the code as it is + 'PhanTypeInvalidDimOffset', // this option costs more time to be supported than it solves time 'PhanTypeObjectUnsetDeclaredProperty', 'PhanTypePossiblyInvalidDimOffset', // a lot of false positive, in most cases, we want to keep the code as it is diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php index 252f755528a..308c75d47c3 100644 --- a/dev/tools/phan/config_extended.php +++ b/dev/tools/phan/config_extended.php @@ -66,6 +66,7 @@ $config['suppress_issue_types'] = [ 'PhanCompatibleNegativeStringOffset', // return false positive 'PhanPluginConstantVariableBool', // a lot of false positive, in most cases, we want to keep the code as it is + 'PhanTypeInvalidDimOffset', // this option costs more time to be supported than it solves time 'PhanTypeObjectUnsetDeclaredProperty', 'PhanTypePossiblyInvalidDimOffset', // a lot of false positive, in most cases, we want to keep the code as it is diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 1906a9bdd7f..8bda4d4ed18 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -935,7 +935,7 @@ class Mailing extends CommonObject $param = array(); if ($status == -1) { - $param = array('badgeParams'=>array('attr'=>array('title'=>$desc))); + $param = array('badgeParams' => array('attr' => array('title' => $desc))); } return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode, '', $param); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 5281bc0c999..764c33a2084 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12012,14 +12012,14 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = ' /** * Output the badge of a status. * - * @param string $statusLabel Label of badge no html : use in alt attribute for accessibility - * @param string $statusLabelShort Short label of badge no html - * @param string $html Optional : label of badge with html - * @param string $statusType status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name - * @param int<0,6> $displayMode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto - * @param string $url The url for link - * @param array $params Various params. Example: array('tooltip'=>'no|...', 'badgeParams'=>...) - * @return string Html status string + * @param string $statusLabel Label of badge no html : use in alt attribute for accessibility + * @param string $statusLabelShort Short label of badge no html + * @param string $html Optional : label of badge with html + * @param string $statusType status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name + * @param int<0,6> $displayMode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto + * @param string $url The url for link + * @param array $params Various params. Example: array('tooltip'=>'no|...', 'badgeParams'=>...) + * @return string Html status string */ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array()) {