[icinga-checkins] icinga.org: icingaweb2/feature/redesign-7144: Let our module autloader know that we renamed our form namespaces

git at icinga.org git at icinga.org
Fri Nov 14 21:46:46 CET 2014


Module: icingaweb2
Branch: feature/redesign-7144
Commit: 586b4f463b214b26c72b62ae501c4e6e79a564ca
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=586b4f463b214b26c72b62ae501c4e6e79a564ca

Author: Johannes Meyer <johannes.meyer at netways.de>
Date:   Fri Nov 14 11:30:44 2014 +0100

Let our module autloader know that we renamed our form namespaces

refs #7553

---

 library/Icinga/Application/Modules/Module.php |    2 +-
 test/php/bootstrap.php                        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 461cec5..443a39e 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -763,7 +763,7 @@ class Module
             $this->app->getLoader()->registerNamespace('Icinga\\Module\\' . $moduleName, $moduleLibraryDir);
             if (is_dir($this->getFormDir())) {
                 $this->app->getLoader()->registerNamespace(
-                    'Icinga\\Module\\' . $moduleName. '\\Form',
+                    'Icinga\\Module\\' . $moduleName. '\\Forms',
                     $this->getFormDir()
                 );
             }
diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index fd8fc6d..a692d2b 100644
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -51,7 +51,7 @@ foreach ($modules as $module) {
 
     $moduleFormPath = $modulePath . '/' . $module . '/application/forms';
     if (is_dir($moduleFormPath)) {
-        $loader->registerNamespace($moduleNamespace . '\\Form', $moduleFormPath);
+        $loader->registerNamespace($moduleNamespace . '\\Forms', $moduleFormPath);
     }
 }
 



More information about the icinga-checkins mailing list