gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,815 Commits 12 Branches 481 Tags 2.4 GiB
d0d29c048d
Commit Graph

1249 Commits

Author SHA1 Message Date
Michal Čihař
ed96969ff9 Merge branch 'QA_4_5' 2016-01-28 09:23:27 +01:00
Michal Čihař
0cade5712a Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:19:07 +01:00
Atul Pratap Singh
dd0882a3f8 Fix test cases 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-22 22:27:14 +05:30
Michal Čihař
59036e1562 Simplify test to avoid need fo multiline regexp 
Cherry picked from master to avoid test suite failures on PHP 7.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:59:14 +01:00
Deven Bansod
35cb1d28b0 Refactor check_user_privileges.lib.php and add test cases for 2 functions in it 
Remove overloads

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-15 20:35:43 +05:30
Michal Čihař
b450e58dbb Remove require of libraries included in test bootstrap 
There is no need to specify them in every test when we already do it
globally.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 16:43:16 +01:00
Michal Čihař
908c44c027 Remove no longer used variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:51:08 +01:00
Michal Čihař
19f9e830eb Remove no longer needed code for language selection 
Issue #11847

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:51:08 +01:00
Madhura Jayaratne
614b7d55ab Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 20:16:27 +11:00
Marc Delisle
cc0b6497c0 Fix unit tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-10 07:38:48 -05:00
Marc Delisle
6089849fcc Merge commit '66d7c50bee6986c5ff308bca288c01b673a2f69f' 2016-01-10 07:30:26 -05:00
Achilles-96
66d7c50bee Fixes #11796 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-01-10 14:48:39 +05:30
Michal Čihař
79afd62136 Simplify test to avoid need fo multiline regexp 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-06 11:59:03 +01:00
Michal Čihař
047aeca312 Add missing escaping to regexp 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-06 11:41:03 +01:00
Michal Čihař
20c74d2124 Consistent parameter type docs (number -> integer) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 17:13:53 +01:00
Michal Čihař
d6546473c0 Add basic test for js messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:37:24 +01:00
Michal Čihař
e1c9dec998 Merge commit '912f96114dc803404e2854ebb5796757a4eeedb6' 2016-01-05 08:21:32 +01:00
Michal Čihař
c197c3fba5 Fix handling of databases with dot in a name 
We do not need to concatenate and parse the items, the cache backend
accepts array directly.

Fixes #11798

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 17:06:58 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Marc Delisle
911f8274c7 Clarify class and variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-31 08:09:47 -05:00
Michal Čihař
d67066b9cc Add test for PMA_getJsValue with string 
Issue #11783

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-27 10:15:31 +01:00
Michal Čihař
cc07b737dc Remove unused PMA_String class 
The class is no longer used:

- the ctype part is not needed by new SQL parser
- the utf-8 manipulation was replaced by direct usage of mbstring

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 12:09:06 +01:00
Deven Bansod
52c637b383 Merge branch 'QA_4_5' 
Conflicts:
	libraries/mysql_charsets.lib.php
	po/de.po
	po/el.po
	po/et.po
	po/nl.po
	po/tr.po
	test/classes/TableTest.php
	test/libraries/PMA_mysql_charsets_test.php
 2015-12-18 20:18:10 +05:30
Deven Bansod
a4f02ca28f Fix #11757 : Export and preview show different SQL for character set 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 19:03:24 +05:30
Madhura Jayaratne
a624f09e24 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:49:23 +11:00
Hugues Peccatte
eda2816c70 Replace font tags by span. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:04:12 +01:00
Michal Čihař
3565e4db79 Remove PMA_arrayMergeRecursive 
It can be replaced with array_replace_recursive as of PHP 5.3, we
require PHP 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:06:00 +01:00
Michal Čihař
95d10b8c1f Remove PMA_prettyPrint 
It is no longer needed as JSON_PRETTY_PRINT is there since PHP 5.4 (and
we require 5.5).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:54:36 +01:00
Michal Čihař
06bb1e67f2 Remove PMA_arrayWalkRecursive 
For the single remaining use case native array_walk_recursive is good
enoug.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:42:13 +01:00
Madhura Jayaratne
f22cfdf076 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 11:06:36 +11:00
Michal Čihař
db5c3b970a Merge branch 'QA_4_5' 2015-12-07 16:10:07 +01:00
Michal Čihař
1c5304f95b Fix RTN tests for new escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:08:36 +01:00
Michal Čihař
8681ef6b74 Fix tracker tests for new escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:06:19 +01:00
Michal Čihař
2ac36ddb8f Merge branch 'QA_4_5' 2015-12-07 16:01:55 +01:00
Michal Čihař
fe135a5206 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:00:46 +01:00
Michal Čihař
22b065f670 Add missing require 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:00:18 +01:00
Michal Čihař
b94318c4cd Merge branch 'QA_4_5' 2015-12-07 15:37:08 +01:00
Michal Čihař
8742209c63 Fix single quote export for servers in ANSI_QUOTES mode 
It is possible to escape ' inside '' as both '' and \'. However using ''
is MySQL extension and does not work in ANSI mode. We need to generate
compatible exports in this case, so sticking with \' is safer.

Fixes #11721

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 15:33:37 +01:00
Marc Delisle
d9bec7f085 HTML line break shown after a MySQL connection error message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:02:07 -05:00
Madhura Jayaratne
50325e58e8 We cannot guarantee that this input will be included. 
It is included only once and is controlled by a static variable.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 07:50:48 +11:00
Marc Delisle
77abaa32f1 Fix unit tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 10:49:00 -05:00
Michal Čihař
9744ac5e53 Populate privs cache prior to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:44:06 +01:00
Marc Delisle
ab7942be89 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-29 07:29:32 -05:00
Madhura Jayaratne
a9bccec802 Fix tests broken due to change in test execution order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 22:47:34 +11:00
Madhura Jayaratne
c7297bf533 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 20:25:32 +11:00
Deven Bansod
107f054ed6 Merge branch 'QA_4_5' 
Conflicts:
	libraries/server_privileges.lib.php
	po/pt_BR.po
	user_password.php
 2015-11-26 14:40:25 +05:30
Deven Bansod
d55abcd5ff Fix issue 11684 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-24 15:46:50 +05:30
Madhura Jayaratne
8e282a3f6e Merge build_html_for_db.lib.php into ServerDatabasesController 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:56:04 +11:00
Madhura Jayaratne
0a2b037706 merge db_create.php into ServerDatabasesController 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:41:40 +11:00
Madhura Jayaratne
62dac7ff0f Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 08:35:12 +11:00