chore: merge branch 'fix_psr' into 'main'

style:  fix PSR complains

See merge request perun-proxy-aai/simplesamlphp/simplesamlphp-module-perunauthorize!17

lib/Auth/Process/Perunauthorize.php

@@ -19,15 +19,14 @@ use SimpleSAML\Locale\Translate;
  */
 class Perunauthorize extends ProcessingFilter
 {
-
-    const DENY = 'deny';
-    const REGEX = 'regex';
-    const SERVICE_NAME_PLACEHOLDER = '%SERVICE_NAME%';
-    const SERVICE_EMAIL_PLACEHOLDER = '%SERVICE_EMAIL%';
-    const SP_METADATA = 'SPMetadata';
-    const ADMINISTRATION_CONTACT = 'administrationContact';
-    const MESSAGE = 'message';
-    const NAME = 'name';
+    public const DENY = 'deny';
+    public const REGEX = 'regex';
+    public const SERVICE_NAME_PLACEHOLDER = '%SERVICE_NAME%';
+    public const SERVICE_EMAIL_PLACEHOLDER = '%SERVICE_EMAIL%';
+    public const SP_METADATA = 'SPMetadata';
+    public const ADMINISTRATION_CONTACT = 'administrationContact';
+    public const MESSAGE = 'message';
+    public const NAME = 'name';
 
     /**
      * Flag to deny/unauthorize the user a attribute filter IS found

lib/TemplateHelper.php

+<?php
+
+namespace lib;
+
+class TemplateHelper
+{
+    public function getBaseURL($t, $type = 'get', $key = null, $value = null): string
+    {
+        if (isset($t->data['informationURL'])) {
+            $vars = [
+                'informationURL' => $t->data['informationURL'],
+                'administrationContact' => $t->data['administrationContact'],
+                'serviceName' => $t->data['serviceName'],
+            ];
+        } else {
+            $vars = [
+                'administrationContact' => $t->data['administrationContact'],
+                'serviceName' => $t->data['serviceName'],
+            ];
+        }
+
+        if (isset($key)) {
+            if (isset($vars[$key])) {
+                unset($vars[$key]);
+            }
+            if (isset($value)) {
+                $vars[$key] = $value;
+            }
+        }
+
+        if ($type === 'get') {
+            return 'perunauthorize_403.php?' . http_build_query($vars, '', '&amp;');
+        }
+
+        $text = '';
+        foreach ($vars as $k => $v) {
+            $text .= '<input type="hidden" name="' . $k . '" value="' . htmlspecialchars($v) . '" />' . PHP_EOL;
+        }
+        return $text;
+    }
+}

templates/perunauthorize_403.php

-<script>
-    // When the user clicks on <div>, open the popup
-    function myFunction() {
-        var popup = document.getElementById('myPopup');
-        popup.classList.toggle('show');
-    }
-</script>
-
 <?php
 
 /**
@@ -25,45 +17,18 @@ $this->data['403_subject'] = $this->t('{perunauthorize:Perunauthorize:403_subjec
 $this->data['403_informationPage'] = $this->t('{perunauthorize:Perunauthorize:403_informationPage}');
 $this->data['403_contactSupport'] = $this->t('{perunauthorize:Perunauthorize:403_contactSupport}');
 
-function getBaseURL($t, $type = 'get', $key = null, $value = null)
-{
-    if (isset($t->data['informationURL'])) {
-        $vars = [
-            'informationURL' => $t->data['informationURL'],
-            'administrationContact' => $t->data['administrationContact'],
-            'serviceName' => $t->data['serviceName'],
-        ];
-    } else {
-        $vars = [
-            'administrationContact' => $t->data['administrationContact'],
-            'serviceName' => $t->data['serviceName'],
-        ];
-    }
-
-    if (isset($key)) {
-        if (isset($vars[$key])) {
-            unset($vars[$key]);
-        }
-        if (isset($value)) {
-            $vars[$key] = $value;
-        }
-    }
-
-    if ($type === 'get') {
-        return 'perunauthorize_403.php?' . http_build_query($vars, '', '&amp;');
-    }
-
-    $text = '';
-    foreach ($vars as $k => $v) {
-        $text .= '<input type="hidden" name="' . $k . '" value="' . htmlspecialchars($v) . '" />' . PHP_EOL;
-    }
-    return $text;
-}
-
 $this->includeAtTemplateBase('includes/header.php');
 
 ?>
 
+<script>
+  // When the user clicks on <div>, open the popup
+  function myFunction() {
+    var popup = document.getElementById('myPopup');
+    popup.classList.toggle('show');
+  }
+</script>
+
 <style>
     .error_message {
         word-wrap: break-word;

www/perunauthorize_403.php

 <?php
 
-use SimpleSAML\Error\BadRequest;
-use SimpleSAML\Auth\State;
-use SimpleSAML\Configuration;
-use SimpleSAML\XHTML\Template;
-
 /**
  * Show a 403 Forbidden page about not authorized to access an application.
  *
  * @package SimpleSAMLphp
  */
 
+use SimpleSAML\Error\BadRequest;
+use SimpleSAML\Auth\State;
+use SimpleSAML\Configuration;
+use SimpleSAML\XHTML\Template;
+
 if (!array_key_exists('StateId', $_REQUEST)) {
     throw new BadRequest('Missing required StateId query parameter.');
 }
@@ -20,12 +20,12 @@ $state = State::loadState($_REQUEST['StateId'], 'perunauthorize:Perunauthorize')
 $globalConfig = Configuration::getInstance();
 $t = new Template($globalConfig, 'perunauthorize:perunauthorize_403.php');
 
-header('HTTP/1.0 403 Forbidden');
-
 if (isset($_REQUEST['informationURL'])) {
     $t->data['informationURL'] = $_REQUEST['informationURL'];
 }
 
+header('HTTP/1.0 403 Forbidden');
+
 $t->data['administrationContact'] = $_REQUEST['administrationContact'];
 $t->data['serviceName'] = $_REQUEST['serviceName'];
 $t->show();

www/perunauthorize_403_custom.php

 <?php
 
-use SimpleSAML\Error\BadRequest;
-use SimpleSAML\Auth\State;
-use SimpleSAML\Configuration;
-use SimpleSAML\XHTML\Template;
-
 /**
  * Show a 403 Forbidden page about not authorized to access an application.
  *
  * @package SimpleSAMLphp
  */
 
+use SimpleSAML\Error\BadRequest;
+use SimpleSAML\Auth\State;
+use SimpleSAML\Configuration;
+use SimpleSAML\XHTML\Template;
+
 if (!array_key_exists('StateId', $_REQUEST)) {
     throw new BadRequest('Missing required StateId query parameter.');
 }