From 4f9e17e95abb87df1d304c217cdfe3b1e5ca079f Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 8 Apr 2025 22:33:15 +0200 Subject: [PATCH] Fix CI --- htdocs/core/frames.php | 3 ++- htdocs/core/menus/standard/auguria.lib.php | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/core/frames.php b/htdocs/core/frames.php index bc10790fe8f..0bab710087b 100644 --- a/htdocs/core/frames.php +++ b/htdocs/core/frames.php @@ -41,6 +41,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; * @var int $heightforframes */ +/** @phan-file-suppress PhanUndeclaredGlobalVariable */ + // Load translation files required by the page $langs->load("other"); @@ -105,7 +107,6 @@ if ($keyforcontent) { } else { if (preg_match('/^\//', $menu->url) || preg_match('/^http/i', $menu->url)) { // menu->url is an URL starting with http or / - // @phan-suppress PhanUndeclaredMethod print " diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 95e3216397a..7537ccd85e4 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -25,6 +25,7 @@ */ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; +/** @phan-file-suppress PhanTypeInvalidDimOffset */ /** * Core function to output top menu auguria @@ -108,10 +109,12 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout } // Modify URL for the case we are using the option showtopmenuinframe + '@phan-var-force array,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,showtopmenuinframe:int,level?:int,prefix:string}> $newTabMenu'; // @phan-suppress-next-line PhanTypeInvalidDimOffset if ($newTabMenu[$i]['showtopmenuinframe']) { if (preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) { - $url = $shorturl = '/core/frames.php?idmenu='.$newTabMenu[$i]['rowid']; + $url = '/core/frames.php?idmenu='.$newTabMenu[$i]['rowid']; + $shorturl = $url; } }