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

Fix nodes load.

Browse Source 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2015-09-06 14:57:38 +02:00
parent b5324d6395
commit 3539b01740
30 changed files with 55 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libraries/navigation/NavigationTree.php
View File

@ -144,7 +144,7 @@ class NavigationTree
$this->_searchClause2 = $_REQUEST['searchClause2'];
}
// Initialise the tree by creating a root node
$node = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabaseContainer', 'root');
$node = NodeFactory::getInstance('NodeDatabaseContainer', 'root');
$this->_tree = $node;
if ($GLOBALS['cfg']['NavigationTreeEnableGrouping']
&& $GLOBALS['cfg']['ShowDatabasesNavigationAsTree']
@ -282,7 +282,7 @@ class NavigationTree
);
$hiddenCounts = $this->_tree->getNavigationHidingData();
foreach ($data as $db) {
$node = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase', $db);
$node = NodeFactory::getInstance('NodeDatabase', $db);
if (isset($hiddenCounts[$db])) {
$node->setHiddenCount($hiddenCounts[$db]);
}
@ -374,31 +374,31 @@ class NavigationTree
switch ($container->real_name) {
case 'events':
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeEvent',
'NodeEvent',
$item
);
break;
case 'functions':
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeFunction',
'NodeFunction',
$item
);
break;
case 'procedures':
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeProcedure',
'NodeProcedure',
$item
);
break;
case 'tables':
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeTable',
'NodeTable',
$item
);
break;
case 'views':
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeView',
'NodeView',
$item
);
break;
@ -432,7 +432,7 @@ class NavigationTree
}
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeTable',
'NodeTable',
$path[0]
);
if ($type2 == $container->real_name) {
@ -465,19 +465,19 @@ class NavigationTree
switch ($container->real_name) {
case 'indexes':
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeIndex',
'NodeIndex',
$item
);
break;
case 'columns':
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeColumn',
'NodeColumn',
$item
);
break;
case 'triggers':
$node = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeTrigger',
'NodeTrigger',
$item
);
break;
@ -519,17 +519,17 @@ class NavigationTree
if ($table->hasChildren(true) == 0) {
if ($table->getPresence('columns')) {
$retval['columns'] = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeColumn_Container'
'NodeColumnContainer'
);
}
if ($table->getPresence('indexes')) {
$retval['indexes'] = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeIndex_Container'
'NodeIndexContainer'
);
}
if ($table->getPresence('triggers')) {
$retval['triggers'] = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeTrigger_Container'
'NodeTriggerContainer'
);
}
// Add all new Nodes to the tree
@ -601,27 +601,27 @@ class NavigationTree
if ($db->hasChildren(true) == 0) {
if (!in_array('tables', $hidden) && $db->getPresence('tables')) {
$retval['tables'] = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeTable_Container'
'NodeTableContainer'
);
}
if (!in_array('views', $hidden) && $db->getPresence('views')) {
$retval['views'] = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeView_Container'
'NodeViewContainer'
);
}
if (!in_array('functions', $hidden) && $db->getPresence('functions')) {
$retval['functions'] = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeFunction_Container'
'NodeFunctionContainer'
);
}
if (!in_array('procedures', $hidden) && $db->getPresence('procedures')) {
$retval['procedures'] = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeProcedure_Container'
'NodeProcedureContainer'
);
}
if (!in_array('events', $hidden) && $db->getPresence('events')) {
$retval['events'] = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\NodeEvent_Container'
'NodeEventContainer'
);
}
// Add all new Nodes to the tree

2
libraries/navigation/nodes/NodeColumnContainer.php
View File

@ -41,7 +41,7 @@ class NodeColumnContainer extends Node
$new_label = _pgettext('Create new column', 'New');
$new = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\Node',
'Node',
$new_label
);
$new->isNew = true;

2
libraries/navigation/nodes/NodeDatabaseContainer.php
View File

@ -32,7 +32,7 @@ class NodeDatabaseContainer extends Node
&& $GLOBALS['cfg']['ShowCreateDb'] !== false
) {
$new = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\Node',
'Node',
_pgettext('Create new database', 'New')
);
$new->isNew = true;

2
libraries/navigation/nodes/NodeEventContainer.php
View File

@ -33,7 +33,7 @@ class NodeEventContainer extends NodeDatabaseChildContainer
$this->real_name = 'events';
$new = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\Node',
'Node',
_pgettext('Create new event', 'New')
);
$new->isNew = true;

2
libraries/navigation/nodes/NodeFunctionContainer.php
View File

@ -39,7 +39,7 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer
$new_label = _pgettext('Create new function', 'New');
$new = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\Node',
'Node',
$new_label
);
$new->isNew = true;

2
libraries/navigation/nodes/NodeIndexContainer.php
View File

@ -36,7 +36,7 @@ class NodeIndexContainer extends Node
$new_label = _pgettext('Create new index', 'New');
$new = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\Node',
'Node',
$new_label
);
$new->isNew = true;

2
libraries/navigation/nodes/NodeTableContainer.php
View File

@ -37,7 +37,7 @@ class NodeTableContainer extends NodeDatabaseChildContainer
$new_label = _pgettext('Create new table', 'New');
$new = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\Node',
'Node',
$new_label
);
$new->isNew = true;

2
libraries/navigation/nodes/NodeTriggerContainer.php
View File

@ -35,7 +35,7 @@ class NodeTriggerContainer extends Node
$this->real_name = 'triggers';
$new = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\Node',
'Node',
_pgettext('Create new trigger', 'New')
);
$new->isNew = true;

2
libraries/navigation/nodes/NodeViewContainer.php
View File

@ -37,7 +37,7 @@ class NodeViewContainer extends NodeDatabaseChildContainer
$new_label = _pgettext('Create new view', 'New');
$new = NodeFactory::getInstance(
'PMA\libraries\navigation\nodes\Node',
'Node',
$new_label
);
$new->isNew = true;

7
test/classes/navigation/PMA_NavigationTree_test.php
View File

@ -16,17 +16,10 @@ use PMA\libraries\Theme;
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/url_generating.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/navigation/NavigationTree.php';
require_once 'libraries/navigation/NodeFactory.php';
require_once 'libraries/check_user_privileges.lib.php';
/**

2
test/classes/navigation/PMA_NodeFactory_test.php
View File

@ -53,7 +53,7 @@ class NodeFactory_Test extends PHPUnit_Framework_TestCase
*/
public function testDefaultContainer()
{
$node = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'default', Node::CONTAINER);
$node = NodeFactory::getInstance('Node', 'default', Node::CONTAINER);
$this->assertEquals('default', $node->name);
$this->assertEquals(Node::CONTAINER, $node->type);
$this->assertEquals(false, $node->is_group);

2
test/classes/navigation/PMA_Node_Column_Container_test.php
View File

@ -39,7 +39,7 @@ class Node_Column_Container_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeColumn_Container');
$parent = NodeFactory::getInstance('NodeColumnContainer');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Column_test.php
View File

@ -39,7 +39,7 @@ class Node_Column_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeColumn');
$parent = NodeFactory::getInstance('NodeColumn');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_DatabaseChild_test.php
View File

@ -66,7 +66,7 @@ class Node_DatabaseChildTest extends PHPUnit_Framework_TestCase
*/
public function testGetHtmlForControlButtons()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase', 'parent');
$parent = NodeFactory::getInstance('NodeDatabase', 'parent');
$parent->addChild($this->object);
$this->object->expects($this->once())
->method('getItemType')

8
test/classes/navigation/PMA_Node_Database_test.php
View File

@ -45,7 +45,7 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase');
$parent = NodeFactory::getInstance('NodeDatabase');
$this->assertArrayHasKey(
'text',
$parent->links
@ -64,7 +64,7 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase
*/
public function testGetPresence()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase');
$parent = NodeFactory::getInstance('NodeDatabase');
$this->assertEquals(
2,
$parent->getPresence('tables')
@ -94,7 +94,7 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase
*/
public function testGetData()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase');
$parent = NodeFactory::getInstance('NodeDatabase');
$tables = $parent->getData('tables', 0);
$this->assertContains(
@ -130,7 +130,7 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase
*/
public function testHiddenCount()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase');
$parent = NodeFactory::getInstance('NodeDatabase');
$parent->setHiddenCount(3);
$this->assertEquals(

2
test/classes/navigation/PMA_Node_Event_Container_test.php
View File

@ -39,7 +39,7 @@ class Node_Event_Container_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeEvent_Container');
$parent = NodeFactory::getInstance('NodeEventContainer');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Event_test.php
View File

@ -38,7 +38,7 @@ class Node_Event_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeEvent');
$parent = NodeFactory::getInstance('NodeEvent');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Function_Container_test.php
View File

@ -39,7 +39,7 @@ class Node_Function_Container_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeFunction_Container');
$parent = NodeFactory::getInstance('NodeFunctionContainer');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Function_test.php
View File

@ -39,7 +39,7 @@ class Node_Function_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeFunction');
$parent = NodeFactory::getInstance('NodeFunction');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Index_Container_test.php
View File

@ -39,7 +39,7 @@ class Node_Index_Container_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeIndex_Container');
$parent = NodeFactory::getInstance('NodeIndexContainer');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Index_test.php
View File

@ -39,7 +39,7 @@ class Node_Index_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeIndex');
$parent = NodeFactory::getInstance('NodeIndex');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Procedure_Container_test.php
View File

@ -39,7 +39,7 @@ class Node_Procedure_Container_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeProcedure_Container');
$parent = NodeFactory::getInstance('NodeProcedureContainer');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Procedure_test.php
View File

@ -39,7 +39,7 @@ class Node_Procedure_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeProcedure');
$parent = NodeFactory::getInstance('NodeProcedure');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Table_Container_test.php
View File

@ -44,7 +44,7 @@ class Node_Table_Container_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTable_Container');
$parent = NodeFactory::getInstance('NodeTableContainer');
$this->assertArrayHasKey(
'text',
$parent->links

4
test/classes/navigation/PMA_Node_Table_test.php
View File

@ -48,7 +48,7 @@ class Node_Table_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTable');
$parent = NodeFactory::getInstance('NodeTable');
$this->assertArrayHasKey(
'text',
$parent->links
@ -72,7 +72,7 @@ class Node_Table_Test extends PHPUnit_Framework_TestCase
public function testIcon($target, $imageName)
{
$GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = $target;
$node = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTable');
$node = NodeFactory::getInstance('NodeTable');
$this->assertContains($imageName, $node->icon[0]);
}

2
test/classes/navigation/PMA_Node_Trigger_Container_test.php
View File

@ -40,7 +40,7 @@ class Node_Trigger_Container_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTrigger_Container');
$parent = NodeFactory::getInstance('NodeTriggerContainer');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_Trigger_test.php
View File

@ -39,7 +39,7 @@ class Node_Trigger_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTrigger');
$parent = NodeFactory::getInstance('NodeTrigger');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_View_Container_test.php
View File

@ -44,7 +44,7 @@ class Node_View_Container_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeView_Container');
$parent = NodeFactory::getInstance('NodeViewContainer');
$this->assertArrayHasKey(
'text',
$parent->links

2
test/classes/navigation/PMA_Node_View_test.php
View File

@ -40,7 +40,7 @@ class Node_View_Test extends PHPUnit_Framework_TestCase
*/
public function testConstructor()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeView');
$parent = NodeFactory::getInstance('NodeView');
$this->assertArrayHasKey(
'text',
$parent->links

10
test/classes/navigation/PMA_Node_test.php
View File

@ -41,8 +41,8 @@ class Node_Test extends PHPUnit_Framework_TestCase
*/
public function testAddNode()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'parent');
$child = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'child');
$parent = NodeFactory::getInstance('Node', 'parent');
$child = NodeFactory::getInstance('Node', 'child');
$parent->addChild($child);
$this->assertEquals(
$parent->getChild($child->name),
@ -61,7 +61,7 @@ class Node_Test extends PHPUnit_Framework_TestCase
*/
public function testGetChildError()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'parent');
$parent = NodeFactory::getInstance('Node', 'parent');
$this->assertEquals(
$parent->getChild("foo"),
false
@ -79,8 +79,8 @@ class Node_Test extends PHPUnit_Framework_TestCase
*/
public function testRemoveNode()
{
$parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'parent');
$child = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'child');
$parent = NodeFactory::getInstance('Node', 'parent');
$child = NodeFactory::getInstance('Node', 'child');
$parent->addChild($child);
$this->assertEquals(
$parent->getChild($child->name),