gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop Node::$title

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2025-06-13 02:21:23 +01:00
parent dff3c73022
commit b6794bdf1f
20 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Navigation/NavigationTree.php
View File

@ -813,7 +813,7 @@ class NavigationTree
$groups[$key]->pos3 = $node->pos3;
if ($node instanceof NodeTableContainer || $node instanceof NodeViewContainer) {
$groups[$key]->link = new Link(
$groups[$key]->title,
'',
$node->link->route,
array_merge($node->link->params, ['tbl_group' => $key]),
);
@ -1160,9 +1160,8 @@ class NavigationTree
$paths = $node->getPaths();
$title = $node->link->title;
$options[] = [
'title' => $title,
'title' => $node->link->title,
'name' => $node->realName,
'data' => ['apath' => $paths['aPath'], 'vpath' => $paths['vPath'], 'pos' => $this->pos],
'isSelected' => $node->realName === $selected,

3
src/Navigation/Nodes/Node.php
View File

@ -76,8 +76,6 @@ class Node
public Link $link;
/** @var string HTML title */
public string $title = '';
/** @var string Extra CSS classes for the node */
public string $classes = '';
/** @var bool Whether this node is a link for creating new objects */
@ -126,7 +124,6 @@ class Node
string $classes,
): Node {
$node = new Node($this->config, $name);
$node->title = $name;
$node->isNew = true;
$node->classes = $classes;

4
src/Navigation/Nodes/NodeColumnContainer.php
View File

@ -24,7 +24,7 @@ class NodeColumnContainer extends Node
$this->icon = new Icon('pause', __('Columns'), '/table/structure', ['db' => null, 'table' => null]);
$this->link = new Link(
$this->title,
'',
'/table/structure',
['db' => null, 'table' => null],
);
@ -39,7 +39,7 @@ class NodeColumnContainer extends Node
['field_where' => 'last', 'after_field' => '', 'db' => null, 'table' => null],
);
$new->link = new Link(
$new->title,
$newLabel,
'/table/add-field',
['field_where' => 'last', 'after_field' => '', 'db' => null, 'table' => null],
);

2
src/Navigation/Nodes/NodeDatabaseContainer.php
View File

@ -46,7 +46,7 @@ class NodeDatabaseContainer extends Node
$newLabel = _pgettext('Create new database', 'New');
$new = $this->getInstanceForNewNode($newLabel, 'new_database italics');
$new->icon = new Icon('b_newdb', $newLabel, '/server/databases');
$new->link = new Link($new->title, '/server/databases');
$new->link = new Link($newLabel, '/server/databases');
$this->addChild($new);
}
}

2
src/Navigation/Nodes/NodeEvent.php
View File

@ -28,7 +28,7 @@ class NodeEvent extends NodeDatabaseChild
['edit_item' => 1, 'db' => null, 'item_name' => null],
);
$this->link = new Link(
$this->title,
'',
'/database/events',
['edit_item' => 1, 'db' => null, 'item_name' => null],
);

4
src/Navigation/Nodes/NodeEventContainer.php
View File

@ -23,7 +23,7 @@ class NodeEventContainer extends NodeDatabaseChildContainer
$this->icon = new Icon('b_events', __('Events'), '/database/events', ['db' => null]);
$this->link = new Link(
$this->title,
'',
'/database/events',
['db' => null],
);
@ -33,7 +33,7 @@ class NodeEventContainer extends NodeDatabaseChildContainer
$new = $this->getInstanceForNewNode($newLabel, 'new_event italics');
$new->icon = new Icon('b_event_add', $newLabel, '/database/events', ['add_item' => 1, 'db' => null]);
$new->link = new Link(
$new->title,
$newLabel,
'/database/events',
['add_item' => 1, 'db' => null],
);

2
src/Navigation/Nodes/NodeFunction.php
View File

@ -28,7 +28,7 @@ class NodeFunction extends NodeDatabaseChild
['item_type' => 'FUNCTION', 'execute_dialog' => 1, 'db' => null, 'item_name' => null],
);
$this->link = new Link(
$this->title,
'',
'/database/routines',
['item_type' => 'FUNCTION', 'edit_item' => 1, 'db' => null, 'item_name' => null],
);

4
src/Navigation/Nodes/NodeFunctionContainer.php
View File

@ -28,7 +28,7 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer
['type' => 'FUNCTION', 'db' => null],
);
$this->link = new Link(
$this->title,
'',
'/database/routines',
['type' => 'FUNCTION', 'db' => null],
);
@ -43,7 +43,7 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer
['item_type' => 'FUNCTION', 'add_item' => 1, 'db' => null],
);
$new->link = new Link(
$new->title,
$newLabel,
'/database/routines',
['item_type' => 'FUNCTION', 'add_item' => 1, 'db' => null],
);

2
src/Navigation/Nodes/NodeIndex.php
View File

@ -28,7 +28,7 @@ class NodeIndex extends Node
['db' => null, 'table' => null, 'index' => null],
);
$this->link = new Link(
$this->title,
'',
'/table/indexes',
['db' => null, 'table' => null, 'index' => null],
);

4
src/Navigation/Nodes/NodeIndexContainer.php
View File

@ -24,7 +24,7 @@ class NodeIndexContainer extends Node
$this->icon = new Icon('b_index', __('Indexes'), '/table/structure', ['db' => null, 'table' => null]);
$this->link = new Link(
$this->title,
'',
'/table/structure',
['db' => null, 'table' => null],
);
@ -39,7 +39,7 @@ class NodeIndexContainer extends Node
['create_index' => 1, 'added_fields' => 2, 'db' => null, 'table' => null],
);
$new->link = new Link(
$new->title,
$newLabel,
'/table/indexes',
['create_index' => 1, 'added_fields' => 2, 'db' => null, 'table' => null],
);

2
src/Navigation/Nodes/NodeProcedure.php
View File

@ -28,7 +28,7 @@ class NodeProcedure extends NodeDatabaseChild
['item_type' => 'PROCEDURE', 'execute_dialog' => 1, 'db' => null, 'item_name' => null],
);
$this->link = new Link(
$this->title,
'',
'/database/routines',
['item_type' => 'PROCEDURE', 'edit_item' => 1, 'db' => null, 'item_name' => null],
);

4
src/Navigation/Nodes/NodeProcedureContainer.php
View File

@ -28,7 +28,7 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer
['type' => 'PROCEDURE', 'db' => null],
);
$this->link = new Link(
$this->title,
'',
'/database/routines',
['type' => 'PROCEDURE', 'db' => null],
);
@ -43,7 +43,7 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer
['add_item' => 1, 'db' => null],
);
$new->link = new Link(
$new->title,
$newLabel,
'/database/routines',
['add_item' => 1, 'db' => null],
);

3
src/Navigation/Nodes/NodeTable.php
View File

@ -43,10 +43,9 @@ class NodeTable extends NodeDatabaseChild
$this->config->settings['NavigationTreeDefaultTabTable2'],
['db' => null, 'table' => null],
);
$this->title = Util::getTitleForTarget($this->config->settings['DefaultTabTable']);
$this->link = new Link(
$this->title,
Util::getTitleForTarget($this->config->settings['DefaultTabTable']),
$this->config->settings['DefaultTabTable'],
['pos' => 0, 'db' => null, 'table' => null],
);

4
src/Navigation/Nodes/NodeTableContainer.php
View File

@ -23,7 +23,7 @@ class NodeTableContainer extends NodeDatabaseChildContainer
$this->icon = new Icon('b_browse', __('Tables'), '/database/structure', ['tbl_type' => 'table', 'db' => null]);
$this->link = new Link(
$this->title,
'',
'/database/structure',
['tbl_type' => 'table', 'db' => null],
);
@ -34,7 +34,7 @@ class NodeTableContainer extends NodeDatabaseChildContainer
$new = $this->getInstanceForNewNode($newLabel, 'new_table italics');
$new->icon = new Icon('b_table_add', $newLabel, '/table/create', ['db' => null]);
$new->link = new Link(
$new->title,
$newLabel,
'/table/create',
['db' => null],
);

2
src/Navigation/Nodes/NodeTrigger.php
View File

@ -28,7 +28,7 @@ class NodeTrigger extends Node
['export_item' => 1, 'db' => null, 'item_name' => null],
);
$this->link = new Link(
$this->title,
'',
'/triggers',
['edit_item' => 1, 'db' => null, 'item_name' => null],
);

4
src/Navigation/Nodes/NodeTriggerContainer.php
View File

@ -24,7 +24,7 @@ class NodeTriggerContainer extends Node
$this->icon = new Icon('b_triggers', __('Triggers'), '/triggers', ['db' => null, 'table' => null]);
$this->link = new Link(
$this->title,
'',
'/triggers',
['db' => null, 'table' => null],
);
@ -34,7 +34,7 @@ class NodeTriggerContainer extends Node
$new = $this->getInstanceForNewNode($newLabel, 'new_trigger italics');
$new->icon = new Icon('b_trigger_add', $newLabel, '/triggers', ['add_item' => 1, 'db' => null]);
$new->link = new Link(
$new->title,
$newLabel,
'/triggers',
['add_item' => 1, 'db' => null],
);

2
src/Navigation/Nodes/NodeView.php
View File

@ -23,7 +23,7 @@ class NodeView extends NodeDatabaseChild
$this->icon = new Icon('b_props', __('View'), '/table/structure', ['db' => null, 'table' => null]);
$this->link = new Link(
$this->title,
'',
'/sql',
['pos' => 0, 'db' => null, 'table' => null],
);

4
src/Navigation/Nodes/NodeViewContainer.php
View File

@ -23,7 +23,7 @@ class NodeViewContainer extends NodeDatabaseChildContainer
$this->icon = new Icon('b_views', __('Views'), '/database/structure', ['tbl_type' => 'view', 'db' => null]);
$this->link = new Link(
$this->title,
'',
'/database/structure',
['tbl_type' => 'view', 'db' => null],
);
@ -34,7 +34,7 @@ class NodeViewContainer extends NodeDatabaseChildContainer
$new = $this->getInstanceForNewNode($newLabel, 'new_view italics');
$new->icon = new Icon('b_view_add', $newLabel, '/view/create', ['db' => null]);
$new->link = new Link(
$new->title,
$newLabel,
'/view/create',
['db' => null],
);

2
tests/unit/Navigation/Nodes/NodeColumnContainerTest.php
View File

@ -30,7 +30,7 @@ final class NodeColumnContainerTest extends AbstractTestCase
self::assertArrayHasKey(0, $nodeColumnContainer->children);
$newNode = $nodeColumnContainer->children[0];
self::assertSame('New', $newNode->name);
self::assertSame('New', $newNode->title);
self::assertSame('New', $newNode->link->title);
self::assertTrue($newNode->isNew);
self::assertSame('new_column italics', $newNode->classes);
self::assertSame('b_column_add', $newNode->icon->image);

1
tests/unit/Navigation/Nodes/NodeTest.php
View File

@ -531,7 +531,6 @@ final class NodeTest extends AbstractTestCase
self::assertSame('New', $node->name);
self::assertSame(NodeType::Object, $node->type);
self::assertFalse($node->isGroup);
self::assertSame('New', $node->title);
self::assertTrue($node->isNew);
self::assertSame('new_database italics', $node->classes);
}