null checks were cluttering the code for a improbable use case related to PHP_NOTICES

Author: Billy Clark

themes/material/common-announcement.php

@@ -1,5 +1,5 @@
 <?php
-$announcement = htmlentities($this->data['announcement'] ?? null);
+$announcement = htmlentities($this->data['announcement']);
 
 if (! empty($announcement)) {
 ?>

themes/material/core/loginuserpass.php

@@ -6,7 +6,7 @@
     <?php include __DIR__ . '/../common-head-elements.php' ?>
 
     <?php
-    $siteKey = htmlentities($this->data['recaptcha.siteKey'] ?? null);
+    $siteKey = htmlentities($this->data['recaptcha.siteKey']);
     if (! empty($siteKey)) {
     ?>
     <script src='https://www.google.com/recaptcha/api.js?onload=onRecaptchaLoad&render=explicit'
@@ -40,9 +40,9 @@ function onRecaptchaLoad() {
 
         <form method="POST">
             <input type="hidden" name="AuthState"
-                   value="<?= htmlentities($this->data['stateparams']['AuthState']  ?? null) ?>" />
+                   value="<?= htmlentities($this->data['stateparams']['AuthState']) ?>" />
             <?php
-            $csrfToken = htmlentities($this->data['csrfToken'] ?? null);
+            $csrfToken = htmlentities($this->data['csrfToken']);
             ?>
             <input type="hidden" name="csrf-token" value="<?= $csrfToken ?>" />
 
@@ -67,7 +67,7 @@ function onRecaptchaLoad() {
                             <?= $this->t('{material:login:label_username}') ?>
                         </label>
                         <?php
-                        $username = htmlentities($this->data['username'] ?? null);
+                        $username = htmlentities($this->data['username']);
                         ?>
                         <input type="text" name="username" class="mdl-textfield__input"
                                value="<?= $username ?>"
@@ -87,7 +87,7 @@ function onRecaptchaLoad() {
                 $errorCode = htmlentities($this->data['errorcode']);
                 if ($errorCode == 'WRONGUSERPASS') {
                     $errorMessageKey = $this->data['errorparams'][1] ?? '{material:login:error_wronguserpass}';
-                    $errorMessageTokens = $this->data['errorparams'][2] ?? null;
+                    $errorMessageTokens = $this->data['errorparams'][2];
 
                     $message = htmlentities($this->t($errorMessageKey, $errorMessageTokens));
                 ?>
@@ -108,7 +108,7 @@ function onRecaptchaLoad() {
 
                 <div class="mdl-card__actions" layout-children="row">
                     <?php
-                    $forgotPasswordUrl = htmlentities($this->data['forgotPasswordUrl'] ?? null);
+                    $forgotPasswordUrl = htmlentities($this->data['forgotPasswordUrl']);
                     if (! empty($forgotPasswordUrl)) {
                     ?>
                     <a href="<?= $forgotPasswordUrl ?>" target="_blank"

themes/material/default/error.php

@@ -24,11 +24,11 @@
         if ($this->data['showerrors'] ?? false) {
         ?>
         <p class="mdl-typography--body-2">
-            <?= htmlentities($this->data['error']['exceptionMsg'] ?? null) ?>
+            <?= htmlentities($this->data['error']['exceptionMsg']) ?>
         </p>
 
         <pre class="mdl-typography--caption">
-            <?= htmlentities($this->data['error']['exceptionTrace'] ?? null) ?>
+            <?= htmlentities($this->data['error']['exceptionTrace']) ?>
         </pre>
         <?php
         }

themes/material/default/selectidp-links.php

@@ -36,14 +36,14 @@ function clickedAnyway(idpName) {
 
     <main class="mdl-layout__content">
         <?php include __DIR__ . '/../common-announcement.php' ?>
-
+<!--TODO: is this stuff in formdata by chance?-->
         <form layout-children="row" child-spacing="space-around">
             <input type="hidden" name="entityID"
-                   value="<?= htmlentities($this->data['entityID'] ?? null) ?>" />
+                   value="<?= htmlentities($this->data['entityID']) ?>" />
             <input type="hidden" name="return"
-                   value="<?= htmlentities($this->data['return'] ?? null) ?>" />
+                   value="<?= htmlentities($this->data['return']) ?>" />
             <input type="hidden" name="returnIDParam"
-                   value="<?= htmlentities($this->data['returnIDParam'] ?? null) ?>" />
+                   value="<?= htmlentities($this->data['returnIDParam']) ?>" />
 
             <?php
             // in order to bypass some built-in simplesaml behavior, an extra idp
@@ -58,8 +58,8 @@ function clickedAnyway(idpName) {
             }
 
             foreach ($enabledIdps as $idp) {
-                $name = htmlentities($this->t($idp['name'] ?? null));
-                $idpId = htmlentities($idp['entityid'] ?? null);
+                $name = htmlentities($this->t($idp['name']));
+                $idpId = htmlentities($idp['entityid']);
                 $hoverText = $this->t('{material:selectidp:enabled}', ['{idpName}' => $name]);
             ?>
             <div class="mdl-card mdl-shadow--8dp row-aware" title="<?= $hoverText ?>">
@@ -77,8 +77,8 @@ function clickedAnyway(idpName) {
 
             <?php
             foreach ($disabledIdps as $idp) {
-                $name = htmlentities($this->t($idp['name'] ?? null));
-                $idpId = htmlentities($idp['entityid'] ?? null);
+                $name = htmlentities($this->t($idp['name']));
+                $idpId = htmlentities($idp['entityid']);
                 $hoverText = $this->t('{material:selectidp:disabled}', ['{idpName}' => $name]);
             ?>
             <div class="mdl-card mdl-shadow--2dp disabled row-aware" title="<?= $hoverText ?>"

themes/material/expirychecker/about2expire.php

@@ -14,7 +14,6 @@
             </span>
         </div>
     </header>
-<!--TODO: do we need ?? null on these data[] retrievals as done in other pages? Test what happens when the key is altered to a nonexistent name -->
     <main class="mdl-layout__content" layout-children="column">
         <form layout-children="column">
             <?php

themes/material/expirychecker/expired.php

@@ -14,7 +14,6 @@
             </span>
         </div>
     </header>
-<!--TODO: do we need ?? null on these data[] retrievals as done in other pages? Test what happens when the key is altered to a nonexistent name -->
     <main class="mdl-layout__content" layout-children="column">
         <form layout-children="column">
             <?php