diff options
-rw-r--r-- | core/Application/Kernel/EnvironmentValidator.php | 2 | ||||
-rw-r--r-- | core/Exception/NotYetInstalledException.php | 2 | ||||
-rw-r--r-- | plugins/Installation/Installation.php | 4 | ||||
-rw-r--r-- | plugins/TwoFactorAuth/Validator.php | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/core/Application/Kernel/EnvironmentValidator.php b/core/Application/Kernel/EnvironmentValidator.php index ed52e76a27..3a526a8c5c 100644 --- a/core/Application/Kernel/EnvironmentValidator.php +++ b/core/Application/Kernel/EnvironmentValidator.php @@ -82,7 +82,7 @@ class EnvironmentValidator if (isset($general['enable_installer']) && !$general['enable_installer'] ) { - throw new InvalidRequestParameterException('Matomo is not set up yet'); + throw new NotYetInstalledException('Matomo is not set up yet'); } $message = $this->getSpecificMessageWhetherFileExistsOrNot($path); diff --git a/core/Exception/NotYetInstalledException.php b/core/Exception/NotYetInstalledException.php index 388f001c22..95e31d63bb 100644 --- a/core/Exception/NotYetInstalledException.php +++ b/core/Exception/NotYetInstalledException.php @@ -8,6 +8,6 @@ */ namespace Piwik\Exception; -class NotYetInstalledException extends Exception +class NotYetInstalledException extends InvalidRequestParameterException { } diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php index b3d25344c9..5bd24575a4 100644 --- a/plugins/Installation/Installation.php +++ b/plugins/Installation/Installation.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\Installation; use Piwik\API\Request; use Piwik\Common; use Piwik\Config; -use Piwik\Exception\InvalidRequestParameterException; +use Piwik\Exception\NotYetInstalledException; use Piwik\FrontController; use Piwik\Piwik; use Piwik\Plugins\Installation\Exception\DatabaseConnectionFailedException; @@ -65,7 +65,7 @@ class Installation extends \Piwik\Plugin $general = Config::getInstance()->General; if (!SettingsPiwik::isPiwikInstalled() && !$general['enable_installer']) { - throw new InvalidRequestParameterException('Matomo is not set up yet'); + throw new NotYetInstalledException('Matomo is not set up yet'); } if (empty($general['installation_in_progress'])) { diff --git a/plugins/TwoFactorAuth/Validator.php b/plugins/TwoFactorAuth/Validator.php index e1260bd0df..77b4bb2714 100644 --- a/plugins/TwoFactorAuth/Validator.php +++ b/plugins/TwoFactorAuth/Validator.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\TwoFactorAuth; use Piwik\Common; -use Piwik\Exception\InvalidRequestParameterException; +use Piwik\Exception\NotYetInstalledException; use Piwik\Piwik; use Piwik\Session\SessionFingerprint; use Exception; @@ -46,7 +46,7 @@ class Validator Piwik::checkUserIsNotAnonymous(); if (!SettingsPiwik::isPiwikInstalled()) { - throw new InvalidRequestParameterException('Matomo is not set up yet'); + throw new NotYetInstalledException('Matomo is not set up yet'); } } |