Fix for lint & tests

aces · Dec 3, 2024 · 6217797 · 6217797
1 parent 6fa5e09
commit 6217797
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/php/libraries/NDB_Page.class.inc b/php/libraries/NDB_Page.class.inc
@@ -98,7 +98,7 @@ class NDB_Page extends \LORIS\Http\Endpoint implements RequestHandlerInterface
      * The default dateOptions to send to LorisForm to render elements
      * on this page. This is usually set by subclasses of NDB_Page which
      * need to modify the options to show on a date (ie. min year, max year,
-     * etc.). Default values can be added here, which can be overriden.g
+     * etc.). Default values can be added here, which can be overriden.
      *
      * @var array
      */
@@ -311,13 +311,13 @@ class NDB_Page extends \LORIS\Http\Endpoint implements RequestHandlerInterface
     function addBasicDate(
         $field,
         $label,
-        $options=[],
+        $options,
         $attribs=[
             'class' => 'form-control input-sm',
             'style' => 'max-width:33%; display:inline-block;',
         ]
     ) {
-        $options = $options + $this->dateOptions;
+        $options = ($options ?? []) + $this->dateOptions;
         $this->form->addElement('date', $field, $label, $options, $attribs);
     }
 
@@ -592,7 +592,7 @@ class NDB_Page extends \LORIS\Http\Endpoint implements RequestHandlerInterface
     function createDate(
         $field,
         $label,
-        $dateOptions=[],
+        $dateOptions,
         $attribs=[
             'class' => 'form-control input-sm',
             'style' => 'max-width:33%; display:inline-block;',
@@ -602,7 +602,7 @@ class NDB_Page extends \LORIS\Http\Endpoint implements RequestHandlerInterface
             "date",
             $field,
             $label,
-            $dateOptions + $this->dateOptions,
+            ($dateOptions ?? []) + $this->dateOptions,
             $attribs
         );
     }

diff --git a/test/unittests/NDB_PageTest.php b/test/unittests/NDB_PageTest.php
@@ -243,7 +243,7 @@ public function testAddBasicTextArea()
     /**
      * Test that addBasicDate calls addElement from LorisForm and properly adds
      * an element to the page's form when dateOptions is not set. Since
-     * dateOptions is not set, the options array should just have the default maxYear.
+     * dateOptions is not set, the options array should have the default maxYear.
      *
      * @covers NDB_Page::addBasicDate
      * @return void