fixed a number of type issues

ILIAS-eLearning · Mar 17, 2022 · f326ace · f326ace
1 parent 9a07150
commit f326ace
Show file tree

Hide file tree

Showing 30 changed files with 31 additions and 31 deletions.
diff --git a/Modules/Portfolio/Page/class.ilPCConsultationHoursGUI.php b/Modules/Portfolio/Page/class.ilPCConsultationHoursGUI.php
@@ -24,7 +24,7 @@ class ilPCConsultationHoursGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Modules/Portfolio/Page/class.ilPCMyCoursesGUI.php b/Modules/Portfolio/Page/class.ilPCMyCoursesGUI.php
@@ -21,7 +21,7 @@ class ilPCMyCoursesGUI extends ilPageContentGUI
 {
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Modules/Wiki/classes/class.ilPCAMDPageListGUI.php b/Modules/Wiki/classes/class.ilPCAMDPageListGUI.php
@@ -23,7 +23,7 @@ class ilPCAMDPageListGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCBlogGUI.php b/Services/COPage/classes/class.ilPCBlogGUI.php
@@ -27,7 +27,7 @@ class ilPCBlogGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCContentIncludeGUI.php b/Services/COPage/classes/class.ilPCContentIncludeGUI.php
@@ -27,7 +27,7 @@ class ilPCContentIncludeGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCContentTemplateGUI.php b/Services/COPage/classes/class.ilPCContentTemplateGUI.php
@@ -25,7 +25,7 @@ class ilPCContentTemplateGUI extends ilPageContentGUI
 {
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCFileItemGUI.php b/Services/COPage/classes/class.ilPCFileItemGUI.php
@@ -29,7 +29,7 @@ class ilPCFileItemGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCFileListGUI.php b/Services/COPage/classes/class.ilPCFileListGUI.php
@@ -30,7 +30,7 @@ class ilPCFileListGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCGridCellGUI.php b/Services/COPage/classes/class.ilPCGridCellGUI.php
@@ -22,7 +22,7 @@ class ilPCGridCellGUI extends ilPageContentGUI
 {
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCInteractiveImageGUI.php b/Services/COPage/classes/class.ilPCInteractiveImageGUI.php
@@ -26,7 +26,7 @@ class ilPCInteractiveImageGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCListGUI.php b/Services/COPage/classes/class.ilPCListGUI.php
@@ -26,7 +26,7 @@ class ilPCListGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCListItemGUI.php b/Services/COPage/classes/class.ilPCListItemGUI.php
@@ -22,7 +22,7 @@ class ilPCListItemGUI extends ilPageContentGUI
 {
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCLoginPageElementGUI.php b/Services/COPage/classes/class.ilPCLoginPageElementGUI.php
@@ -25,7 +25,7 @@ class ilPCLoginPageElementGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCMapGUI.php b/Services/COPage/classes/class.ilPCMapGUI.php
@@ -24,7 +24,7 @@ class ilPCMapGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCMediaObjectGUI.php b/Services/COPage/classes/class.ilPCMediaObjectGUI.php
@@ -36,7 +36,7 @@ class ilPCMediaObjectGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCParagraphGUI.php b/Services/COPage/classes/class.ilPCParagraphGUI.php
@@ -26,7 +26,7 @@ class ilPCParagraphGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCPlaceHolderGUI.php b/Services/COPage/classes/class.ilPCPlaceHolderGUI.php
@@ -29,7 +29,7 @@ class ilPCPlaceHolderGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCPluggedGUI.php b/Services/COPage/classes/class.ilPCPluggedGUI.php
@@ -28,7 +28,7 @@ class ilPCPluggedGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_plugin_name = "",
         string $a_pc_id = ""

diff --git a/Services/COPage/classes/class.ilPCProfileGUI.php b/Services/COPage/classes/class.ilPCProfileGUI.php
@@ -24,7 +24,7 @@ class ilPCProfileGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCQuestionGUI.php b/Services/COPage/classes/class.ilPCQuestionGUI.php
@@ -31,7 +31,7 @@ class ilPCQuestionGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCQuestionOverviewGUI.php b/Services/COPage/classes/class.ilPCQuestionOverviewGUI.php
@@ -22,7 +22,7 @@ class ilPCQuestionOverviewGUI extends ilPageContentGUI
 {
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCResourcesGUI.php b/Services/COPage/classes/class.ilPCResourcesGUI.php
@@ -25,7 +25,7 @@ class ilPCResourcesGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCSkillsGUI.php b/Services/COPage/classes/class.ilPCSkillsGUI.php
@@ -24,7 +24,7 @@ class ilPCSkillsGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCSourceCodeGUI.php b/Services/COPage/classes/class.ilPCSourceCodeGUI.php
@@ -31,7 +31,7 @@ class ilPCSourceCodeGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCTableDataGUI.php b/Services/COPage/classes/class.ilPCTableDataGUI.php
@@ -22,7 +22,7 @@ class ilPCTableDataGUI extends ilPageContentGUI
 {
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCTableGUI.php b/Services/COPage/classes/class.ilPCTableGUI.php
@@ -26,7 +26,7 @@ class ilPCTableGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPCTabsGUI.php b/Services/COPage/classes/class.ilPCTabsGUI.php
@@ -26,7 +26,7 @@ class ilPCTabsGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPageContent $a_content_obj,
+        ?ilPageContent $a_content_obj,
         string $a_hier_id,
         string $a_pc_id = ""
     ) {

diff --git a/Services/COPage/classes/class.ilPageEditorGUI.php b/Services/COPage/classes/class.ilPageEditorGUI.php
@@ -225,7 +225,7 @@ public function executeCommand() : string
         if ($com[0] == "insert" || $com[0] == "create") {
             // Step CM (creation mode handling)
             $cmd = $com[0];
-            $ctype = $com[1];				// note ctype holds type if cmdclass is empty, but also subcommands if not (e.g. applyFilter in ilpcmediaobjectgui)
+            $ctype = $com[1] ?? "";				// note ctype holds type if cmdclass is empty, but also subcommands if not (e.g. applyFilter in ilpcmediaobjectgui)
             $add_type = $this->request->getString("pluginName");
             if ($ctype == "mob") {
                 $ctype = "media";
@@ -444,7 +444,7 @@ public function executeCommand() : string
 
         $this->log->debug("end ---");
 
-        return $ret;
+        return (string) $ret;
     }
 
     public function activatePage() : void

diff --git a/Services/Container/Content/class.ilContainerContentGUI.php b/Services/Container/Content/class.ilContainerContentGUI.php
@@ -629,7 +629,7 @@ public function renderItem(
             $a_item_data['ref_id'],
             $a_item_data['obj_id'],
             $a_item_data['title'],
-            $a_item_data['description'],
+            (string) $a_item_data['description'],
             $asynch,
             false,
             $asynch_url

diff --git a/Services/LearningHistory/classes/class.ilPCLearningHistoryGUI.php b/Services/LearningHistory/classes/class.ilPCLearningHistoryGUI.php
@@ -26,7 +26,7 @@ class ilPCLearningHistoryGUI extends ilPageContentGUI
 
     public function __construct(
         ilPageObject $a_pg_obj,
-        ilPCLearningHistory $a_content_obj = null,
+        ?ilPCLearningHistory $a_content_obj = null,
         string $a_hier_id = "",
         string $a_pc_id = ""
     ) {