Jingga/oms-Navigation
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Navigation.git synced 2026-01-31 17:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove some getter/setter

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 17:31:20 +01:00
parent 0e473f0f37
commit 430cb641ce
8 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/BackendController.php
View File

@ -49,7 +49,7 @@ final class BackendController extends Controller
public function createNavigationMid(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView
{
$nav = Navigation::getInstance($request,
$this->app->accountManager->get($request->getHeader()->getAccount()),
$this->app->accountManager->get($request->header->account),
$this->app->dbPool,
$this->app->orgId,
$this->app->appName
@ -58,7 +58,7 @@ final class BackendController extends Controller
$navView = new NavigationView($this->app->l11nManager, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
$navView->setNav($nav->getNav());
$navView->setParent($pageId);
$navView->parent = $pageId;
return $navView;
}
@ -78,7 +78,7 @@ final class BackendController extends Controller
{
$navObj = Navigation::getInstance(
$request,
$this->app->accountManager->get($request->getHeader()->getAccount()),
$this->app->accountManager->get($request->header->account),
$this->app->dbPool,
$this->app->orgId,
$this->app->appName
@ -89,7 +89,7 @@ final class BackendController extends Controller
$unread = [];
foreach ($this->receiving as $receiving) {
$unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->getHeader()->getAccount());
$unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->header->account);
}
$nav->setData('unread', $unread);
@ -144,7 +144,7 @@ final class BackendController extends Controller
public function createNavigationSplash(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView
{
$nav = Navigation::getInstance($request,
$this->app->accountManager->get($request->getHeader()->getAccount()),
$this->app->accountManager->get($request->header->account),
$this->app->dbPool,
$this->app->orgId,
$this->app->appName
@ -154,7 +154,7 @@ final class BackendController extends Controller
$navView->setTemplate('/Modules/Navigation/Theme/Backend/splash');
$navView->setNav($nav->getNav());
$navView->setParent($pageId);
$navView->parent = $pageId;
return $navView;
}

6
Controller/SearchController.php
View File

@ -79,16 +79,16 @@ final class SearchController extends Controller
}
}
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
if ($found === null) {
$this->fillJsonResponse($request, $response, NotificationLevel::WARNING, 'Command', 'Unknown command "' . $search . '"', $search);
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
$response->set($request->getUri()->__toString(), new Redirect(UriFactory::build($found->uri)));
$response->set($request->uri->__toString(), new Redirect(UriFactory::build($found->uri)));
}
/**

8
Controller/TimerecordingController.php
View File

@ -44,7 +44,7 @@ final class TimerecordingController extends Controller
public function createNavigationMid(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView
{
$nav = Navigation::getInstance($request,
$this->app->accountManager->get($request->getHeader()->getAccount()),
$this->app->accountManager->get($request->header->account),
$this->app->dbPool,
$this->app->orgId,
$this->app->appName
@ -73,7 +73,7 @@ final class TimerecordingController extends Controller
{
$navObj = Navigation::getInstance(
$request,
$this->app->accountManager->get($request->getHeader()->getAccount()),
$this->app->accountManager->get($request->header->account),
$this->app->dbPool,
$this->app->orgId,
$this->app->appName
@ -84,7 +84,7 @@ final class TimerecordingController extends Controller
$unread = [];
foreach ($this->receiving as $receiving) {
$unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->getHeader()->getAccount());
$unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->header->account);
}
$nav->setData('unread', $unread);
@ -139,7 +139,7 @@ final class TimerecordingController extends Controller
public function createNavigationSplash(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView
{
$nav = Navigation::getInstance($request,
$this->app->accountManager->get($request->getHeader()->getAccount()),
$this->app->accountManager->get($request->header->account),
$this->app->dbPool,
$this->app->orgId,
$this->app->appName

2
Theme/Backend/mid.tpl.php
View File

@ -21,7 +21,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])
) {
echo '<div class="row"><div class="col-xs-12"><ul class="nav-top" role="navigation">';
$uriPath = $this->request->getUri()->getPath();
$uriPath = $this->request->uri->getPath();
foreach ($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT] as $key => $parent) {
foreach ($parent as $link) {

2
Theme/Backend/side.tpl.php
View File

@ -22,7 +22,7 @@ if (isset($this->nav[NavigationType::SIDE])) : ?>
<div id="nav-side-outer">
<ul id="nav-side-inner" class="nav" role="navigation">
<?php
$uriPath = $this->request->getUri()->getPath();
$uriPath = $this->request->uri->getPath();
foreach ($this->nav[NavigationType::SIDE][LinkType::CATEGORY] as $key => $parent) : ?>
<li><input id="nav-<?= $this->printHtml($parent['nav_name']); ?>" type="checkbox">
<ul>

24
Views/NavigationView.php
View File

@ -51,7 +51,7 @@ class NavigationView extends View
* @var int
* @since 1.0.0
*/
protected int $parent = 0;
public int $parent = 0;
/**
* Get navigation Id.
@ -100,26 +100,4 @@ class NavigationView extends View
{
$this->nav = $nav;
}
/**
* @return int
*
* @since 1.0.0
*/
public function getParent() : int
{
return $this->parent;
}
/**
* @param int $parent Navigation parent element
*
* @return void
*
* @since 1.0.0
*/
public function setParent(int $parent) : void
{
$this->parent = $parent;
}
}

6
tests/Controller/SearchControllerTest.php
View File

@ -98,7 +98,7 @@ class SearchControllerTest extends \PHPUnit\Framework\TestCase
$request = new HttpRequest(new HttpUri('https://127.0.0.1/en/backend'));
$request->createRequestHashs(2);
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('search', ':goto General');
$request->setData('app', 'Backend');
@ -116,11 +116,11 @@ class SearchControllerTest extends \PHPUnit\Framework\TestCase
$request = new HttpRequest(new HttpUri('https://127.0.0.1/en/backend'));
$request->createRequestHashs(0);
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('search', ':goto Invalid');
$request->setData('app', 'Backend');
$this->module->searchGoto($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
}

6
tests/Views/NavigationViewTest.php
View File

@ -31,7 +31,7 @@ class NavigationViewTest extends \PHPUnit\Framework\TestCase
self::assertEquals(0, $view->getNavId());
self::assertEquals([], $view->getNav());
self::assertEquals(0, $view->getParent());
self::assertEquals(0, $view->parent);
}
/**
@ -48,7 +48,7 @@ class NavigationViewTest extends \PHPUnit\Framework\TestCase
$view->setNav([1, 2, 3]);
self::assertEquals([1, 2, 3], $view->getNav());
$view->setParent(4);
self::assertEquals(4, $view->getParent());
$view->parent = 4;
self::assertEquals(4, $view->parent);
}
}