Skip to content
GitLab
Explore
Sign in
ilias-core
ilias-archive
Compare revisions
fe7aa610ccaa6a28791e91b507627d074b3ee577 to 756223c38b743000375e1263b28b32197481e0fd
Commits on Source (4)
Style: Handle possible null value
· 28fb9631
Michael Jansen
authored
Apr 22, 2022
28fb9631
Taxonomy: Remove 'mixed' type
· 32a5ca29
Michael Jansen
authored
Apr 22, 2022
32a5ca29
Object: Describe array shape of commands
· 10e014f7
Michael Jansen
authored
Apr 22, 2022
10e014f7
Merge remote-tracking branch 'origin/trunk' into trunk
· 756223c3
Michael Jansen
authored
Apr 22, 2022
756223c3
Hide whitespace changes
Inline
Side-by-side
Services/Object/classes/class.ilObjectAccess.php
View file @
756223c3
...
@@ -44,10 +44,11 @@ class ilObjectAccess implements ilWACCheckingClass
...
@@ -44,10 +44,11 @@ class ilObjectAccess implements ilWACCheckingClass
* array("permission" => "read", "cmd" => "view", "lang_var" => "show"),
* array("permission" => "read", "cmd" => "view", "lang_var" => "show"),
* array("permission" => "write", "cmd" => "edit", "lang_var" => "edit"),
* array("permission" => "write", "cmd" => "edit", "lang_var" => "edit"),
* );
* );
* @return array{permission?:string, cmd?:string, lang_var?:string, default?:bool}[]
*/
*/
public
static
function
_getCommands
()
:
array
public
static
function
_getCommands
()
:
array
{
{
return
[
[]
];
return
[];
}
}
/**
/**
...
...
Services/Style/Content/classes/class.ilObjStyleSheet.php
View file @
756223c3
...
@@ -3276,7 +3276,7 @@ class ilObjStyleSheet extends ilObject
...
@@ -3276,7 +3276,7 @@ class ilObjStyleSheet extends ilObject
);
);
$rec
=
$ilDB
->
fetchAssoc
(
$set
);
$rec
=
$ilDB
->
fetchAssoc
(
$set
);
return
$rec
[
"value"
];
return
$rec
[
"value"
]
??
''
;
}
}
/**
/**
...
...
Services/Taxonomy/classes/class.ilTaxonomyExplorerGUI.php
View file @
756223c3
...
@@ -20,7 +20,7 @@ class ilTaxonomyExplorerGUI extends ilTreeExplorerGUI
...
@@ -20,7 +20,7 @@ class ilTaxonomyExplorerGUI extends ilTreeExplorerGUI
* @param object|string|array $a_parent_obj
* @param object|string|array $a_parent_obj
*/
*/
public
function
__construct
(
public
function
__construct
(
mixed
$a_parent_obj
,
$a_parent_obj
,
string
$a_parent_cmd
,
string
$a_parent_cmd
,
int
$a_tax_id
,
int
$a_tax_id
,
string
$a_target_gui
,
string
$a_target_gui
,
...
...