Remove require_all() lines in bootstrap.php. Move to using autoload-dev in composer.json

Author: nathanjrobertson

composer.json

@@ -30,7 +30,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "SimpleSAML\\Test\\Utils\\": "vendor/simplesamlphp/simplesamlphp/tests/Utils"
+            "SimpleSAML\\Test\\Utils\\": "vendor/simplesamlphp/simplesamlphp/tests/Utils",
+            "SimpleSAML\\Test\\Module\\sqlauth\\Auth\\Source\\": "tests/src/Auth/Source/"
         }
     },
     "require": {

tests/bootstrap.php

@@ -5,22 +5,6 @@
 $projectRoot = dirname(__DIR__);
 require_once($projectRoot . '/vendor/autoload.php');
 
-
-// Load our wrapper class to get around login() being declared protected in SQL.php
-require_once($projectRoot . '/tests/src/Auth/Source/WrapperInterface.php');
-require_once($projectRoot . '/tests/src/Auth/Source/SQLWrapper.php');
-require_once($projectRoot . '/tests/src/Auth/Source/SQL2Wrapper.php');
-require_once($projectRoot . '/tests/src/Auth/Source/SQL1CompatWrapper.php');
-require_once($projectRoot . '/tests/src/Auth/Source/PasswordVerifyWrapper.php');
-require_once($projectRoot . '/tests/src/Auth/Source/PasswordVerify1CompatWrapper.php');
-
-// We use inheritance quite extensively in our test cases, so we need to
-// make sure all the classes that are subclassed are loaded before we run any tests.
-require_once($projectRoot . '/tests/src/Auth/Source/PasswordVerifyTest.php');
-require_once($projectRoot . '/tests/src/Auth/Source/SQLTest.php');
-require_once($projectRoot . '/tests/src/Auth/Source/SQL2SimpleTest.php');
-require_once($projectRoot . '/tests/src/Auth/Source/SQL2SingleAuthTest.php');
-
 // Symlink module into ssp vendor lib so that templates and urls can resolve correctly
 $linkPath = $projectRoot . '/vendor/simplesamlphp/simplesamlphp/modules/sqlauth';
 if (file_exists($linkPath) === false) {