diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-02-05 08:31:15 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-02-05 08:31:15 +0000 |
| commit | dd04c183d8beed05be2226b30b7dda485ea4538a (patch) | |
| tree | e3f9ed591264105c5f692b5e10cb79449a3ce3c1 /app/Module.php | |
| parent | 3be3dabd99a20c9582afa24d09fbb2e9485d1a9e (diff) | |
| download | webtrees-dd04c183d8beed05be2226b30b7dda485ea4538a.tar.gz webtrees-dd04c183d8beed05be2226b30b7dda485ea4538a.tar.bz2 webtrees-dd04c183d8beed05be2226b30b7dda485ea4538a.zip | |
Namespaces should consist of both vendor and package
Diffstat (limited to 'app/Module.php')
| -rw-r--r-- | app/Module.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/Module.php b/app/Module.php index ec15c64a69..756da3fa02 100644 --- a/app/Module.php +++ b/app/Module.php @@ -1,5 +1,5 @@ <?php -namespace Webtrees; +namespace Fisharebest\Webtrees; /** * webtrees: online genealogy @@ -79,7 +79,7 @@ abstract class Module { * @return string */ public function getName() { - return str_replace(array('Webtrees\\', '_WT_Module'), '', get_class($this)); + return str_replace(array(__NAMESPACE__ . '\\', '_WT_Module'), '', get_class($this)); } /** @@ -203,7 +203,7 @@ abstract class Module { foreach ($module_names as $module_name) { if (file_exists(WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php')) { require_once WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php'; - $class = 'Webtrees\\' . $module_name . '_WT_Module'; + $class = __NAMESPACE__ . '\\' . $module_name . '_WT_Module'; $modules[$module_name] = new $class; } else { // Module has been deleted from disk? Disable it. @@ -248,8 +248,8 @@ abstract class Module { foreach ($module_names as $module_name) { if (file_exists(WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php')) { require_once WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php'; - $class = 'Webtrees\\' . $module_name . '_WT_Module'; - $interface = 'Webtrees\\Module' . ucfirst($component) . 'Interface'; + $class = __NAMESPACE__ . '\\' . $module_name . '_WT_Module'; + $interface = __NAMESPACE__ . '\Module' . ucfirst($component) . 'Interface'; $module = new $class; // Check that this module is still implementing the desired interface. if ($module instanceof $interface) { @@ -417,7 +417,7 @@ abstract class Module { while (($module_name = readdir($dir)) !== false) { if (preg_match('/^[a-zA-Z0-9_]+$/', $module_name) && file_exists(WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php')) { require_once WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php'; - $class = 'Webtrees\\' . $module_name . '_WT_Module'; + $class = __NAMESPACE__ . '\\' . $module_name . '_WT_Module'; $module = new $class; $modules[$module->getName()] = $module; Database::prepare("INSERT IGNORE INTO `##module` (module_name, status, menu_order, sidebar_order, tab_order) VALUES (?, ?, ?, ?, ?)") |