Remove parentheses from "echo" calls

Author: nikosev

themes/ssp/consent/logout_completed.php

@@ -4,7 +4,7 @@
 $this->data['jquery'] = ['core' => true];
 $this->includeAtTemplateBase('includes/header.php');
 
-echo ('<h2>' . $this->data['header'] . '</h2>');
-echo ('<p>' . $this->t('{logout:logged_out_text}') . '</p>');
+echo '<h2>' . $this->data['header'] . '</h2>';
+echo '<p>' . $this->t('{logout:logged_out_text}') . '</p>';
 
 $this->includeAtTemplateBase('includes/footer.php');

themes/ssp/consent/noconsent.php

@@ -4,31 +4,37 @@
 $this->data['jquery'] = ['core' => true];
 
 $this->includeAtTemplateBase('includes/header.php');
+?>
 
-echo '<h3>' . $this->data['header'] . '</h3>';
-echo '<p>' . $this->data['noconsent_text'] . '</p>';
+<h3><?= $this->data['header'] ?></h3>
+<p><?= $this->data['noconsent_text'] ?></p>
 
-echo '<div class="ssp-btns-container">';
-if ($this->data['resumeFrom']) {
-    echo (
-        '<a href="' . htmlspecialchars($this->data['resumeFrom'])
-        . '" class="ssp-btn btn ssp-btn__action ssp-btns-container--btn__left text-uppercase">'
-        . $this->t('{consent:consent:noconsent_return}')
-        . '</a>'
-    );
-}
+<div class="ssp-btns-container">
+    <?php if ($this->data['resumeFrom']) : ?>
+    <a
+        href="<?= htmlspecialchars($this->data['resumeFrom']) ?>"
+        class="ssp-btn btn ssp-btn__action ssp-btns-container--btn__left text-uppercase"
+    >
+        <?= $this->t('{consent:consent:noconsent_return}') ?>
+    </a>
+    <?php endif;
 
-if ($this->data['aboutService']) {
-    echo ('<a href="' . htmlspecialchars($this->data['aboutService']) . '" class="ssp-btn btn text-uppercase">');
-    echo ($this->t('{consent:consent:noconsent_goto_about}'));
-    echo ('</a>');
-}
+    if ($this->data['aboutService']) : ?>
+    <a
+        href="<?= htmlspecialchars($this->data['aboutService']) ?>"
+        class="ssp-btn btn text-uppercase"
+    >
+        <?= $this->t('{consent:consent:noconsent_goto_about}') ?>
+    </a>
+    <?php endif; ?>
 
-echo (
-    '<a href="' . htmlspecialchars($this->data['logoutLink'])
-    . '" class="ssp-btn btn ssp-btn__warning text-uppercase ssp-btns-container--btn__right">'
-    . $this->data['noconsent_abort'] . '</a>'
-);
-echo '</div>'; //ssp-btns-container
+    <a
+        href="<?= htmlspecialchars($this->data['logoutLink']) ?>"
+        class="ssp-btn btn ssp-btn__warning text-uppercase ssp-btns-container--btn__right"
+    >
+        <?= $this->data['noconsent_abort'] ?>
+    </a>
+</div> <!-- ssp-btns-container -->
 
+<?php
 $this->includeAtTemplateBase('includes/footer.php');

themes/ssp/default/includes/header.php

@@ -57,7 +57,7 @@
             echo $this->t('{themevanilla:default:browser_tab_title}');
         }
         if (array_key_exists('header', $this->data)) {
-            echo (' | ' . $this->data['header']);
+            echo ' | ' . $this->data['header'];
         }
         ?>
     </title>
@@ -83,22 +83,16 @@
 
         if ($version == '1.8') {
             if (isset($jquery['core']) && $jquery['core']) {
-                echo (
-                    '<script type="text/javascript" src="/' . $this->data['baseurlpath']
-                    . 'resources/jquery-1.8.js"></script>' . "\n"
-                );
+                echo '<script type="text/javascript" src="/' . $this->data['baseurlpath']
+                . 'resources/jquery-1.8.js"></script>' . "\n";
             }
             if (isset($jquery['ui']) && $jquery['ui']) {
-                echo (
-                    '<script type="text/javascript" src="/' . $this->data['baseurlpath']
-                    . 'resources/jquery-ui-1.8.js"></script>' . "\n"
-                );
+                echo '<script type="text/javascript" src="/' . $this->data['baseurlpath']
+                . 'resources/jquery-ui-1.8.js"></script>' . "\n";
             }
             if (isset($jquery['css']) && $jquery['css']) {
-                echo (
-                    '<link rel="stylesheet" media="screen" type="text/css" href="/' . $this->data['baseurlpath'] .
-                    'resources/uitheme1.8/jquery-ui.css" />' . "\n"
-                );
+                echo '<link rel="stylesheet" media="screen" type="text/css" href="/' . $this->data['baseurlpath'] .
+                'resources/uitheme1.8/jquery-ui.css" />' . "\n";
             }
         }
     }

themes/ssp/discopower/disco.tpl.php

@@ -244,7 +244,7 @@ class="form-control" aria-describedby="search institutions" placeholder="Search.
                     $listItems .= (showEntry($this, $idpEntry));
                 }
             }
-            echo ($top . $search . $listOpen . $listItems . $close);
+            echo $top . $search . $listOpen . $listItems . $close;
         } elseif ($tab == "idps_with_logos") {
             $idpsWithLogosIndex = array_search($tab, array_keys($this->data['idplist']));
             $top = '<div class="row ssp-content-group"><div class="col-sm-12">';