Scrutinizer fixes

Author: tvdijen

lib/PowerIdPDisco.php

@@ -2,6 +2,12 @@
 
 namespace SimpleSAML\Module\discopower;
 
+use SimpleSAML\Configuration;
+use SimpleSAML\Locale\Translate;
+use SimpleSAML\Logger;
+use SimpleSAML\Session;
+use SimpleSAML\Utils\HTTP;
+use SimpleSAML\XHTML\Template;
 use Webmozart\Assert\Assert;
 
 /**
@@ -52,7 +58,7 @@ public function __construct(array $metadataSets, $instance)
     {
         parent::__construct($metadataSets, $instance);
 
-        $this->discoconfig = \SimpleSAML\Configuration::getConfig('module_discopower.php');
+        $this->discoconfig = Configuration::getConfig('module_discopower.php');
 
         $this->cdcDomain = $this->discoconfig->getString('cdc.domain', null);
         if ($this->cdcDomain !== null && $this->cdcDomain[0] !== '.') {
@@ -74,7 +80,7 @@ public function __construct(array $metadataSets, $instance)
      */
     protected function log($message)
     {
-        \SimpleSAML\Logger::info('PowerIdPDisco.'.$this->instance.': '.$message);
+        Logger::info('PowerIdPDisco.'.$this->instance.': '.$message);
     }
 
 
@@ -137,7 +143,7 @@ protected function idplistStructured($list)
         }
 
         foreach ($slist as $tab => $tbslist) {
-            uasort($slist[$tab], ['\SimpleSAML\Module\discopower\PowerIdPDisco', 'mcmp']);
+            uasort($slist[$tab], [self::class, 'mcmp']);
         }
 
         return $slist;
@@ -249,7 +255,8 @@ public function handleRequest()
         $idpList = $this->idplistStructured($this->filterList($idpList));
         $preferredIdP = $this->getRecommendedIdP();
 
-        $t = new \SimpleSAML\XHTML\Template($this->config, 'discopower:disco.tpl.php', 'disco');
+        $t = new Template($this->config, 'discopower:disco.tpl.php', 'disco');
+        $translator = $t->getTranslator();
 
         $t->data['return'] = $this->returnURL;
         $t->data['returnIDParam'] = $this->returnIdParam;
@@ -271,22 +278,22 @@ public function handleRequest()
         }
 
         /* store the tab list in the session */
-        $session = \SimpleSAML\Session::getSessionFromRequest();
+        $session = Session::getSessionFromRequest();
         $session->setData('discopower:tabList', 'faventry', $this->data['faventry']);
         $session->setData('discopower:tabList', 'tabs', array_keys($idpList));
         $session->setData('discopower:tabList', 'defaulttab', $t->data['defaulttab']);
 
         $t->data['score'] = $this->discoconfig->getValue('score', 'quicksilver');
         $t->data['preferredidp'] = $preferredIdP;
-        $t->data['urlpattern'] = htmlspecialchars(\SimpleSAML\Utils\HTTP::getSelfURLNoQuery());
+        $t->data['urlpattern'] = htmlspecialchars(HTTP::getSelfURLNoQuery());
         $t->data['rememberenabled'] = $this->config->getBoolean('idpdisco.enableremember', false);
         $t->data['rememberchecked'] = $this->config->getBoolean('idpdisco.rememberchecked', false);
         $t->data['jquery'] = ['core' => true, 'ui' => true];
         foreach (array_keys($idpList) as $tab) {
-            if ($t->getTag('{discopower:tabs:'.$tab.'}') === null) {
-                $t->includeInlineTranslation('{discopower:tabs:'.$tab.'}', $tab);
+            if ($translator->getTag('{discopower:tabs:'.$tab.'}') === null) {
+                $translator->includeInlineTranslation('{discopower:tabs:'.$tab.'}', $tab);
             }
-            $t->data['tabNames'][$tab] = \SimpleSAML\Locale\Translate::noop('{discopower:tabs:'.$tab.'}');
+            $t->data['tabNames'][$tab] = $translator::noop('{discopower:tabs:'.$tab.'}');
         }
         $t->show();
     }
@@ -344,7 +351,7 @@ private function processMetadata($t, $metadata, $favourite)
                 }
                 $html .= $entity['translated'];
                 if (array_key_exists('icon', $entity) && $entity['icon'] !== null) {
-                    $iconUrl = \SimpleSAML\Utils\HTTP::resolveURL($entity['icon']);
+                    $iconUrl = HTTP::resolveURL($entity['icon']);
                     $html .= '<img alt="Icon for identity provider" class="entryicon" src="'.
                         htmlspecialchars($iconUrl).'" />';
                 }
@@ -429,7 +436,7 @@ protected function setPreviousIdP($idp)
             'secure'   => true,
             'httponly' => false,
         ];
-        \SimpleSAML\Utils\HTTP::setCookie('_saml_idp', $newCookie, $params, false);
+        HTTP::setCookie('_saml_idp', $newCookie, $params, false);
     }
 
 

www/assets/js/quicksilver.js

@@ -38,7 +38,7 @@
 String.prototype.score = function (abbreviation,offset) {
     offset = offset || 0 // TODO: I think this is unused... remove
 
-    if (abbreviation.length == 0) {
+    if (abbreviation.length === 0) {
         return 0.9
     }
     if (abbreviation.length > this.length) {
@@ -75,7 +75,7 @@ String.prototype.score = function (abbreviation,offset) {
                 var j = 0;
                 var c = this.charCodeAt(index - 1)
                 if ( c==32 || c == 9) {
-                    for (var j=(index-2); j >= 0; j--) {
+                    for (j=(index-2); j >= 0; j--) {
                         c = this.charCodeAt(j)
                         score -= ((c == 32 || c == 9) ? 1 : 0.15)
                     }

www/assets/js/suggest.js

@@ -16,8 +16,8 @@ String.prototype.score = function (abbreviation,offset) {
         }
     }
 
-    for (var i = 0; i < suggest_cache['len']; ++i) {
-        if (!(this.match(suggest_cache['re'][i]['initialword']) || this.match(suggest_cache['re'][i]['word']))) {
+    for (var j = 0; j < suggest_cache['len']; ++j) {
+        if (!(this.match(suggest_cache['re'][j]['initialword']) || this.match(suggest_cache['re'][j]['word']))) {
             return 0;
         }
     }

www/assets/js/tablist.js

@@ -5,7 +5,7 @@ $(document).ready(function() {
         for (var i = 0; i < data["tabs"].length; i++) {
             var tab = data["tabs"][i];
             $("#query_"+tab).liveUpdate("#list_"+tab);
-            if (data["faventry"] == null && i == 0) {
+            if (data["faventry"] === null && i === 0) {
                 $("#query_"+tab).focus();
             }
         }