From 1465433f36d34cf8fa8aebd4ce5ce6d95f10f697 Mon Sep 17 00:00:00 2001
From: Arno van der Vegt <arnovandervegt@startmail.com>
Date: Wed, 17 Oct 2018 08:38:41 +0200
Subject: [PATCH] Removed unused variables (#960)

---
 tests/lib/SimpleSAML/DatabaseTest.php         |  2 +-
 tests/lib/SimpleSAML/Utils/CryptoTest.php     |  1 -
 tests/lib/SimpleSAML/Utils/SystemTest.php     |  2 +-
 tests/lib/SimpleSAML/Utils/XMLTest.php        |  2 +-
 .../lib/Auth/Process/AttributeAddTest.php     |  4 +--
 .../lib/Auth/Process/AttributeAlterTest.php   | 36 ++++---------------
 .../lib/Auth/Process/AttributeCopyTest.php    |  4 +--
 .../lib/Auth/Process/AttributeLimitTest.php   |  6 ++--
 .../lib/Auth/Process/AttributeRealmTest.php   |  2 +-
 .../core/lib/Auth/Process/TargetedIDTest.php  |  8 ++---
 10 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/tests/lib/SimpleSAML/DatabaseTest.php b/tests/lib/SimpleSAML/DatabaseTest.php
index b99575b66..d15498221 100644
--- a/tests/lib/SimpleSAML/DatabaseTest.php
+++ b/tests/lib/SimpleSAML/DatabaseTest.php
@@ -92,7 +92,7 @@ class DatabaseTest extends TestCase
         );
 
         $this->config = new \SimpleSAML\Configuration($config, "test/SimpleSAML/DatabaseTest.php");
-        $db = SimpleSAML\Database::getInstance($this->config);
+        SimpleSAML\Database::getInstance($this->config);
     }
 
 
diff --git a/tests/lib/SimpleSAML/Utils/CryptoTest.php b/tests/lib/SimpleSAML/Utils/CryptoTest.php
index b5a0b500a..0ef6513e3 100644
--- a/tests/lib/SimpleSAML/Utils/CryptoTest.php
+++ b/tests/lib/SimpleSAML/Utils/CryptoTest.php
@@ -243,7 +243,6 @@ PHP;
      */
     public function testBadHashAlgorithmValid()
     {
-        $pw = "password";
         $algorithm = "wtf";
         $hash = "{".$algorithm."}B64STRING";
 
diff --git a/tests/lib/SimpleSAML/Utils/SystemTest.php b/tests/lib/SimpleSAML/Utils/SystemTest.php
index 07424e359..e177a31a2 100644
--- a/tests/lib/SimpleSAML/Utils/SystemTest.php
+++ b/tests/lib/SimpleSAML/Utils/SystemTest.php
@@ -226,7 +226,7 @@ class SystemTest extends TestCase
         chown($tempdir, $bad_uid);
 
         $this->setExpectedException('\SimpleSAML\Error\Exception');
-        $res = System::getTempDir();
+        System::getTempDir();
 
         $this->clearInstance($config, '\SimpleSAML\Configuration');
     }
diff --git a/tests/lib/SimpleSAML/Utils/XMLTest.php b/tests/lib/SimpleSAML/Utils/XMLTest.php
index 4f820a9ef..84a01ac3c 100644
--- a/tests/lib/SimpleSAML/Utils/XMLTest.php
+++ b/tests/lib/SimpleSAML/Utils/XMLTest.php
@@ -150,7 +150,7 @@ class XMLTest extends TestCase
     {
         $dom = new \DOMDocument();
         $element = $dom->appendChild(new \DOMElement('root'));
-        $comment = $element->appendChild(new \DOMComment(''));
+        $element->appendChild(new \DOMComment(''));
 
         XML::getDOMText($element);
     }
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
index deabdd3d2..e98a7c28c 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
@@ -153,7 +153,7 @@ class Test_Core_Auth_Process_AttributeAdd extends TestCase
                 'test' => array('value1'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -172,6 +172,6 @@ class Test_Core_Auth_Process_AttributeAdd extends TestCase
                 'test' => array('value1'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 }
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php b/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
index d59522cba..fa292a690 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
@@ -225,7 +225,7 @@ class Test_Core_Auth_Process_AttributeAlter extends TestCase
                 'eduPersonAffiliation' => array('emperess', 'emperor'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -243,7 +243,7 @@ class Test_Core_Auth_Process_AttributeAlter extends TestCase
                 'eduPersonAffiliation' => array('emperess', 'emperor'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -258,18 +258,12 @@ class Test_Core_Auth_Process_AttributeAlter extends TestCase
             'pattern' => '/wrong/',
         );
 
-        $request = array(
-            'Attributes' => array(
-                 'test' => array('somethingiswrong'),
-             ),
-        );
-
         $request = array(
             'Attributes' => array(
                 'eduPersonAffiliation' => array('emperess', 'emperor'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -286,18 +280,12 @@ class Test_Core_Auth_Process_AttributeAlter extends TestCase
             '%remove',
         );
 
-        $request = array(
-            'Attributes' => array(
-                 'test' => array('somethingiswrong'),
-             ),
-        );
-
         $request = array(
             'Attributes' => array(
                 'eduPersonAffiliation' => array('emperess', 'emperor'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -314,18 +302,12 @@ class Test_Core_Auth_Process_AttributeAlter extends TestCase
             '%remove',
         );
 
-        $request = array(
-            'Attributes' => array(
-                 'test' => array('somethingiswrong'),
-             ),
-        );
-
         $request = array(
             'Attributes' => array(
                 'eduPersonAffiliation' => array('emperess', 'emperor'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
 
@@ -342,17 +324,11 @@ class Test_Core_Auth_Process_AttributeAlter extends TestCase
             'replacement' => null,
         );
 
-        $request = array(
-            'Attributes' => array(
-                 'test' => array('somethingiswrong'),
-             ),
-        );
-
         $request = array(
             'Attributes' => array(
                 'eduPersonAffiliation' => array('emperess', 'emperor'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 }
diff --git a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php b/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
index 52f03613c..dc2b7637c 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
@@ -139,7 +139,7 @@ class Test_Core_Auth_Process_AttributeCopy extends TestCase
                 'test' => array('value1'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -157,6 +157,6 @@ class Test_Core_Auth_Process_AttributeCopy extends TestCase
                 'test' => array('value1'),
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 }
diff --git a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php b/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
index fc55240f9..0986313d2 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
@@ -208,7 +208,7 @@ class Test_Core_Auth_Process_AttributeLimitTest extends TestCase
             'invalidArg' => TRUE,
         );
 
-        $result = self::processFilter($config, self::$request);
+        self::processFilter($config, self::$request);
     }
 
     /**
@@ -222,7 +222,7 @@ class Test_Core_Auth_Process_AttributeLimitTest extends TestCase
 		null
         );
 
-        $result = self::processFilter($config, self::$request);
+        self::processFilter($config, self::$request);
     }
 
 
@@ -464,7 +464,7 @@ class Test_Core_Auth_Process_AttributeLimitTest extends TestCase
         );
 
 
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
diff --git a/tests/modules/core/lib/Auth/Process/AttributeRealmTest.php b/tests/modules/core/lib/Auth/Process/AttributeRealmTest.php
index 75ea9441a..62f1e8586 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeRealmTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeRealmTest.php
@@ -51,7 +51,7 @@ class Test_Core_Auth_Process_AttributeRealm extends TestCase
         $request = array(
             'Attributes' => array(),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
diff --git a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
index e828db779..15c6b764d 100644
--- a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
+++ b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
@@ -173,7 +173,7 @@ class Test_Core_Auth_Process_TargetedID extends TestCase
         $request = array(
             'Attributes' => array(),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -191,7 +191,7 @@ class Test_Core_Auth_Process_TargetedID extends TestCase
                 'displayName' => 'Jack Student',
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -209,7 +209,7 @@ class Test_Core_Auth_Process_TargetedID extends TestCase
                 'displayName' => 'Jack Student',
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 
     /**
@@ -227,6 +227,6 @@ class Test_Core_Auth_Process_TargetedID extends TestCase
                 'displayName' => 'Jack Student',
             ),
         );
-        $result = self::processFilter($config, $request);
+        self::processFilter($config, $request);
     }
 }
-- 
GitLab