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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-01-09 19:26:33 +01:00
commit 2078214b39
20 changed files with 88 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pmd_general.php
View File

@ -330,8 +330,8 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
onmouseover="old_class = this.className; this.className = 'tab_field_2';"
onmouseout="this.className = old_class;"
onmousedown="Click_field('<?php
echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]."','"
. urlencode($tab_column[$t_n]["COLUMN_NAME"][$j])."',";
echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i] . "','"
. urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . "',";
if (!PMA_Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) {
echo (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]]) ? 1 : 0);
} else {

12
test/AllSeleniumTests.php
View File

@ -8,12 +8,12 @@
*/
require_once 'PHPUnit/TextUI/TestRunner.php';
require_once __DIR__.'/selenium/PmaSeleniumTestCase.php';
require_once __DIR__.'/selenium/PmaSeleniumLoginTest.php';
require_once __DIR__.'/selenium/PmaSeleniumXssTest.php';
require_once __DIR__.'/selenium/PmaSeleniumPrivilegesTest.php';
require_once __DIR__.'/selenium/PmaSeleniumCreateDropDatabaseTest.php';
require_once __DIR__.'/selenium/PmaSeleniumCreateRemoveUserTest.php';
require_once __DIR__ . '/selenium/PmaSeleniumTestCase.php';
require_once __DIR__ . '/selenium/PmaSeleniumLoginTest.php';
require_once __DIR__ . '/selenium/PmaSeleniumXssTest.php';
require_once __DIR__ . '/selenium/PmaSeleniumPrivilegesTest.php';
require_once __DIR__ . '/selenium/PmaSeleniumCreateDropDatabaseTest.php';
require_once __DIR__ . '/selenium/PmaSeleniumCreateRemoveUserTest.php';
/**
* AllSeleniumTests class

2
test/Environment_test.php
View File

@ -59,7 +59,7 @@ class Environment_Test extends PHPUnit_Framework_TestCase
);
}
catch (Exception $e) {
$this->markTestSkipped("Error: ".$e->getMessage());
$this->markTestSkipped("Error: " . $e->getMessage());
}
// Check id MySQL server is 5 version

2
test/classes/PMA_Theme_test.php
View File

@ -99,7 +99,7 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
public function testLoadInfo()
{
$this->object->setPath('./themes/original');
$infofile = $this->object->getPath().'/info.inc.php';
$infofile = $this->object->getPath() . '/info.inc.php';
$this->assertTrue($this->object->loadInfo());
$this->assertEquals(

4
test/libraries/PMA_ConfigGenerator_test.php
View File

@ -49,7 +49,7 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
" * Generated configuration file\n" .
" * Generated by: phpMyAdmin " .
$GLOBALS['PMA_Config']->get('PMA_VERSION') . " setup script\n" .
" * Date: " . date(DATE_RFC1123) ."\n" .
" * Date: " . date(DATE_RFC1123) . "\n" .
" */\n\n",
$result
);
@ -84,7 +84,7 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
$method->setAccessible(true);
$this->assertEquals(
'$cfg[\'var_name\'] = 1;' ."\n",
'$cfg[\'var_name\'] = 1;' . "\n",
$method->invoke(null, 'var_name', 1, "\n")
);

26
test/libraries/PMA_Tracker_test.php
View File

@ -370,9 +370,9 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
'pma_test',
'pma_tbl',
'1',
'". $date ."',
'". $date ."',
'a:2:{s:7:\"COLUMNS\";a:2:{".
'" . $date . "',
'" . $date . "',
'a:2:{s:7:\"COLUMNS\";a:2:{" .
"i:0;a:3:{s:5:\"Field\";s:6:\"field1\";s:4:\"Type\";s:7:\"int(11)\";" .
"s:3:\"Key\";s:3:\"PRI\";}" .
"i:1;a:3:{s:5:\"Field\";s:6:\"field2\";s:4:\"Type\";s:4:\"text\";" .
@ -380,9 +380,9 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
"s:7:\"INDEXES\";a:1:{" .
"i:0;a:3:{s:5:\"Table\";s:7:\"pma_tbl\";s:5:\"Field\";s:6:\"field1\";" .
"s:3:\"Key\";s:7:\"PRIMARY\";}}}',
'# log ". $date ." pma_test_user" .
'# log " . $date . " pma_test_user" .
"\nDROP VIEW IF EXISTS `pma_tbl`;" .
"\n# log ". $date ." pma_test_user" .
"\n# log " . $date . " pma_test_user" .
"\n\n;" .
"\n',
'" .
@ -486,10 +486,10 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
'pma_test',
'',
'1',
'". $date ."',
'". $date ."',
'" . $date . "',
'" . $date . "',
'',
'# log ". $date ." pma_test_user" .
'# log " . $date . " pma_test_user" .
"\nSHOW DATABASES',
'" .
"\n',
@ -538,10 +538,10 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
->getMock();
$sql_query = " UPDATE pma_table_tracking SET `tracking_active` = " .
"'" . $new_state ."' " .
" WHERE `db_name` = '". $dbname ."' " .
" AND `table_name` = '". $tablename ."' " .
" AND `version` = '". $version ."' ";
"'" . $new_state . "' " .
" WHERE `db_name` = '" . $dbname . "' " .
" AND `table_name` = '" . $tablename . "' " .
" AND `version` = '" . $version . "' ";
$GLOBALS['controllink'] = null;
@ -775,7 +775,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
$sql_query = " SELECT * FROM `pma_db`.`tracking`" .
" WHERE `db_name` = 'pma''db' " .
" AND `table_name` = 'pma''table' " .
" AND `version` = '1.0' ".
" AND `version` = '1.0' " .
" ORDER BY `version` DESC LIMIT 1";
$GLOBALS['controllink'] = null;

2
test/libraries/PMA_mime_test.php
View File

@ -58,7 +58,7 @@ class PMA_MIME_Test extends PHPUnit_Framework_TestCase
'image/png'
),
array(
chr(0xff).chr(0xd8),
chr(0xff) . chr(0xd8),
'image/jpeg'
),
);

22
test/libraries/PMA_server_privileges_test.php
View File

@ -490,8 +490,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$db, $table, $username, $hostname
);
$sql = "SELECT * FROM `mysql`.`user`"
." WHERE `User` = '" . PMA_Util::sqlAddSlashes($username) . "'"
." AND `Host` = '" . PMA_Util::sqlAddSlashes($hostname) . "';";
. " WHERE `User` = '" . PMA_Util::sqlAddSlashes($username) . "'"
. " AND `Host` = '" . PMA_Util::sqlAddSlashes($hostname) . "';";
$this->assertEquals(
$sql,
$ret
@ -504,10 +504,10 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$db, $table, $username, $hostname
);
$sql = "SELECT * FROM `mysql`.`db`"
." WHERE `User` = '" . PMA_Util::sqlAddSlashes($username) . "'"
." AND `Host` = '" . PMA_Util::sqlAddSlashes($hostname) . "'"
." AND '" . PMA_Util::unescapeMysqlWildcards($db) . "'"
." LIKE `Db`;";
. " WHERE `User` = '" . PMA_Util::sqlAddSlashes($username) . "'"
. " AND `Host` = '" . PMA_Util::sqlAddSlashes($hostname) . "'"
. " AND '" . PMA_Util::unescapeMysqlWildcards($db) . "'"
. " LIKE `Db`;";
$this->assertEquals(
$sql,
$ret
@ -520,11 +520,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$db, $table, $username, $hostname
);
$sql = "SELECT `Table_priv`"
." FROM `mysql`.`tables_priv`"
." WHERE `User` = '" . PMA_Util::sqlAddSlashes($username) . "'"
." AND `Host` = '" . PMA_Util::sqlAddSlashes($hostname) . "'"
." AND `Db` = '" . PMA_Util::unescapeMysqlWildcards($db) . "'"
." AND `Table_name` = '" . PMA_Util::sqlAddSlashes($table) . "';";
. " FROM `mysql`.`tables_priv`"
. " WHERE `User` = '" . PMA_Util::sqlAddSlashes($username) . "'"
. " AND `Host` = '" . PMA_Util::sqlAddSlashes($hostname) . "'"
. " AND `Db` = '" . PMA_Util::unescapeMysqlWildcards($db) . "'"
. " AND `Table_name` = '" . PMA_Util::sqlAddSlashes($table) . "';";
$this->assertEquals(
$sql,
$ret

2
test/libraries/PMA_zip_extension_test.php
View File

@ -50,7 +50,7 @@ class PMA_ZipExtension_Test extends PHPUnit_Framework_TestCase
null,
array(
'error' => '',
'data' => 'TEST FILE'. "\n"
'data' => 'TEST FILE' . "\n"
)
),
array(

21
test/libraries/common/PMA_browseUploadFile_test.php
View File

@ -21,8 +21,10 @@ class PMA_GetBrowseUploadFileBlock_Test extends PHPUnit_Framework_TestCase
$GLOBALS['is_upload'] = false;
}
/*
/**
* Data provider for test
*
* @return array
*/
public function dataProvider()
{
@ -38,19 +40,28 @@ class PMA_GetBrowseUploadFileBlock_Test extends PHPUnit_Framework_TestCase
}
/**
* @dataProvider dataProvider
* Test for PMA_Util::getBrowseUploadFileBlock
*
* @param int $size Size
* @param string $unit Unit
* @param string $res Result
*
* @return void
*
* @dataProvider dataProvider
*/
function testBrowseUploadFile($size, $unit, $res)
{
$this->assertEquals(
PMA_Util::getBrowseUploadFileBlock($size),
'<label for="input_import_file">' . __("Browse your computer:") . '</label>'
'<label for="input_import_file">' . __("Browse your computer:")
. '</label>'
. '<div id="upload_form_status" style="display: none;"></div>'
. '<div id="upload_form_status_info" style="display: none;"></div>'
. '<input type="file" name="import_file" id="input_import_file" />'
. "(" . __('Max: '). $res . $unit .")" . "\n"
. '<input type="hidden" name="MAX_FILE_SIZE" value="' .$size . '" />' . "\n"
. "(" . __('Max: ') . $res . $unit . ")" . "\n"
. '<input type="hidden" name="MAX_FILE_SIZE" value="'
. $size . '" />' . "\n"
);
}
}

15
test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
View File

@ -16,8 +16,10 @@ require_once 'libraries/php-gettext/gettext.inc';
class PMA_GetFormattedMaximumUploadSize_Test extends PHPUnit_Framework_TestCase
{
/*
/**
* Data provider for test
*
* @return array
*/
public function dataProvider()
{
@ -33,13 +35,20 @@ class PMA_GetFormattedMaximumUploadSize_Test extends PHPUnit_Framework_TestCase
}
/**
* @dataProvider dataProvider
* Test for PMA_Util::getFormattedMaximumUploadSize
*
* @param int $size Size
* @param string $unit Unit
* @param string $res Result
*
* @return void
*
* @dataProvider dataProvider
*/
function testMaximumUploadSize($size, $unit, $res)
{
$this->assertEquals(
"(" . __('Max: '). $res . $unit .")",
"(" . __('Max: ') . $res . $unit . ")",
PMA_Util::getFormattedMaximumUploadSize($size)
);

11
test/libraries/core/PMA_headerLocation_test.php
View File

@ -213,17 +213,20 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
"<meta http-equiv=\"expires\" content=\"0\">\n" .
"<meta http-equiv=\"Pragma\" content=\"no-cache\">\n" .
"<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n" .
"<meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri_html . "\">\n" .
"<script type=\"text/javascript\">\n".
"<meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri_html
. "\">\n" .
"<script type=\"text/javascript\">\n" .
"//<![CDATA[\n" .
"setTimeout(\"window.location = unescape('\"" . $testUri_js . "\"')\", 2000);\n" .
"setTimeout(\"window.location = unescape('\"" . $testUri_js
. "\"')\", 2000);\n" .
"//]]>\n" .
"</script>\n" .
"</head>\n" .
"<body>\n" .
"<script type=\"text/javascript\">\n" .
"//<![CDATA[\n" .
"document.write('<p><a href=\"" . $testUri_html . "\">" . __('Go') . "</a></p>');\n" .
"document.write('<p><a href=\"" . $testUri_html . "\">"
. __('Go') . "</a></p>');\n" .
"//]]>\n" .
"</script></body></html>\n";

2
test/libraries/core/PMA_warnMissingExtension_test.php
View File

@ -61,7 +61,7 @@ class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
$warn = 'The <a href="' . PMA_getPHPDocLink('book.' . $ext . '.php')
. '" target="Documentation"><em>' . $ext
. '</em></a> extension is missing. Please check your PHP configuration.'
. ' ' .$extra;
. ' ' . $extra;
ob_start();
PMA_warnMissingExtension($ext, true, $extra);

4
test/selenium/PmaSeleniumCreateRemoveUserTest.php
View File

@ -88,10 +88,10 @@ class PmaSeleniumCreateRemoveUserTest extends PHPUnit_Extensions_Selenium2TestCa
$this->assertContains('You have added a new user', $success->text());
$el = $this->_helper->waitForElement("byId", "usersForm");
$temp = $this->_txtUsername."&amp;#27;localhost";
$temp = $this->_txtUsername . "&amp;#27;localhost";
$this->byXPath(
"(//input[@name='selected_usr[]'])[@value='".$temp."']"
"(//input[@name='selected_usr[]'])[@value='" . $temp . "']"
)->click();
$this->byId("checkbox_drop_users_db")->click();

2
test/selenium/PmaSeleniumDbEventsTest.php
View File

@ -81,7 +81,7 @@ class PmaSeleniumDbEventsTest extends PHPUnit_Extensions_Selenium2TestCase
$this->_helper->dbQuery(
"CREATE EVENT `test_event` ON SCHEDULE EVERY 2 MINUTE_SECOND STARTS "
. "'$start' ENDS '$end' ON COMPLETION NOT PRESERVE ENABLE "
. "DO UPDATE `". $this->_dbname. "`.`test_table` SET val = val + 1"
. "DO UPDATE `" . $this->_dbname . "`.`test_table` SET val = val + 1"
);
}

6
test/selenium/PmaSeleniumDbOperationsTest.php
View File

@ -106,7 +106,7 @@ class PmaSeleniumDbOperationsTest extends PHPUnit_Extensions_Selenium2TestCase
$this->assertEquals(1, $result->num_rows);
$result = $this->_helper->dbQuery(
"SHOW DATABASES LIKE '". $this->_dbname ."';"
"SHOW DATABASES LIKE '" . $this->_dbname . "';"
);
$this->assertEquals(0, $result->num_rows);
@ -127,8 +127,8 @@ class PmaSeleniumDbOperationsTest extends PHPUnit_Extensions_Selenium2TestCase
$this->_helper->waitForElement(
"byXPath",
"//div[@class='success' and contains(., 'Database " . $this->_dbname ." "
. "has been copied to pma_test_db_copy')]"
"//div[@class='success' and contains(., 'Database " . $this->_dbname
. " has been copied to pma_test_db_copy')]"
);
$result = $this->_helper->dbQuery(

2
test/selenium/PmaSeleniumExportTest.php
View File

@ -99,7 +99,7 @@ class PmaSeleniumExportTest extends PHPUnit_Extensions_Selenium2TestCase
$this->_helper->waitForElement("byLinkText", $this->_dbname)->click();
$this->_helper->waitForElement(
"byXPath",
"//a[@class='item' and contains(., 'Database: ". $this->_dbname ."')]"
"//a[@class='item' and contains(., 'Database: " . $this->_dbname . "')]"
);
$text = $this->_doExport('db', $plugin);

4
test/selenium/PmaSeleniumImportTest.php
View File

@ -82,7 +82,7 @@ class PmaSeleniumImportTest extends PHPUnit_Extensions_Selenium2TestCase
$this->_helper->waitForElement("byLinkText", $this->_dbname)->click();
$this->_helper->waitForElement(
"byXPath",
"//a[@class='item' and contains(., 'Database: ". $this->_dbname ."')]"
"//a[@class='item' and contains(., 'Database: " . $this->_dbname . "')]"
);
$this->_doImport("db");
@ -111,7 +111,7 @@ class PmaSeleniumImportTest extends PHPUnit_Extensions_Selenium2TestCase
$this->_helper->waitForElement("byLinkText", $this->_dbname)->click();
$this->_helper->waitForElement(
"byXPath",
"//a[@class='item' and contains(., 'Database: ". $this->_dbname ."')]"
"//a[@class='item' and contains(., 'Database: " . $this->_dbname . "')]"
);
// got to table page

2
test/selenium/PmaSeleniumTrackingTest.php
View File

@ -74,7 +74,7 @@ class PmaSeleniumTrackingTest extends PHPUnit_Extensions_Selenium2TestCase
$this->byLinkText($this->_dbname)->click();
$this->_helper->waitForElement(
"byXPath",
"//a[@class='item' and contains(., 'Database: ". $this->_dbname ."')]"
"//a[@class='item' and contains(., 'Database: " . $this->_dbname . "')]"
);
$ele = $this->byLinkText("More");
$this->moveto($ele);

8
test/theme.php
View File

@ -45,9 +45,9 @@ header('Content-Type: text/html; charset=utf-8');
$separator = '<span class=\'separator item\'>&nbsp;»</span>' . "\n";
$item = '<a href="%1$s?%2$s" class="item">'
.' <img class="icon %5$s" src="../themes/dot.gif"'
.' width="16" height="16" alt="" /> ' . "\n"
.'%4$s: %3$s</a>' . "\n";
. ' <img class="icon %5$s" src="../themes/dot.gif"'
. ' width="16" height="16" alt="" /> ' . "\n"
. '%4$s: %3$s</a>' . "\n";
echo '<div id="serverinfo">' . "\n";
printf(
@ -84,7 +84,7 @@ printf(
);
echo '<span class="table_comment" id="span_table_comment">'
.'&quot;Table comment&quot;</span>' . "\n";
. '&quot;Table comment&quot;</span>' . "\n";
echo '</div>';