← All changes | src/Controller/Backend/ControllerTabNavigationTrait.php +17 -4 2.3.18 → 2.3.2 View file →

		@@ -3,8 +3,13 @@
3	3	declare(strict_types=1);
4	4
5	5	namespace UserAccessManager\Controller\Backend;
6	6
	7	+/**
	8	+ * Trait ControllerTabNavigationTrait
	9	+ *
	10	+ * @package UserAccessManager\Controller
	11	+ */
7	12	trait ControllerTabNavigationTrait
8	13	{
9	14	abstract public function getRequestUrl(): string;
10	15
		@@ -9,9 +14,9 @@
9	14	abstract public function getRequestUrl(): string;
10	15
11	16	abstract public function getRequestParameter(string $name, $default = null): mixed;
12	17
13		- abstract public function getGroupText(string $key, bool $description = false): string;
	18	+ abstract public function getGroupText(string $key): string;
14	19
15	20	abstract public function getGroupSectionText(string $key): string;
16	21
17	22	abstract public function getTabGroups(): array;
		@@ -26,18 +31,26 @@
26	31
27	32	public function getSections(): array
28	33	{
29	34	$groups = $this->getTabGroups();
	35	+ $group = $this->getCurrentTabGroup();
30	36
31		- return $groups[$this->getCurrentTabGroup()] ?? [];
	37	+ return isset($groups[$group]) === true ? $groups[$group] : [];
32	38	}
33	39
34	40	public function getCurrentTabGroupSection(): string
35	41	{
36	42	$groups = $this->getTabGroups();
37		- $sections = $groups[$this->getCurrentTabGroup()] ?? reset($groups);
	43	+ $group = $this->getCurrentTabGroup();
38	44
39		- return (string) $this->getRequestParameter('tab_group_section', reset($sections));
	45	+ if (isset($groups[$group]) === true) {
	46	+ $default = reset($groups[$group]);
	47	+ } else {
	48	+ $firstGroup = reset($groups);
	49	+ $default = reset($firstGroup);
	50	+ }
	51	+
	52	+ return (string) $this->getRequestParameter('tab_group_section', $default);
40	53	}
41	54
42	55	public function getTabGroupLink(string $groupKey): string
43	56	{