Commit Graph

113 Commits

Author SHA1 Message Date
Piyush Vijay
5f4db91d71
Resolve merge conflicts and add tbl import and export in modular code
Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>
2018-08-19 15:29:58 +05:30
Maurício Meneghini Fauth
285e38e931 Fix some PSR-2 coding standard errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-30 09:07:56 -03:00
Maurício Meneghini Fauth
b9c0463d96 Use short array syntax instead of long array syntax
Replaces array() with [].

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-30 01:42:21 -03:00
Maurício Meneghini Fauth
af148ad92b Enable strict mode in PHP files
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-16 04:36:04 -03:00
Maurício Meneghini Fauth
d98658187a Replace PhpMyAdmin\Relation static calls
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-25 19:32:13 -03:00
Maurício Meneghini Fauth
f45d4a566b Refactor PhpMyAdmin\Display\Export class
The static methods are replaced with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-13 23:51:16 -02:00
Michal Čihař
94bb2e31a1 Remove no longer needed page_settings.forms.php and user_preferences.forms.php
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:04:47 +02:00
Maurício Meneghini Fauth
43ff4566d0 Refactor display_export to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-04 10:15:47 -03:00
Maurício Meneghini Fauth
e2c83b954b Refactor relation functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-22 20:51:27 -03:00
Maurício Meneghini Fauth
5e7f6a1bab Move config classes to PhpMyAdmin namespace
- Move ConfigFile to PhpMyAdmin namespace
- Move FormDisplay to PhpMyAdmin namespace
- Move Form to PhpMyAdmin namespace
- Move PageSettings to PhpMyAdmin namespace
- Move ServerConfigChecks to PhpMyAdmin namespace
- Move Validator to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-09 15:16:37 -03:00
Maurício Meneghini Fauth
ca910e8de8 Move classes to PhpMyAdmin namespace
- Move Table to PhpMyAdmin namespace
- Move Template to PhpMyAdmin namespace
- Move ThemeManager to PhpMyAdmin namespace
- Move Theme to PhpMyAdmin namespace
- Move Tracker to PhpMyAdmin namespace
- Move Transformations to PhpMyAdmin namespace
- Move TypesMySQL to PhpMyAdmin namespace
- Move Types to PhpMyAdmin namespace
- Move Util to PhpMyAdmin namespace
- Move VersionInformation to PhpMyAdmin namespace
- Move Url to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-08 10:54:21 -03:00
Maurício Meneghini Fauth
119563b7ea Move classes to PhpMyAdmin namespace
- Move OpenDocument to PhpMyAdmin namespace
- Move OutputBuffering to PhpMyAdmin namespace
- Move Partition to PhpMyAdmin namespace
- Move Pdf class to PhpMyAdmin namespace
- Move RecentFavoriteTable to PhpMyAdmin namespace
- Move Response to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 23:44:10 -03:00
Maurício Meneghini Fauth
54a15dbd9c Move classes to PhpMyAdmin namespace
- Move Logging to PhpMyAdmin namespace
- Move Menu to PhpMyAdmin namespace
- Move Message to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 13:30:04 -03: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
Michal Čihař
27fb0b58af Merge branch 'QA_4_6'
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-01-23 14:07:29 +01:00
Michal Čihař
e4bf536906 Update to SQL Parser 4.0.1
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-01-23 13:56:35 +01:00
Michal Čihař
308c9d7951 Simplify Response object handling
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-07 18:17:59 +01:00
Deven Bansod
ff91dc93f4 Merge branch 'QA_4_6' 2016-10-05 17:43:04 +05:30
Deven Bansod
9ceb237dd6 Don't append FROM clause for replacing in UNION statements
If global statement has atleast one union, it should not have a FROM.

Fix #12619

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-10-05 17:38:23 +05:30
Deven Bansod
d6571ef86c Merge branch 'QA_4_6'
Conflicts:
	po/sk.po
2016-09-28 20:09:45 +05:30
Deven Bansod
59cd9bf3a1 Replace FROM clause aliases only if FROM clause is present
Fix #12579

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-09-28 19:27:35 +05:30
Deven Bansod
3b227209a1 Make phpcs happy
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-03-22 11:50:22 +05:30
Marc Delisle
0a9bdc1619 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-13 19:41:55 -05:00
Achilles-96
4b8983028a Fixes #11679
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
2015-12-14 00:31:09 +05:30
Marc Delisle
e02542d0ba Refactor handling of export template actions
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-21 06:50:41 -05:00
Hugues Peccatte
ffc4422db7 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-19 20:33:21 +02: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
bd0d2b79db Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-01 18:19:18 +02:00
Marc Delisle
d951b9d133 Merge branch 'QA_4_5' 2015-10-01 09:49:52 -04:00
Dan Ungureanu
ce6c465d15 Fixes #11509, #11512, #11518.
Updated sql-parser library to udan11/sql-parser@2f5d2daabb (v2.1.1).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-10-01 16:22:37 +03:00
Hugues Peccatte
3bf856e4c4 Merge branch 'master' into useNamespaces_master 2015-09-13 15:53:04 +02:00
Hugues Peccatte
fa801c507f Set namespace on plugins classes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 12:51:45 +02:00
Marc Delisle
a2c009e670 Remove duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-12 06:25:36 -04:00
Hugues Peccatte
b92491d799 Merge branch 'master' into useNamespaces_master 2015-09-12 00:53:39 +02:00
Marc Delisle
77c0d66a1b Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-11 13:37:54 -04:00
Marc Delisle
27e54fb194 Refactor to remove display_export.inc.php
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-11 11:44:26 -04:00
Hugues Peccatte
e6c142bc56 Add missing require.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-06 12:44:03 +02:00
Hugues Peccatte
6f84933a00 Add missing require.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-06 01:20:11 +02:00
Hugues Peccatte
e5e447e937 Set namespace on config classes.
Update config classes.
Add @noinspection tag.
Update documentation and script.
Set ConfigGenerator in a namespace.
Rename ConfigGenerator filename.
Remove ConfigGenerator requires.
Fix namespaces of mock objects.
Remove useless require.
Add missing 'use'.
Add missing require.
Update PHPDoc.
Fix class test typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:23 +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
Hugues Peccatte
bf61709259 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-07-23 14:38:07 +02:00
Madhura Jayaratne
8c19eedca1 Use correct name format
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-17 14:11:19 +05:30
Dan Ungureanu
2dfc29df4a Updated sql-parser library to udan11/sql-parser@5278427.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:19 +03:00
Dan Ungureanu
51876a097c Coding style fixes.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:17 +03:00
Dan Ungureanu
11f42cd80e Using the new parser for exporting.
Updated sql-parser library to udan11/sql-parser@06c0a64.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:17 +03:00
Madhura Jayaratne
f0664e7875 This is an internal directive. Use without underscore to match other similar ones
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-09 17:12:21 +05:30
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-09 17:06:28 +05:30
Madhura Jayaratne
c987104160 Make scrutinizer happy
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-06 12:09:04 +05:30
Madhura Jayaratne
4ab83556c6 Allow using templates created for other databases/tables
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-02 21:04:02 +05:30