Commit Graph

1615 Commits

Author SHA1 Message Date
Michal Čihař
7cea5eb9af Replace our mbstring polyfills with symfony/polyfill-mbstring
The symfony/polyfill-mbstring is anyway pulled in through Twig, so this
doesn't add additional dependencies.

Fixes #12386

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-17 10:03:30 +02:00
Michal Čihař
e788bc2299 Merge pull request #13260 from nijel/advisor-eval
Replace eval() in Advisor by Symfony\ExpressionLanguage
2017-05-16 16:50:23 +02:00
Michal Čihař
ae5ca6e756 Merge pull request #13261 from nijel/theme-metadata
Rewrite theme metadata handling
2017-05-16 15:15:48 +02:00
Michal Čihař
b8087ce80d Add more complex advisor test
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-16 15:13:40 +02:00
Michal Čihař
262e22613c Complete test coverage for ADVISOR_bytime
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-16 15:06:53 +02:00
Michal Čihař
d568c25921 Use JSON for theme metadata
- it allows processing without need to interpret PHP code
- it makes it easier to structure the information
- include supported version info (fixes #13167)
- include author name and URL (fixes https://github.com/phpmyadmin/website/issues/57)

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-15 09:47:15 +02:00
Michal Čihař
941e861aba Define major version
This will be later used as compatiblity check for themes.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-15 09:47:15 +02:00
Michal Čihař
bb26e2e0d9 Remove deprecated variables
These should not be used for few years.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-15 09:47:15 +02:00
Michal Čihař
93d1924179 Fix name of Advisor::byTime
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-15 09:44:58 +02:00
Michal Čihař
1c70ed49cb Move advisor helpers to the Advisor class
They no longer need to pollute global namespace as they are used only in
context of ExpressionLanguage.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-15 09:44:01 +02:00
Michal Čihař
f13476f454 Replace eval() by Symfony\ExpressionLanguage
This is already used by motranslator, so it doed not bring extra
dependency and we get rid of the eval() call.

Fixes #6363

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-15 09:44:01 +02:00
Michal Čihař
b8c4ca9cdd Add tests for advisor functions
We need to ensure these work correctly when refactoring the code.

Issue #6363

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-15 09:44:01 +02:00
Maurício Meneghini Fauth
113c120088 Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-05-12 01:26:49 -03:00
Michal Čihař
6b45f57e45 Merge branch 'QA_4_7' 2017-05-09 15:05:06 +02:00
Michal Čihař
61b9418f67 Add tests for Amazon RDS
Issue #13258

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-09 15:02:13 +02:00
Michal Čihař
b7668cd442 Merge pull request #13192 from mauriciofauth/fix/coding-standard
Fix errors detected by PHP_CodeSniffer
2017-05-05 11:11:53 +02:00
Maurício Meneghini Fauth
bd73df573c Rename MrgMyisamTest and TablePropertyTest
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-05-04 19:49:57 -03:00
Maurício Meneghini Fauth
0e236f43bf Rename export plugins helpers
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-05-04 19:33:55 -03:00
Michal Čihař
0ab13fbec2 Merge branch 'QA_4_7' 2017-05-04 12:44:52 +02:00
Michal Čihař
031d379bdc Rewite collation naming code
Rewritten to use level based parser instead of hardcoding ordering. This
is necessary as MySQL charset naming got even more complex with MySQL
8.0.

Fixes #13216

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-28 16:04:27 +02:00
Michal Čihař
d53d541307 Merge branch 'QA_4_7' 2017-04-28 16:02:33 +02:00
Michal Čihař
8d6b1dce57 Improved handling of logout with disabled LoginCookieDeleteAll
- avoid removing session for cookie auth if LoginCookieDeleteAll is
  disabled
- redirect user to other server rather than to login page
- show message about partial logout
- adjust tests
- this is based on #13221

Fixes #12301

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-28 16:02:11 +02:00
Maurício Meneghini Fauth
290b183d03 Fix errors detected by PHP_CodeSniffer
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-04-15 00:05:19 -03:00
Michal Čihař
34795cd742 Do not use intdiv() it's PHP 7 only
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-11 17:37:04 +02:00
Michal Čihař
e4d7a80f63 Separate version string to text conversion and test it
See https://github.com/phpmyadmin/docker/issues/118

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-11 16:38:05 +02:00
Michal Čihař
90688be99a Merge pull request #13112 from nijel/search
Improved database search to allow search for exact phrase match
2017-04-10 13:02:51 +02:00
Maurício Meneghini Fauth
44d56123ba Add support for pgettext
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-03-30 14:01:34 -03:00
Michal Čihař
4179690250 Improved database search to allow search for exact phrase match
Add option to search exact phrase as substring, what was currently
missing.

While doing that, also improve testsuite for generating the clauses.

Fixes #12388

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-27 12:02:29 +02:00
Maurício Meneghini Fauth
a2d64b8bda Add requested changes and add more tests
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-03-25 15:22:02 -03:00
Maurício Meneghini Fauth
7b0334185b Merge branch 'master' into twig-template
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-03-25 11:50:43 -03:00
Michal Čihař
e9b3171613 Merge pull request #13116 from mauriciofauth/fix/coding-standard
Fix coding standard errors using vendor/bin/phpcbf
2017-03-22 09:27:02 +01:00
Maurício Meneghini Fauth
29a773ed67 Implement PSR-11
Implement PSR-11 to container interface with tests.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-03-22 09:24:53 +01:00
Maurício Meneghini Fauth
5366c507a5 Fix coding standard errors using vendor/bin/phpcbf
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-03-21 23:16:32 -03:00
Michal Čihař
159e748a2b Simplify getting table create options
- use saner method name (getCreateOptions)
- fix error case

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
a51ac4ef8b Simplify getting row format
- remove not needed word Table from method name
- fix code to handle errors
- convert existing users of getStatusInfo('ROW_FORMAT') to this method

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
44d3cb3869 Simplify getting table collation
- remove not needed word Table from method name
- fix code to handle errors

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
b2bf9fba87 Simplify getting table comment
- remove not needed word Show from method name
- fix code to handle errors

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
56046cc7e2 Simplify getting storage engine
- remove not needed word Table from method name
- fix code to handle errors
- convert existing users of getStatusInfo('ENGINE') to this method

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
9f2773c9c2 Simplify rereading of information
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:55:38 +01:00
Vishal Pandey
5da44ce1a6 Move the tbl_info.inc.php code to Table class
Fixes #12567

Signed-off-by: flash1452 <vishpandey2014@gmail.com>
2017-03-20 17:55:21 +01:00
Maurício Meneghini Fauth
53f93afe0c Add test for gettext
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-03-20 09:27:15 -03:00
Maurício Meneghini Fauth
4bbe23f1df Improve TemplateTest
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-03-19 18:00:24 -03:00
Michal Čihař
0700cee6e3 Merge pull request #13024 from nijel/remove-unused-auth-code
Remove no longer needed code in authentication
2017-03-16 15:50:46 +01:00
Osaid Rehman Nasir
7c22af6d78 Added change password test
Issue #12393

Signed-off-by: osaid <osaid.nasir@gmail.com>
2017-03-16 15:49:14 +01:00
Michal Čihař
1dd118d275 Offer login as different user on access denied from MySQL
Fixes #13087

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-16 14:40:55 +01:00
Michal Čihař
2d8b8a8b60 Merge branch 'QA_4_7' 2017-03-06 14:50:57 +01:00
Michal Čihař
a6a917e262 Remove github from tests
We no longer access it directly.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-06 13:42:48 +01:00
Michal Čihař
7d8b1de6ee Merge commit 'f3b44765eca8f3634f3a2574a678f5c503f2335b' 2017-03-02 14:31:12 +01:00
Michal Čihař
ce9ca75555 Avoid skipping tests on hhvm
They seems to be quite slow on later versions, but work.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-02 10:20:22 +01:00
Michal Čihař
12f7f6a785 Merge branch 'QA_4_7' 2017-03-01 10:54:44 +01:00