Modules/Chatroom/classes/admingui/class.ilChatroomAdminSmileyGUI.php

@@ -418,7 +418,7 @@ class ilChatroomAdminSmileyGUI extends ilChatroomGUIHandler
         if ($this->upload->hasUploads() && !$this->upload->hasBeenProcessed()) {
             $this->upload->process();
 
-            /** @var \ILIAS\FileUpload\DTO\UploadResult $result */
+            /** @var \ILIAS\FileUpload\DTO\UploadResult|null $result */
             $result = array_values($this->upload->getResults())[0];
             if ($result && $result->isOK()) {
                 $this->upload->moveOneFileTo(
@@ -555,7 +555,7 @@ class ilChatroomAdminSmileyGUI extends ilChatroomGUIHandler
         if ($this->upload->hasUploads() && !$this->upload->hasBeenProcessed()) {
             $this->upload->process();
 
-            /** @var \ILIAS\FileUpload\DTO\UploadResult $result */
+            /** @var \ILIAS\FileUpload\DTO\UploadResult|null $result */
             $result = array_values($this->upload->getResults())[0];
             if ($result && $result->isOK()) {
                 $this->upload->moveOneFileTo(

Modules/Chatroom/classes/class.ilChatroomSmilies.php

@@ -218,7 +218,7 @@ class ilChatroomSmilies
     /**
      * Updates smiley in DB by keyword and id from given array
      * ($data["smiley_keywords"], $data["smiley_id"])
-     * @param array{smiley_id: int, smiley_keywords: string, smiley_path: string, smiley_fullpath: string} $data
+     * @param array{smiley_id: int, smiley_keywords: string, smiley_path?: string, smiley_fullpath?: string} $data
      */
     public static function _updateSmiley(array $data) : void
     {
@@ -233,7 +233,7 @@ class ilChatroomSmilies
             [$data['smiley_keywords'], $data['smiley_id']]
         );
 
-        if ($data["smiley_path"]) {
+        if (isset($data["smiley_path"])) {
             $sm = self::_getSmiley($data["smiley_id"]);
             unlink($sm["smiley_fullpath"]);
             $ilDB->manipulateF(

Modules/Chatroom/classes/class.ilChatroomXMLParser.php

@@ -76,8 +76,8 @@ class ilChatroomXMLParser extends ilSaxParser
     public function setHandlers($a_xml_parser) : void
     {
         xml_set_object($a_xml_parser, $this);
-        xml_set_element_handler($a_xml_parser, 'handlerBeginTag', 'handlerEndTag');
-        xml_set_character_data_handler($a_xml_parser, 'handlerCharacterData');
+        xml_set_element_handler($a_xml_parser, [$this, 'handlerBeginTag'], [$this, 'handlerEndTag']);
+        xml_set_character_data_handler($a_xml_parser, [$this, 'handlerCharacterData']);
     }
 
     public function handlerBeginTag($a_xml_parser, string $a_name, array $a_attribs) : void

Modules/Chatroom/classes/class.ilObjChatroomAccess.php

@@ -71,7 +71,8 @@ class ilObjChatroomAccess extends ilObjectAccess implements ilWACCheckingClass
             self::$chat_enabled = (bool) $chatSetting->get('chat_enabled', '0');
         }
 
-        if ($DIC->rbac()->system()->checkAccessOfUser($a_user_id, 'write', $a_ref_id)) {
+        $hasWriteAccess = $DIC->rbac()->system()->checkAccessOfUser($a_user_id, 'write', $a_ref_id);
+        if ($hasWriteAccess) {
             return true;
         }
 
@@ -80,7 +81,6 @@ class ilObjChatroomAccess extends ilObjectAccess implements ilWACCheckingClass
                 $visible = null;
 
                 $active = self::isActivated($a_ref_id, $a_obj_id, $visible);
-                $hasWriteAccess = $DIC->rbac()->system()->checkAccessOfUser($a_user_id, 'write', $a_ref_id);
 
                 if (!$active) {
                     $DIC->access()->addInfoItem(
@@ -89,17 +89,12 @@ class ilObjChatroomAccess extends ilObjectAccess implements ilWACCheckingClass
                     );
                 }
 
-                if (!$hasWriteAccess && !$active && !$visible) {
+                if ($active === false && $visible === false) {
                     return false;
                 }
                 break;
 
             case 'read':
-                $hasWriteAccess = $DIC->rbac()->system()->checkAccessOfUser($a_user_id, 'write', $a_ref_id);
-                if ($hasWriteAccess) {
-                    return true;
-                }
-
                 $active = self::isActivated($a_ref_id, $a_obj_id);
                 if (!$active) {
                     $DIC->access()->addInfoItem(

Modules/Chatroom/classes/gui/class.ilChatroomViewGUI.php

@@ -456,7 +456,6 @@ class ilChatroomViewGUI extends ilChatroomGUIHandler
         $chatSettings = new ilSetting('chatroom');
         if (!$chatSettings->get('chat_enabled', '0')) {
             $this->ilCtrl->redirect($this->gui, 'settings-general');
-            exit;
         }
 
         $room = ilChatroom::byObjectId($this->gui->getObject()->getId());

Modules/Chatroom/test/class.ilChatroomAbstractTaskTest.php

@@ -26,7 +26,7 @@ use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
  */
 abstract class ilChatroomAbstractTaskTest extends ilChatroomAbstractTest
 {
-    /** @var MockObject|ilChatroomObjectGui */
+    /** @var MockObject|ilChatroomObjectGUI */
     protected $gui;
 
     /** @var MockObject|ilChatroomServerConnector */

Modules/ContentPage/classes/class.ilObjContentPageGUI.php

@@ -577,7 +577,7 @@ class ilObjContentPageGUI extends ilObject2GUI implements ilContentPageObjectCon
 
     protected function getEditFormCustomValues(array &$a_values) : void
     {
-        $a_values['activation_online'] = !($this->object->getOfflineStatus() === null) && !$this->object->getOfflineStatus();
+        $a_values['activation_online'] = $this->object->getOfflineStatus() === false;
         $a_values[ilObjectServiceSettingsGUI::INFO_TAB_VISIBILITY] = $this->infoScreenEnabled;
     }
 

Modules/ContentPage/test/PageReadingTimeTest.php

@@ -43,7 +43,7 @@ class PageReadingTimeTest extends TestCase
     }
 
     /**
-     * @param $mixedType
+     * @param mixed $mixedType
      * @dataProvider mixedReadingTypesProvider
      */
     public function testPageReadingTimeValueThrowsExceptionWhenConstructedWithInvalidTypes($mixedType) : void

Services/Password/test/encoders/ilBcryptPasswordEncoderTest.php

@@ -80,7 +80,7 @@ class ilBcryptPasswordEncoderTest extends ilPasswordBaseTest
     }
 
     /**
-     * @return array<string, string>
+     * @return array<string, string[]>
      */
     public function costsProvider() : array
     {

Services/Password/test/encoders/ilBcryptPhpPasswordEncoderTest.php

@@ -33,7 +33,7 @@ class ilBcryptPhpPasswordEncoderTest extends ilPasswordBaseTest
     private const WRONG_PASSWORD = 'wrong_password';
 
     /**
-     * @return array<string, string>
+     * @return array<string, string[]>
      */
     public function costsProvider() : array
     {