Refactor: Simplify conditional checks and use null coalescing operator across exercise-related files for cleaner and more consistent code readability - refs BT#23068

Author: AngelFQC

main/exercise/exercise.class.php

@@ -4516,7 +4516,7 @@ function ($answerId) use ($objAnswerTmp) {
                         if (!$switchableAnswerSet) {
                             // not switchable answer, must be in the same place than teacher order
                             for ($i = 0; $i < count($listCorrectAnswers['words']); $i++) {
-                                $studentAnswer = isset($choice[$i]) ? $choice[$i] : '';
+                                $studentAnswer = $choice[$i] ?? '';
                                 $correctAnswer = $listCorrectAnswers['words'][$i];
 
                                 if ($debug) {
@@ -4594,7 +4594,7 @@ function ($answerId) use ($objAnswerTmp) {
 
                                 $found = false;
                                 for ($j = 0; $j < count($listTeacherAnswerTemp); $j++) {
-                                    $correctAnswer = isset($listTeacherAnswerTemp[$j]) ? $listTeacherAnswerTemp[$j] : '';
+                                    $correctAnswer = $listTeacherAnswerTemp[$j] ?? '';
                                     if (is_array($listTeacherAnswerTemp)) {
                                         $correctAnswer = implode('||', $listTeacherAnswerTemp);
                                     }

main/exercise/exercise_result.php

@@ -111,11 +111,10 @@
     );
 }
 $exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exeId);
-$learnpath_id = isset($exercise_stat_info['orig_lp_id']) ? $exercise_stat_info['orig_lp_id'] : 0;
-$learnpath_item_id = isset($exercise_stat_info['orig_lp_item_id']) ? $exercise_stat_info['orig_lp_item_id'] : 0;
-$learnpath_item_view_id = isset($exercise_stat_info['orig_lp_item_view_id'])
-    ? $exercise_stat_info['orig_lp_item_view_id'] : 0;
-$exerciseId = isset($exercise_stat_info['exe_exo_id']) ? $exercise_stat_info['exe_exo_id'] : 0;
+$learnpath_id = $exercise_stat_info['orig_lp_id'] ?? 0;
+$learnpath_item_id = $exercise_stat_info['orig_lp_item_id'] ?? 0;
+$learnpath_item_view_id = $exercise_stat_info['orig_lp_item_view_id'] ?? 0;
+$exerciseId = $exercise_stat_info['exe_exo_id'] ?? 0;
 
 $logInfo = [
     'tool' => TOOL_QUIZ,
@@ -357,7 +356,7 @@
 $template->assign('content', $template->fetch($template->get_template('exercise/result.tpl')));
 $template->display_one_col_template();
 
-function showEmbeddableFinishButton()
+function showEmbeddableFinishButton(): string
 {
     $js = '<script>
         $(function () {

main/exercise/exercise_submit.php

@@ -123,11 +123,11 @@
 $reminder = isset($_REQUEST['reminder']) ? (int) $_REQUEST['reminder'] : 0;
 $remind_question_id = isset($_REQUEST['remind_question_id']) ? (int) $_REQUEST['remind_question_id'] : 0;
 $exerciseId = isset($_REQUEST['exerciseId']) ? (int) $_REQUEST['exerciseId'] : 0;
-$formSent = isset($_REQUEST['formSent']) ? $_REQUEST['formSent'] : null;
-$exerciseResult = isset($_REQUEST['exerciseResult']) ? $_REQUEST['exerciseResult'] : null;
-$exerciseResultCoordinates = isset($_REQUEST['exerciseResultCoordinates']) ? $_REQUEST['exerciseResultCoordinates'] : null;
-$choice = isset($_REQUEST['choice']) ? $_REQUEST['choice'] : null;
-$choice = empty($choice) ? isset($_REQUEST['choice2']) ? $_REQUEST['choice2'] : null : null;
+$formSent = $_REQUEST['formSent'] ?? null;
+$exerciseResult = $_REQUEST['exerciseResult'] ?? null;
+$exerciseResultCoordinates = $_REQUEST['exerciseResultCoordinates'] ?? null;
+$choice = $_REQUEST['choice'] ?? null;
+$choice = empty($choice) ? $_REQUEST['choice2'] ?? null : null;
 $current_question = $currentQuestionFromUrl = isset($_REQUEST['num']) ? (int) $_REQUEST['num'] : null;
 $currentAnswer = isset($_REQUEST['num_answer']) ? (int) $_REQUEST['num_answer'] : null;
 $logInfo = [
@@ -1081,7 +1081,7 @@
 }
 
 $exercise_timeover = false;
-$limit_time_exists = !empty($objExercise->start_time) || !empty($objExercise->end_time) ? true : false;
+$limit_time_exists = !empty($objExercise->start_time) || !empty($objExercise->end_time);
 if ($limit_time_exists) {
     $exercise_start_time = api_strtotime($objExercise->start_time, 'UTC');
     $exercise_end_time = api_strtotime($objExercise->end_time, 'UTC');

main/exercise/fill_blanks.class.php

@@ -824,15 +824,14 @@ public static function getAnswerInfo($userAnswer = '', $isStudentAnswer = false)
         $listDetails = explode(':', $listArobaseSplit[0]);
 
         // < number of item after the ::[score]:[size]:[separator_id]@ , here there are 3
+        $listWeightings = explode(',', $listDetails[0]);
         if (count($listDetails) < 3) {
-            $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = [];
             for ($i = 0; $i < count($listWeightings); $i++) {
                 $listSizeOfInput[] = 200;
             }
             $blankSeparatorNumber = 0; // 0 is [...]
         } else {
-            $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = explode(',', $listDetails[1]);
             $blankSeparatorNumber = $listDetails[2];
         }
@@ -1269,7 +1268,8 @@ public static function getHtmlAnswer(
         $resultsDisabled = false,
         $showTotalScoreAndUserChoices = false,
         $exercise
-    ) {
+    ): string
+    {
         $hideExpectedAnswer = false;
         $hideUserSelection = false;
         if (!$exercise->showExpectedChoiceColumn()) {
@@ -1414,7 +1414,7 @@ public static function getHtmlWrongAnswer(
      *
      * @return bool
      */
-    public static function isCorrect($answerText)
+    public static function isCorrect($answerText): bool
     {
         $answerInfo = self::getAnswerInfo($answerText, true);
         $correctAnswerList = $answerInfo['words'];
@@ -1436,7 +1436,7 @@ public static function isCorrect($answerText)
      *
      * @return string
      */
-    public static function clearStudentAnswer($answer)
+    public static function clearStudentAnswer($answer): string
     {
         $answer = htmlentities(api_utf8_encode($answer), ENT_QUOTES);
         $answer = str_replace('&#039;', '&#39;', $answer); // fix apostrophe

main/inc/lib/exercise.lib.php

@@ -5460,7 +5460,7 @@ public static function displayQuestionListByAttempt(
 
                 // Category report
                 $category_was_added_for_this_test = false;
-                if (isset($objQuestionTmp->category) && !empty($objQuestionTmp->category)) {
+                if (!empty($objQuestionTmp->category)) {
                     if (!isset($category_list[$objQuestionTmp->category]['score'])) {
                         $category_list[$objQuestionTmp->category]['score'] = 0;
                     }
@@ -5498,7 +5498,7 @@ public static function displayQuestionListByAttempt(
                     $category_list[$objQuestionTmp->category]['total_questions']++;
                     $category_was_added_for_this_test = true;
                 }
-                if (isset($objQuestionTmp->category_list) && !empty($objQuestionTmp->category_list)) {
+                if (!empty($objQuestionTmp->category_list)) {
                     foreach ($objQuestionTmp->category_list as $category_id) {
                         $category_list[$category_id]['score'] += $my_total_score;
                         $category_list[$category_id]['total'] += $my_total_weight;
@@ -5507,7 +5507,7 @@ public static function displayQuestionListByAttempt(
                 }
 
                 // No category for this question!
-                if ($category_was_added_for_this_test == false) {
+                if (!$category_was_added_for_this_test) {
                     if (!isset($category_list['none']['score'])) {
                         $category_list['none']['score'] = 0;
                     }