Correct parameter types

catalyst · Jan 15, 2024 · d6f6ef5 · d6f6ef5
1 parent d415cce
commit d6f6ef5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/stack/cas/cassession2.class.php b/stack/cas/cassession2.class.php
@@ -207,6 +207,9 @@ public function get_by_key(string $key) {
      */
     public function get_errors($implode = true, $withcontext = true) {
         $errors = array();
+        if (is_null($this->timeouterrmessage)) {
+            $this->timeouterrmessage = '';
+        }
         $this->timeouterrmessage = trim($this->timeouterrmessage);
 
         foreach ($this->statements as $num => $statement) {
@@ -565,9 +568,12 @@ public function get_keyval_representation($evaluatedvalues = false): string {
     }
 
     public function get_debuginfo() {
-        if (trim($this->timeouterrmessage) !== '') {
-            return $this->timeouterrmessage;
+        $info = $this->timeouterrmessage;
+
+        if (!$info || trim($info) == '') {
+            return '';
         }
-        return '';
+
+        return $info;
     }
 }
diff --git a/stack/cas/parsingrules/801_singleton_numeric.filter.php b/stack/cas/parsingrules/801_singleton_numeric.filter.php
@@ -224,7 +224,7 @@ public function filter(MP_Node $ast, array &$errors, array &$answernotes, stack_
         // then we should have the $m and $p and even $sgn if needed.
         // If conversion toward floats is needed we can do that
         // and we can check the bad form 1e23*10^45.
-        if (stripos($m, 'e') !== false || !$this->power) {
+        if ($m && (stripos($m, 'e') !== false || !$this->power)) {
             // Could have a separate error.
             $node->position['invalid'] = true;
             $answernotes[] = 'Illegal_power';

diff --git a/stack/input/dropdown/dropdown.class.php b/stack/input/dropdown/dropdown.class.php
@@ -69,7 +69,7 @@ class stack_dropdown_input extends stack_input {
 
     protected function internal_contruct() {
         $options = $this->get_parameter('options');
-        if (trim($options) != '') {
+        if ($options && trim($options) != '') {
             $options = explode(',', $options);
             foreach ($options as $option) {
                 $option = strtolower(trim($option));

diff --git a/stack/input/inputbase.class.php b/stack/input/inputbase.class.php
@@ -171,7 +171,7 @@ public function __construct($name, $teacheranswer, $options = null, $parameters
      */
     protected function internal_contruct() {
         $options = $this->get_parameter('options');
-        if (trim($options) != '') {
+        if ($options && trim($options) != '') {
             $options = explode(',', $options);
             foreach ($options as $option) {
                 $option = strtolower(trim($option));
@@ -695,7 +695,7 @@ public function validate_student_response($response, $options, $teacheranswer, s
             $ta = '0';
             $trivialta = true;
             if (array_key_exists($index, $tvalidator)) {
-                if (!('' == trim($tvalidator[$index]))) {
+                if ($tvalidator[$index] && '' != trim($tvalidator[$index])) {
                     $ta = $tvalidator[$index];
                     $trivialta = false;
                 }

diff --git a/stack/mathsoutput/mathsoutputbase.class.php b/stack/mathsoutput/mathsoutputbase.class.php
@@ -81,6 +81,10 @@ function ($match) {
      * @return string the content ready to pass to format_text.
      */
     public function process_display_castext($text, $replacedollars, qtype_stack_renderer $renderer = null) {
+        if (!$text) {
+            return '';
+        }
+
         if ($replacedollars) {
             $text = $this->replace_dollars($text);
         }