rename module constants and fix some unit test bugs

This commit is contained in:
Dennis Eichhorn 2021-09-28 18:28:42 +02:00
parent 3f418c69e8
commit a71e46f568
5 changed files with 8 additions and 8 deletions

View File

@ -22,7 +22,7 @@ return [
'dest' => '\Modules\Navigation\Controller\SearchController:searchGoto', 'dest' => '\Modules\Navigation\Controller\SearchController:searchGoto',
'verb' => RouteVerb::ANY, 'verb' => RouteVerb::ANY,
'permission' => [ 'permission' => [
'module' => SearchController::MODULE_NAME, 'module' => SearchController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
], ],
], ],

View File

@ -22,7 +22,7 @@ return [
'dest' => '\Modules\Navigation\Controller\BackendController:viewModuleSettings', 'dest' => '\Modules\Navigation\Controller\BackendController:viewModuleSettings',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => \Modules\Admin\Models\PermissionState::MODULE, 'state' => \Modules\Admin\Models\PermissionState::MODULE,
], ],

View File

@ -182,7 +182,7 @@ final class BackendController extends Controller
$view->setData('navigation', $navigation); $view->setData('navigation', $navigation);
if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) { if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) {
$view->setTemplate('/Modules/' . static::MODULE_NAME . '/Admin/Settings/Theme/Backend/settings'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
} else { } else {
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-settings'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-settings');
} }

View File

@ -33,7 +33,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_PATH = __DIR__ . '/../'; public const PATH = __DIR__ . '/../';
/** /**
* Module version. * Module version.
@ -41,7 +41,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_VERSION = '1.0.0'; public const VERSION = '1.0.0';
/** /**
* Module name. * Module name.
@ -49,7 +49,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_NAME = 'Navigation'; public const NAME = 'Navigation';
/** /**
* Module id. * Module id.
@ -57,7 +57,7 @@ class Controller extends ModuleAbstract
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_ID = 1000500000; public const ID = 1000500000;
/** /**
* Providing. * Providing.

View File

@ -25,7 +25,7 @@ use phpOMS\Uri\HttpUri;
*/ */
class AdminTest extends \PHPUnit\Framework\TestCase class AdminTest extends \PHPUnit\Framework\TestCase
{ {
protected const MODULE_NAME = 'Navigation'; protected const NAME = 'Navigation';
protected const URI_LOAD = ''; protected const URI_LOAD = '';