Use non-generic exception

tvdijen · tvdijen · commit d46cedd199de · 2023-04-25T10:33:47.000+02:00
diff --git a/src/SimpleSAML/Utils/Config.php b/src/SimpleSAML/Utils/Config.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Utils;
 
 use SimpleSAML\Configuration;
+use SimpleSAML\Error;
 
 /**
  * Utility class for SimpleSAMLphp configuration management and manipulation.
@@ -49,7 +50,10 @@ public function getSecretSalt(): string
     {
         $secretSalt = Configuration::getInstance()->getString('secretsalt');
         if ($secretSalt === 'defaultsecretsalt') {
-            throw new \InvalidArgumentException('The "secretsalt" configuration option must be set to a secret value.');
+            throw new Error\CriticalConfigurationError(
+                'The "secretsalt" configuration option must be set to a secret value.',
+                'config.php',
+            );
         }
 
         return $secretSalt;
@@ -74,7 +78,7 @@ public function getConfigDir(): string
 
         if ($configDirEnv !== false) {
             if (!is_dir($configDirEnv)) {
-                throw new \InvalidArgumentException(
+                throw new Error\CriticalConfigurationError(
                     sprintf(
                         'Config directory specified by environment variable SIMPLESAMLPHP_CONFIG_DIR is not a ' .
                         'directory.  Given: "%s"',
diff --git a/tests/src/SimpleSAML/Utils/ConfigTest.php b/tests/src/SimpleSAML/Utils/ConfigTest.php
@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\Error;
 use SimpleSAML\Utils;
 
 /**
@@ -89,7 +90,7 @@ public function testInvalidEnvVariableConfigDirThrowsException(): void
         $invalidDir = __DIR__ . '/e9826ad19cbc4f5bf20c0913ffcd2ce6';
         putenv('SIMPLESAMLPHP_CONFIG_DIR=' . $invalidDir);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(Error\CriticalConfigurationError::class);
         $this->expectExceptionMessage(
             'Config directory specified by environment variable SIMPLESAMLPHP_CONFIG_DIR is not a directory.  ' .
             'Given: "' . $invalidDir . '"'
