From c774b2c8f360f67ddf62053b1e0a6bd9f77eb21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Ivan=C4=8Di=C4=87?= <marko.ivancic@srce.hr> Date: Mon, 13 Jun 2022 16:56:58 +0200 Subject: [PATCH] WIP --- composer.json | 2 +- .../ModuleConfiguration/InvalidConfigurationNameException.php | 2 +- src/ModuleConfiguration.php | 2 +- tests/{ => src}/ModuleConfigurationTest.php | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) rename tests/{ => src}/ModuleConfigurationTest.php (83%) diff --git a/composer.json b/composer.json index 499865c..77a137e 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "autoload-dev": { "psr-4": { - "SimpleSAML\\Test\\Module\\accounting\\": "tests/" + "SimpleSAML\\Test\\Module\\accounting\\": "tests/src" } }, "require": { diff --git a/src/Exceptions/ModuleConfiguration/InvalidConfigurationNameException.php b/src/Exceptions/ModuleConfiguration/InvalidConfigurationNameException.php index 46e091d..51cb243 100644 --- a/src/Exceptions/ModuleConfiguration/InvalidConfigurationNameException.php +++ b/src/Exceptions/ModuleConfiguration/InvalidConfigurationNameException.php @@ -1,6 +1,6 @@ <?php -namespace SimpleSAML\Module\accounting\Exceptions; +namespace SimpleSAML\Module\accounting\Exceptions\ModuleConfiguration; class InvalidConfigurationNameException extends \InvalidArgumentException { diff --git a/src/ModuleConfiguration.php b/src/ModuleConfiguration.php index 528ec94..4f22576 100644 --- a/src/ModuleConfiguration.php +++ b/src/ModuleConfiguration.php @@ -3,7 +3,7 @@ namespace SimpleSAML\Module\accounting; use SimpleSAML\Configuration; -use SimpleSAML\Module\accounting\Exceptions\InvalidConfigurationNameException; +use SimpleSAML\Module\accounting\Exceptions\ModuleConfiguration\InvalidConfigurationNameException; class ModuleConfiguration { diff --git a/tests/ModuleConfigurationTest.php b/tests/src/ModuleConfigurationTest.php similarity index 83% rename from tests/ModuleConfigurationTest.php rename to tests/src/ModuleConfigurationTest.php index 6184e79..b9fa745 100644 --- a/tests/ModuleConfigurationTest.php +++ b/tests/src/ModuleConfigurationTest.php @@ -13,6 +13,7 @@ class ModuleConfigurationTest extends TestCase { public function testSample(): void { + // Configuration directory is set by phpunit using php ENV setting feature (check phpunit.xml). $moduleConfiguration = new ModuleConfiguration('module_accounting_basic.php'); $this->assertInstanceOf(Configuration::class, $moduleConfiguration->getConfiguration()); -- GitLab