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

1188 Commits

Author SHA1 Message Date
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
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ř
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
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
23d78658d7 Fix unit tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 10:14:35 -05: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
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
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
3cf75085d6 Merge pull request #11676 from madhuracj/refactor 
Refactoring server databases page
 2015-11-24 08:56:43 +11:00
Madhura Jayaratne
62dac7ff0f Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 08:35:12 +11:00
Hugues Peccatte
54053550fd Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-21 15:04:31 +01:00
Madhura Jayaratne
2fb291bbb0 Move packages for better organization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 12:29:00 +11:00
Madhura Jayaratne
8c1ed92460 Move to a sub package for better organization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 10:49:32 +11:00
Madhura Jayaratne
272fb20923 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-17 21:16:20 +11:00
Hugues Peccatte
0e5de28eaa Remove side effects in declaration files. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-15 17:31:53 +01:00
Hugues Peccatte
0929268592 Fix missing namespace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 17:02:08 +01:00
Madhura Jayaratne
a701078e00 Move the controller to appropriate package 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-03 13:25:17 +11:00
Madhura Jayaratne
5087a2d2b1 Merge branch 'QA_4_5' 2015-10-26 19:23:37 +11:00
Madhura Jayaratne
5ca47d209b Search clause is also a part of the query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 19:14:12 +11:00
Madhura Jayaratne
02a266e9b2 Consistent spacing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:26:19 +11:00
Madhura Jayaratne
358e001382 Merge branch 'QA_4_5' 2015-10-26 17:22:20 +11:00
Madhura Jayaratne
2e3ed069c6 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:06:04 +11:00
Madhura Jayaratne
23c4e00c84 Rename more class related tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-16 19:42:09 +11:00
Madhura Jayaratne
a19c8a2e83 Remove tab characters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-16 18:24:51 +11:00
Madhura Jayaratne
1043a36f8f More tests for classes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-16 18:09:41 +11:00
Madhura Jayaratne
ab49273856 Rename test classes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-15 20:57:27 +11:00
Hugues Peccatte
f34e84d635 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-06 20:51:59 +02:00