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

Attempts to fix unit test.

Browse Source 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2015-09-06 11:59:37 +02:00
parent 83f65c85e1
commit ececab6c8c
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/Util.php
View File

@ -3535,7 +3535,6 @@ class Util
/* Optional escaping */
if (! is_null($escape)) {
if (is_array($escape)) {
include_once $escape[2];
$escape_class = new $escape[1];
$escape_method = $escape[0];
}

15
libraries/navigation/NodeFactory.php
View File

@ -22,6 +22,7 @@ class NodeFactory
* @access private
*/
private static $_path = 'libraries/navigation/nodes/%s.php';
private static $_namespace = 'PMA\libraries\navigation\nodes\%s';
/**
* Sanitizes the name of a Node class
@ -32,19 +33,19 @@ class NodeFactory
*/
private static function _sanitizeClass($class)
{
if ($class !== 'PMA\libraries\navigation\nodes\Node' && !preg_match('@^PMA\libraries\navigation\nodes\Node\w+(_\w+)?$@', $class)) {
$class = 'PMA\libraries\navigation\nodes\Node';
if ($class !== 'Node' && !preg_match('@^Node\w+(_\w+)?$@', $class)) {
$class = 'Node';
trigger_error(
sprintf(
/* l10n: The word "Node" must not be translated here */
__('Invalid class name "%1$s", using default of "PMA\libraries\navigation\nodes\Node"'),
__('Invalid class name "%1$s", using default of "Node"'),
$class
),
E_USER_ERROR
);
}
return self::_checkFile($class);
return sprintf(self::$_namespace, self::_checkFile($class));
}
/**
@ -60,12 +61,12 @@ class NodeFactory
{
$path = sprintf(self::$_path, $class);
if (!is_readable($path)) {
$class = 'PMA\libraries\navigation\nodes\Node';
$class = 'Node';
trigger_error(
sprintf(
__('Could not include class "%1$s", file "%2$s" not found'),
$class,
'Nodes/' . $class . '.php'
'nodes/' . $class . '.php'
),
E_USER_ERROR
);
@ -86,7 +87,7 @@ class NodeFactory
* @return mixed
*/
public static function getInstance(
$class = 'PMA\libraries\navigation\nodes\Node',
$class = 'Node',
$name = 'default',
$type = Node::OBJECT,
$is_group = false

5
libraries/plugins/export/ExportLatex.php
View File

@ -334,7 +334,6 @@ class ExportLatex extends ExportPlugin
array(
'texEscape',
get_class($this),
'libraries/plugins/export/' . get_class($this) . ".class.php",
),
array('table' => $table_alias, 'database' => $db_alias)
)
@ -373,8 +372,6 @@ class ExportLatex extends ExportPlugin
array(
'texEscape',
get_class($this),
'libraries/plugins/export/'
. get_class($this) . ".class.php",
),
array('table' => $table_alias, 'database' => $db_alias)
)
@ -547,7 +544,6 @@ class ExportLatex extends ExportPlugin
array(
'texEscape',
get_class($this),
'libraries/plugins/export/' . get_class($this) . ".class.php",
),
array('table' => $table_alias, 'database' => $db_alias)
)
@ -569,7 +565,6 @@ class ExportLatex extends ExportPlugin
array(
'texEscape',
get_class($this),
'libraries/plugins/export/' . get_class($this) . ".class.php",
),
array('table' => $table_alias, 'database' => $db_alias)
)