diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index cf4ff6e3b5c8558a4b87bb0e7696fe2b331c87eb..cf227a73719825181dd47298cae7342a80b23995 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -251,7 +251,6 @@ class Session implements \Serializable
         }
 
         // check if we have stored a session stored with the session handler
-        $session = null;
         try {
             $session = self::getSession();
         } catch (\Exception $e) {
diff --git a/modules/cas/lib/Auth/Source/CAS.php b/modules/cas/lib/Auth/Source/CAS.php
index e58f36f11c0ffaf0487b2d5615c0a48ffed1e2d7..7b7f9a3d1966b84f45376846c996a80c22bdb3e0 100644
--- a/modules/cas/lib/Auth/Source/CAS.php
+++ b/modules/cas/lib/Auth/Source/CAS.php
@@ -166,10 +166,8 @@ class CAS extends \SimpleSAML\Auth\Source
         {
             case 'validate':
                 return  $this->casValidate($ticket, $service);
-                break;
             case 'serviceValidate':
                 return $this->casServiceValidate($ticket, $service);
-                break;
             default:
                 throw new \Exception("validate or serviceValidate not specified");
         }
diff --git a/modules/core/lib/Auth/Process/AttributeRealm.php b/modules/core/lib/Auth/Process/AttributeRealm.php
index c32543d8b4b31a0c7295a566562b6b502d9c492e..9b16dcd0d0a89b7742c9ba2964062049b0927013 100644
--- a/modules/core/lib/Auth/Process/AttributeRealm.php
+++ b/modules/core/lib/Auth/Process/AttributeRealm.php
@@ -41,8 +41,6 @@ class AttributeRealm extends \SimpleSAML\Auth\ProcessingFilter
         assert(is_array($request));
         assert(array_key_exists('Attributes', $request));
 
-        $attributes =& $request['Attributes'];
-
         if (!array_key_exists('UserID', $request)) {
             throw new \Exception('core:AttributeRealm: Missing UserID for this user. Please' .
                 ' check the \'userid.attribute\' option in the metadata against the' .
diff --git a/modules/core/lib/Auth/Process/PHP.php b/modules/core/lib/Auth/Process/PHP.php
index 386a5991927cdd74d5a5776b89f3c7b51bdba85e..7a538ec1bb3e3964371d7f8d748354039fb97d54 100644
--- a/modules/core/lib/Auth/Process/PHP.php
+++ b/modules/core/lib/Auth/Process/PHP.php
@@ -49,7 +49,7 @@ class PHP extends \SimpleSAML\Auth\ProcessingFilter
         assert(is_array($request));
         assert(array_key_exists('Attributes', $request));
 
-        $function = function(&$attributes) { eval($this->code); };
+        $function = function(/** @scrutinizer ignore-unused */ &$attributes) { eval($this->code); };
         $function($request['Attributes']);
     }
 }
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 7aa3d617fae8564654c3437d96a8353ae72a3fd7..ec0132ac8d00c3c6a9f3c8e0d95de609f4242c8a 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -75,7 +75,7 @@ if ($config->getBoolean('enable.shib13-idp', false) === true) {
             $metaentries['remote']['shib13-sp-remote'] = $metadata->getList('shib13-sp-remote');
         }
     } catch (Exception $e) {
-        \SimpleSAML\Logger::error('Federation: Error loading shib13-idp: ' . $e->getMessage());
+        \SimpleSAML\Logger::error('Federation: Error loading shib13-idp: '.$e->getMessage());
     }
 }
 if ($config->getBoolean('enable.adfs-idp', false) === true) {
@@ -89,7 +89,7 @@ if ($config->getBoolean('enable.adfs-idp', false) === true) {
             $metaentries['remote']['adfs-sp-remote'] = $metadata->getList('adfs-sp-remote');
         }
     } catch (Exception $e) {
-        \SimpleSAML\Logger::error('Federation: Error loading adfs-idp: ' . $e->getMessage());
+        \SimpleSAML\Logger::error('Federation: Error loading adfs-idp: '.$e->getMessage());
     }
 }
 
diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index e44d7c24454100345387ab52b091544b5d149992..0a448d2de400032e34bdc07260dcaa95f24cd3ee 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -272,7 +272,6 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
         $idpList = $this->processMetadata($t, $idpList, $preferredIdP);
 
         $t->data['idplist'] = $idpList;
-        $faventry = null;
         foreach ($idpList as $tab => $slist) {
             if (!empty($preferredIdP) && array_key_exists($preferredIdP, $slist)) {
                 $t->data['faventry'] = $slist[$preferredIdP];