style: ECS v11.1

melanger · melanger · commit 41db903bcc99 · 2022-08-20T09:07:28.000+02:00
diff --git a/composer.json b/composer.json
@@ -62,7 +62,7 @@
         "cesnet/simplesamlphp-module-authswitcher": "^10.6"
     },
     "require-dev": {
-        "symplify/easy-coding-standard": "^11.0"
+        "symplify/easy-coding-standard": "^11.1"
     },
     "suggest": {
         "cesnet/simplesamlphp-module-privacyidea": "included privacyIDEA template is for this module"
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Auth/Process/PerunEntitlement.php b/lib/Auth/Process/PerunEntitlement.php
@@ -147,7 +147,7 @@ protected function mapGroupName($request, $groupName)
     {
         if (
             isset($request['SPMetadata']['groupMapping'], $request['SPMetadata']['groupMapping'][$groupName])
-            ) {
+        ) {
             Logger::debug(
                 'Mapping ' . $groupName . ' to ' . $request['SPMetadata']['groupMapping'][$groupName] .
                 ' for SP ' . $this->entityId
diff --git a/templates/403-is-eligible-tpl.php b/templates/403-is-eligible-tpl.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use SimpleSAML\Configuration;
 use SimpleSAML\Module;
@@ -29,20 +31,19 @@
 <div class="row">
     <div>
         <p><?php echo $this->t($textKey); ?></p>
-        <?php if (!empty($restartUrl)): ?>
+<?php if (!empty($restartUrl)): ?>
         <p>
             <a class="btn btn-lg btn-block btn-primary" href="<?php echo $restartUrl ?>">
                 <?php echo $this->t($buttonKey); ?>
             </a>
         </p>
-        <?php endif ?>
-        <p><?php echo $this->t(
-    $contactKey
-); ?> <a href="mailto:<?php echo $supportAddress; ?>"><?php echo $supportAddress; ?></a></p>
+<?php endif ?>
+        <p><?php echo $this->t($contactKey); ?>
+        <a href="mailto:<?php echo $supportAddress; ?>"><?php echo $supportAddress; ?></a>
+        </p>
     </div>
 </div>
 
 
 <?php
-
 $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/choose-vo-and-group-tpl.php b/templates/choose-vo-and-group-tpl.php
@@ -84,19 +84,19 @@
                 foreach ($vos as $key => $vo) {
                     echo '<option  value="' . $key . '" >' . $vo->getName() . '</option>';
                 }
-                ?>
+?>
             </select>
 
             <h4 class="selectGroup"
                 style="display: none"><?php echo $this->t('{perun:perun:choose-vo-and-group-tpl_select-group}'); ?></h4>
             <select class="selectGroup form-control" name="selectedGroup" class="form-control" style="display: none"
                     required>
                 <?php
-                foreach ($groups as $group) {
-                    echo '<option class="groupOption" value="' . $group->getUniqueName() . '" >' .
-                        $group->getDescription() . '</option>';
-                }
-                ?>
+foreach ($groups as $group) {
+    echo '<option class="groupOption" value="' . $group->getUniqueName() . '" >' .
+        $group->getDescription() . '</option>';
+}
+?>
             </select>
 
             <input type="submit" value="<?php echo $this->t('{perun:perun:choose-vo-and-group-tpl_continue}'); ?>"
diff --git a/templates/force-aup-tpl.php b/templates/force-aup-tpl.php
@@ -29,7 +29,7 @@
                 $aup->link . '">' . $this->t('{perun:perun:here}') . '</a></p>';
             echo '</div>';
         }
-        ?>
+?>
 
         <input type="hidden" name="StateId" value="<?php echo $_REQUEST['StateId']; ?>">
 
diff --git a/templates/listOfSps-tpl.php b/templates/listOfSps-tpl.php
@@ -122,7 +122,7 @@
                                 echo '<th>' . $displayName . '</th>';
                             }
                         }
-                        ?>
+?>
                     </tr>
                     </thead>
                     <tbody>
@@ -158,7 +158,7 @@
                         }
                     }
                     echo '</tr>';
-                    ?>
+?>
                     </tbody>
                 </table>
             </div>
diff --git a/templates/sp-authorization-403-tpl.php b/templates/sp-authorization-403-tpl.php
@@ -21,11 +21,11 @@
     <p>
         <?php
         echo $this->t('{perun:perun:sp_authorize_403_text}') . '<b>' . $serviceName . '</b>.';
-        if (!empty($informationUrl)) {
-            echo ' (' . $this->t('{perun:perun:sp_authorize_403_information_page}') .
-                '<a target="_blank" href="' . $informationUrl . '">'
-                . $this->t('{perun:perun:sp_authorize_403_information_page_link_text}') . '</a>.)';
-        } ?>
+if (!empty($informationUrl)) {
+    echo ' (' . $this->t('{perun:perun:sp_authorize_403_information_page}') .
+        '<a target="_blank" href="' . $informationUrl . '">'
+        . $this->t('{perun:perun:sp_authorize_403_information_page_link_text}') . '</a>.)';
+} ?>
     </p>
     <p>
         <?php echo $this->t('{perun:perun:sp_authorize_403_contact_support}'); ?>
diff --git a/templates/sp-authorization-notify-tpl.php b/templates/sp-authorization-notify-tpl.php
@@ -18,13 +18,13 @@
     <p>
         <?php
         echo $this->t('{perun:perun:sp_authorize_notify_text}') . '<b>' . $serviceName . '</b>.';
-        if (!empty($informationUrl)) {
-            echo ' (' . $this->t('{perun:perun:sp_authorize_notify_information_page}') .
-                '<a target="_blank" href="' . $informationUrl . '">'
-                . $this->t('{perun:perun:sp_authorize_notify_information_page_link_text}') . '</a>). ';
-        }
-        echo $this->t('{perun:perun:sp_authorize_notify_text2}');
-        ?>
+if (!empty($informationUrl)) {
+    echo ' (' . $this->t('{perun:perun:sp_authorize_notify_information_page}') .
+        '<a target="_blank" href="' . $informationUrl . '">'
+        . $this->t('{perun:perun:sp_authorize_notify_information_page_link_text}') . '</a>). ';
+}
+echo $this->t('{perun:perun:sp_authorize_notify_text2}');
+?>
     </p>
     <div>
         <a href="<?php echo htmlspecialchars($redirectUrl); ?>" class="btn btn-lg btn-primary btn-block">
diff --git a/templates/sp-authorization-select-tpl.php b/templates/sp-authorization-select-tpl.php
@@ -62,7 +62,7 @@
                         . $group->getDescription()
                         . '</option>';
                 }
-                ?>
+?>
             </select>
             <input type="submit" value="<?php echo $this->t('{perun:perun:choose-vo-and-group-tpl_continue}'); ?>"
                    class="btn btn-lg btn-primary btn-block mt-4">
diff --git a/templates/warning-test-sp-tpl.php b/templates/warning-test-sp-tpl.php
@@ -29,7 +29,7 @@
         if ($customTextEnabled) {
             echo '<div>' . $this->t(WarningTestSP::CUSTOM_TEXT_KEY) . '</div>' . PHP_EOL;
         }
-        ?>
+?>
         <br/>
         <div class="form-group">
             <input type="submit" value="<?php echo $this->t('{perun:perun:continue}'); ?>"
diff --git a/themes/perun/consent/consentform.php b/themes/perun/consent/consentform.php
@@ -110,7 +110,7 @@
                 . '<label for="saveconsent">' . $this->t('{perun:consent:remember}') . '</label>
             </div>';
             }
-            ?>
+?>
         </div>
     </div>
 
@@ -119,12 +119,12 @@
 
             <form action="<?php echo htmlspecialchars($this->data['yesTarget']); ?>" id="yesform">
                 <?php
-                // Embed hidden fields...
-                foreach ($this->data['yesData'] as $name => $value) {
-                    echo '<input type="hidden" name="' . htmlspecialchars($name) .
-                        '" value="' . htmlspecialchars($value) . '" />';
-                }
-                ?>
+    // Embed hidden fields...
+    foreach ($this->data['yesData'] as $name => $value) {
+        echo '<input type="hidden" name="' . htmlspecialchars($name) .
+            '" value="' . htmlspecialchars($value) . '" />';
+    }
+?>
 
                 <button type="submit" name="yes" class="btn btn-lg btn-primary btn-success btn-block" id="yesbutton">
                     <span><?php echo htmlspecialchars($this->t('{consent:consent:yes}')); ?></span>
@@ -138,11 +138,11 @@
             <form action="<?php echo htmlspecialchars($this->data['noTarget']); ?>">
 
                 <?php
-                foreach ($this->data['noData'] as $name => $value) {
-                    echo '<input type="hidden" name="' . htmlspecialchars($name) .
-                        '" value="' . htmlspecialchars($value) . '" />';
-                }
-                ?>
+foreach ($this->data['noData'] as $name => $value) {
+    echo '<input type="hidden" name="' . htmlspecialchars($name) .
+        '" value="' . htmlspecialchars($value) . '" />';
+}
+?>
                 <button type="submit" class="btn btn-lg btn-default btn-block  btn-no" name="no" id="nobutton">
                     <span><?php echo htmlspecialchars($this->t('{consent:consent:no}')); ?></span>
                 </button>
diff --git a/themes/perun/core/loginuserpass.php b/themes/perun/core/loginuserpass.php
@@ -17,18 +17,18 @@
               style="float:left; font-size: 38px; margin-right: 10px;"></span>
 
         <strong>
-            <?php
-            echo htmlspecialchars($this->t(
+<?php
+echo htmlspecialchars($this->t(
         '{errors:title_' . $this->data['errorcode'] . '}',
         $this->data['errorparams']
     )); ?>
         </strong>
 
-        <?php
-        echo htmlspecialchars($this->t(
-        '{errors:descr_' . $this->data['errorcode'] . '}',
-        $this->data['errorparams']
-    )); ?>
+<?php
+echo htmlspecialchars($this->t(
+    '{errors:descr_' . $this->data['errorcode'] . '}',
+    $this->data['errorparams']
+)); ?>
     </div>
 
     <?php
@@ -50,7 +50,7 @@
                     if (!$this->data['forceUsername']) {
                         echo 'tabindex="1"';
                     }
-                    ?> value="<?php echo htmlspecialchars($this->data['username']); ?>"/>
+?> value="<?php echo htmlspecialchars($this->data['username']); ?>"/>
             </div>
         </div>
 
@@ -78,11 +78,11 @@
             </div>
             <?php
         }
-        ?>
+?>
 
         <?php
-        if ($this->data['rememberMeEnabled']) {
-            // display the remember me checkbox (keep me logged in)?>
+if ($this->data['rememberMeEnabled']) {
+    // display the remember me checkbox (keep me logged in)?>
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-10">
                     <div class="checkbox">
@@ -96,45 +96,45 @@
                 </div>
             </div>
             <?php
-        }
-        ?>
+}
+?>
 
         <?php
-        if (array_key_exists('organizations', $this->data)) {
-            ?>
+if (array_key_exists('organizations', $this->data)) {
+    ?>
             <div class="form-group">
                 <label for="organization"
                        class="col-sm-2 control-label"><?php echo $this->t('{login:organization}'); ?></label>
                 <div class="col-sm-10">
                     <select name="organization" tabindex="3" class="form-control">
                         <?php
-                        if (array_key_exists('selectedOrg', $this->data)) {
-                            $selectedOrg = $this->data['selectedOrg'];
-                        } else {
-                            $selectedOrg = null;
-                        }
-
-            foreach ($this->data['organizations'] as $orgId => $orgDesc) {
-                if (is_array($orgDesc)) {
-                    $orgDesc = $this->t($orgDesc);
-                }
-
-                if ($orgId === $selectedOrg) {
-                    $selected = 'selected="selected" ';
+                if (array_key_exists('selectedOrg', $this->data)) {
+                    $selectedOrg = $this->data['selectedOrg'];
                 } else {
-                    $selected = '';
+                    $selectedOrg = null;
                 }
 
-                echo '<option ' .
-                                $selected . 'value="' . htmlspecialchars($orgId) . '">' . htmlspecialchars($orgDesc) .
-                                '</option>';
-            } ?>
+    foreach ($this->data['organizations'] as $orgId => $orgDesc) {
+        if (is_array($orgDesc)) {
+            $orgDesc = $this->t($orgDesc);
+        }
+
+        if ($orgId === $selectedOrg) {
+            $selected = 'selected="selected" ';
+        } else {
+            $selected = '';
+        }
+
+        echo '<option ' .
+                        $selected . 'value="' . htmlspecialchars($orgId) . '">' . htmlspecialchars($orgDesc) .
+                        '</option>';
+    } ?>
                     </select>
                 </div>
             </div>
             <?php
-        }
-        ?>
+}
+?>
 
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
@@ -147,12 +147,12 @@ class="col-sm-2 control-label"><?php echo $this->t('{login:organization}'); ?></
         </div>
 
         <?php
-        foreach ($this->data['stateparams'] as $name => $value) {
-            echo '<input type="hidden" name="' . htmlspecialchars($name) .
-                '" value="' . htmlspecialchars($value) . '" />'
-            ;
-        }
-        ?>
+foreach ($this->data['stateparams'] as $name => $value) {
+    echo '<input type="hidden" name="' . htmlspecialchars($name) .
+        '" value="' . htmlspecialchars($value) . '" />'
+    ;
+}
+?>
     </form>
 
 <?php
diff --git a/themes/perun/default/error.php b/themes/perun/default/error.php
@@ -21,7 +21,7 @@
     <p>
         <?php
         echo htmlspecialchars($this->t($this->data['dictDescr'], $this->data['parameters']));
-        ?>
+?>
         <a href="#moreInfo" data-toggle="collapse"><?php echo $this->t('{perun:error:more}'); ?><span
                 class="caret"></span></a>
     </p>
@@ -39,8 +39,8 @@ class="caret"></span></a>
         <p id="trackid" class="input-left">
             <?php
             echo $this->t('{perun:error:error_number}');
-            echo $this->data['error']['trackId'];
-            ?>
+echo $this->data['error']['trackId'];
+?>
         </p>
         <?php
         // print out exception only if the exception is available
@@ -52,7 +52,7 @@ class="caret"></span></a>
             </pre>
             <?php
         }
-        ?>
+?>
     </div>
 
 <?php
diff --git a/themes/perun/default/post.php b/themes/perun/default/post.php
@@ -41,7 +41,7 @@
     foreach ($post as $name => $value) {
         Post::printItem($name, $value);
     }
-    ?>
+            ?>
 
     <noscript>
         <button type="submit" class="btn"><?php echo $this->t('{perun:perun:continue}'); ?></button>
diff --git a/themes/perun/privacyidea/LoginForm.php b/themes/perun/privacyidea/LoginForm.php

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ protected function mapGroupName($request, $groupName)`
`147`	`147`	`{`
`148`	`148`	`if (`
`149`	`149`	`isset($request['SPMetadata']['groupMapping'], $request['SPMetadata']['groupMapping'][$groupName])`
`150`		`- ) {`
	`150`	`+ ) {`
`151`	`151`	`Logger::debug(`
`152`	`152`	`'Mapping ' . $groupName . ' to ' . $request['SPMetadata']['groupMapping'][$groupName] .`
`153`	`153`	`' for SP ' . $this->entityId`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`$aup->link . '">' . $this->t('{perun:perun:here}') . '</a></p>';`
`30`	`30`	`echo '</div>';`
`31`	`31`	`}`
`32`		`- ?>`
	`32`	`+?>`
`33`	`33`
`34`	`34`	`<input type="hidden" name="StateId" value="<?php echo $_REQUEST['StateId']; ?>">`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@`
`122`	`122`	`echo '<th>' . $displayName . '</th>';`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`- ?>`
	`125`	`+?>`
`126`	`126`	`</tr>`
`127`	`127`	`</thead>`
`128`	`128`	`<tbody>`
`@@ -158,7 +158,7 @@`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`	`echo '</tr>';`
`161`		`- ?>`
	`161`	`+?>`
`162`	`162`	`</tbody>`
`163`	`163`	`</table>`
`164`	`164`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`. $group->getDescription()`
`63`	`63`	`. '</option>';`
`64`	`64`	`}`
`65`		`- ?>`
	`65`	`+?>`
`66`	`66`	`</select>`
`67`	`67`	`<input type="submit" value="<?php echo $this->t('{perun:perun:choose-vo-and-group-tpl_continue}'); ?>"`
`68`	`68`	`class="btn btn-lg btn-primary btn-block mt-4">`