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

2798 Commits

Author SHA1 Message Date
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
Madhura Jayaratne
1c7282b859 Merge branch 'QA_4_5' 
Conflicts:
	test/classes/plugin/export/ExportSqlTest.php
 2015-12-11 19:26:26 +11:00
Madhura Jayaratne
968bfd354c Fix broken tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 19:18:53 +11:00
Madhura Jayaratne
6016b64836 Loosen some assertions. We are tying to prevent calls to dbi. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:15:00 +11:00
Madhura Jayaratne
76a416283a Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:07:46 +11: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
a24e96275e Fix more tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 08:17:38 +11:00
Madhura Jayaratne
19f86d9df6 Fix more tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 07:29:27 +11:00
Madhura Jayaratne
22d2e1e437 Add back dbi mocking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 07:09:30 +11: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
Michal Čihař
2248ec64b6 Remove unused variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-02 09:21:29 +01:00
Madhura Jayaratne
36ddd9c670 Merge branch 'QA_4_5' 
Conflicts:
	libraries/Table.php
 2015-12-02 10:45:06 +11:00
Madhura Jayaratne
fcc89aa203 Fix - exclude db name in SQL when relations are made between table in the same db 
To prevent replication from breaking when replicating to a db with different name

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 10:35:49 +11: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
Madhura Jayaratne
1124d70b71 Fix import test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 07:26:58 +11:00
Madhura Jayaratne
484f26a434 Was invoking wrong method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 07:08:54 +11:00
Madhura Jayaratne
e60853adee This method no longer exists 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 07:04:22 +11:00
Madhura Jayaratne
34b03a3494 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-12-02 06:52:36 +11:00
Madhura Jayaratne
26e96680f4 Fix some test failures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 06:51:54 +11:00
Marc Delisle
45284ed3ad Fix assertion 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 11:05:47 -05:00
Michal Čihař
353b59fe37 Add missing parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 16:58:46 +01:00
Michal Čihař
c3ed799ee5 Fix testcase 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 16:57:18 +01:00
Marc Delisle
77abaa32f1 Fix unit tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 10:49:00 -05:00
Marc Delisle
23d78658d7 Fix unit tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 10:14:35 -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
Michal Čihař
2572a35dba Fix controller name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:39:32 +01:00
Michal Čihař
6c2474ad35 Avoid duplicate test class name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:25:14 +01:00
Michal Čihař
ecabc91424 Fix export plugin testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:25:05 +01:00
Michal Čihař
8ebfeb25a0 Fix includes in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:22:28 +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
Madhura Jayaratne
b8c992035e Prefix private variables with underscore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:59:12 +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
ba8859d7df Merge branch 'master' into refactor 
Conflicts:
	db_create.php
 2015-11-24 21:07:09 +11:00
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
3cf75085d6 Merge pull request #11676 from madhuracj/refactor 
Refactoring server databases page
 2015-11-24 08:56:43 +11:00