Commit Graph

88 Commits

Author SHA1 Message Date
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
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
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
00e743eb32 Fix unit test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-20 13:25:34 +02:00
Hugues Peccatte
72dd9426ef Add require needed to get GLOBALS.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-09 22:16:12 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Marc Delisle
337658a927 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-08 11:38:50 -04:00
Madhura Jayaratne
785f4e2711 Fix reCaptcha bypass
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-08 07:13:24 +10:00
Hugues Peccatte
79439963cd Skipping unit test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-05 23:58:16 +02:00
Hugues Peccatte
04b4f723d8 Move libraries/plugins/auth and export classes into a namespace.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-05 00:09:30 +02:00
Hugues Peccatte
7f8f34e89d Remove classes require_once.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:22 +02:00
Hugues Peccatte
58b10807c8 Rename classes files.
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:22 +02:00
Hugues Peccatte
0761fb1801 Rename classes files.
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:21 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes.
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:22:52 +02:00
Madhura Jayaratne
473d9ba54a For tests MySQL version is defined as 5.50. So document links will get point to the latest, which is 5.7 now
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-20 09:54:02 +05:30
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-19 00:18:38 +03:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-13 04:41:54 +05:30
Madhura Jayaratne
6a6ed5d5dc Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 15:45:27 +05:30
Marc Delisle
d3338edf87 phpunit 4.2: assertTag is deprecated
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-05 10:04:11 -04:00
Marc Delisle
069a2a09e7 phpunit 4.2: assertTag is deprecated
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-05 09:18:18 -04:00
Madhura Jayaratne
9f1f0e6bc1 Per server iv
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-16 08:34:40 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Madhura Jayaratne
1f630a1a97 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 14:02:34 +05:30
Madhura Jayaratne
743a528835 rfe #1590 Recaptcha API v2
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-08 15:49:24 +05:30
Marc Delisle
4e8737ff2c Merge branch 'QA_4_3' 2014-12-26 08:29:32 -05:00
Marc Delisle
38bb19ffb6 bug #4655 Undefined index: collation_connection
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-26 08:29:09 -05:00
Michal Čihař
680352b372 Merge branch 'MAINT_4_3_0' into QA_4_3
Conflicts:
	README
	doc/conf.py
	libraries/Config.class.php
2014-12-04 09:14:02 +01:00
Michal Čihař
ccc239040f Adjust testcase to new split methods
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
2014-12-04 09:12:48 +01:00
Michal Čihař
f9dc6be7e6 Add missing call to test
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-04 09:12:05 +01:00
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Marc Delisle
20d0f08c58 Deactivate this test for now
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-03 09:00:45 -05:00
Michal Čihař
2502375982 Add missing call to test
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-01 11:56:19 +01:00
Michal Čihař
baa922e902 Define missing variable
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-01 10:43:03 +01:00
Michal Čihař
94baaba666 Adjust testcase to new split methods
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-01 10:42:11 +01:00
Madhura Jayaratne
b92d3e1047 Workaround for token mismatch error on server session timeout for config and http authentication types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-28 10:56:28 +05:30
Marc Delisle
6f8a253daf Merge pull request #1407 from madhuracj/tokenMismatch
Workaround for token mismatch error on server session timeout for config and http authentication types
2014-11-26 07:42:46 -05:00
Madhura Jayaratne
783cacbd1e Workaround for token mismatch error on server session timeout for config and http authentication types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-20 17:37:39 +05:30
Michal Čihař
c11efb678d This is binary string, can not use mb_strlen
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-11-20 10:28:53 +01:00
Robert Scheck
491c426623 Patch by Robert Scheck <robert@fedoraproject.org> for phpMyAdmin 4.2.6
which enhances cookie encryption/decryption by the optional usage of
PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux
distributions however PHP OpenSSL is often enabled by default.
PHP < 5.3.4 does not support passing an IV, thus this has been added as
a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish
(even it is fast) is seen by experts as weaker algorithm than
AES. If this should be a show-stopper for upstream merging just replace
'AES-128-CBC' by 'BF-CBC', please.

Patch adapted for 4.3.x and tests modified by Marc Delisle

Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-19 07:38:32 -05:00
Hugues Peccatte
42e0bdd47a Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 18:32:42 +01:00
Hugues Peccatte
74f0beda8f Fix syntax error.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 20:56:12 +02:00
Madhura Jayaratne
aaa2116b01 Fix some of the failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-18 21:59:33 +05:30
Hugues Peccatte
0ee7063220 Replace PMA_String calls by mb_* calls in tests.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-29 18:52:54 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Hugues Peccatte
4960f208e2 Add PHPDoc.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-08-30 21:14:30 +02:00
Hugues Peccatte
8558047094 Coding style modifications.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-08-09 23:21:13 +02:00
Michal Čihař
6be21dcb47 Merge pull request #1251 from WhaleWatching/console
PMA console, history and bookmarks.
2014-06-25 15:37:29 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks.
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
2014-06-25 21:22:33 +08:00
Michal Čihař
dca981481d Remove plugin manager and observer classes
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-25 09:25:59 +02:00