From aa5aa2bf26cad815f1ac3ea4b0a6fadc3fc41ff0 Mon Sep 17 00:00:00 2001 From: MDW Date: Sun, 17 Mar 2024 19:19:29 +0100 Subject: [PATCH] Add one more index to the theme_datacolor --- dev/tools/phan/config.php | 2 +- dev/tools/phan/config_extended.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 2 +- htdocs/comm/action/index.php | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php index a1644a4c43f..8ffd9a1991e 100644 --- a/dev/tools/phan/config.php +++ b/dev/tools/phan/config.php @@ -171,7 +171,7 @@ $VALID_MODULE_MAPPING = array( 'syslog' => 'Syslog', 'takepos' => 'TakePos', 'tax' => 'Tax', - 'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}}', + 'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int},3:array{0:int,1:int,2:int}}', 'ticket' => 'Ticket', 'user' => 'User', 'variants' => 'Variants', diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php index 997fbaed91a..739cd972d0a 100644 --- a/dev/tools/phan/config_extended.php +++ b/dev/tools/phan/config_extended.php @@ -170,7 +170,7 @@ $VALID_MODULE_MAPPING = array( 'syslog' => 'Syslog', 'takepos' => 'TakePos', 'tax' => 'Tax', - 'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}}', + 'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int},3:array{0:int,1:int,2:int}}', 'ticket' => 'Ticket', 'user' => 'User', 'variants' => 'Variants', diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index db8eadee618..f4f77bcaa9d 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -308,7 +308,7 @@ class ActionComm extends CommonObject public $icalname; /** - * @var string Ical color + * @var int<0,3> Ical color */ public $icalcolor; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index f9c22d3e10b..7bd186d812f 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1804,7 +1804,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused; global $hookmanager; - '@phan-var-force array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}} $theme_datacolor'; + '@phan-var-force array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int},3:array{0:int,1:int,2:int}} $theme_datacolor + @phan-var-force User[] $cacheusers + @phan-var-force array> $colorindexused'; if ($conf->use_javascript_ajax) { // Enable the "Show more button..." $conf->global->MAIN_JS_SWITCH_AGENDA = 1;