Fix UndefinedClass

tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php

@@ -2,15 +2,10 @@
 
 namespace SimpleSAML\Test\Module\core\Auth\Process;
 
-// Alias the PHPUnit 6.0 ancestor if available, else fall back to legacy ancestor
-if (class_exists('\PHPUnit\Framework\TestCase', true) and !class_exists('\PHPUnit_Framework_TestCase', true)) {
-    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase', true);
-}
-
 /**
  * Test for the core:CardinalitySingle filter.
  */
-class CardinalitySingleTest extends \PHPUnit_Framework_TestCase
+class CardinalitySingleTest extends \PHPUnit\Framework\TestCase
 {
     private $http;
 

tests/modules/core/lib/Auth/Process/CardinalityTest.php

@@ -2,15 +2,10 @@
 
 namespace SimpleSAML\Test\Module\core\Auth\Process;
 
-// Alias the PHPUnit 6.0 ancestor if available, else fall back to legacy ancestor
-if (class_exists('\PHPUnit\Framework\TestCase', true) and !class_exists('\PHPUnit_Framework_TestCase', true)) {
-    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase', true);
-}
-
 /**
  * Test for the core:Cardinality filter.
  */
-class CardinalityTest extends \PHPUnit_Framework_TestCase
+class CardinalityTest extends \PHPUnit\Framework\TestCase
 {
     private $http;
 

tests/modules/core/lib/Auth/UserPassBaseTest.php

@@ -2,7 +2,7 @@
 
 namespace SimpleSAML\Test\Module\core\Auth;
 
-class UserPassBaseTest extends \PHPUnit_Framework_TestCase
+class UserPassBaseTest extends \PHPUnit\Framework\TestCase
 {
     public function testAuthenticateECPCallsLoginAndSetsAttributes()
     {

tests/modules/core/lib/Auth/UserPassOrgBaseTest.php

@@ -4,7 +4,7 @@ namespace SimpleSAML\Test\Module\core\Auth;
 
 use SimpleSAML\Module\core\Auth\UserPassOrgBase;
 
-class UserPassOrgBaseTest extends \PHPUnit_Framework_TestCase
+class UserPassOrgBaseTest extends \PHPUnit\Framework\TestCase
 {
     public function testRememberOrganizationEnabled()
     {

tests/www/RouterTest.php

@@ -3,6 +3,7 @@
 namespace SimpleSAML\Test\Web;
 
 use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Exception\ParseException;
 use PHPUnit\Framework\TestCase;
 use \SimpleSAML\Configuration;
 use \SimpleSAML\Module;
@@ -28,7 +29,7 @@ class RouterTest extends TestCase
                         try {
                             $value = $yaml->parse(file_get_contents('modules/'.$module.'/'.$file));
                             $this->addToAssertionCount(1);
-                        } catch (\ParseException $e) {
+                        } catch (ParseException $e) {
                             $this->fail($e->getMessage().' in '.$e->getFile().':'.$e->getLine());
                         }
                     }