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

1224 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
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
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
ffc4422db7 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-19 20:33:21 +02:00
Madhura Jayaratne
91883526bd Merge pull request #11582 from madhuracj/tests 
Rename test classes
 2015-10-16 23:02:32 +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
3ef4a744c6 Fix more failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-16 19:16:00 +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
df813fb312 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-16 18:09:56 +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
Marc Delisle
da5e605ba7 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-15 12:26:17 -04:00
Deven Bansod
19f1536a1c Fixed error in PR : 11569 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-16 02:55:07 +05:30
Marc Delisle
fd6ed157a9 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-10 15:28:14 -04:00
Deven Bansod
31d19c4cf7 Fix #11520 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-11 05:29:50 +05:30
Hugues Peccatte
0bc489bfd9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-07 20:22:26 +02:00
Marc Delisle
b239793429 Clarify function name 
Clarify variable name

Remove duplicate test

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-07 11:02:34 -04:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Hugues Peccatte
e99ac906e1 Move classes in new files. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 22:22:06 +02:00
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Madhura Jayaratne
45c05e3ad6 Fix coding style violations related to function calls 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:00:47 +10:00
Hugues Peccatte
5f17b32689 Set namespaces on engines classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-20 22:28:45 +02:00
Hugues Peccatte
00e743eb32 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-20 13:25:34 +02:00
Hugues Peccatte
37bf6f2093 Update nodes load. 
Fix template call.
Remove useless 'use'.
Fix node load.
Fix merge.
Attempt to fix transformation unit test.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-20 00:21:28 +02:00
Hugues Peccatte
5a7d7fb3ab Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-19 23:06:01 +02:00
Hugues Peccatte
f392430423 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-19 19:22:34 +02:00