Commit Graph

99 Commits

Author SHA1 Message Date
Gabriel Caruso
f28a60ea15 Use Null Coalesce Operator
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2019-04-19 21:58:21 -03:00
William Desportes
caa2035cc8
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-04-07 15:55:46 +02:00
William Desportes
bccfdb1407
Merge branch 'QA_4_8'
- Fixed code style issues
- Merged QA_4_8 branch

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-04-04 22:52:49 +02:00
Agha Saad Fraz
5bc29b86d0
Fix placement inconsistency of Export/Import tabs
Signed-off-by: Agha Saad Fraz <agha.saad04@gmail.com>
I have moved the array element Import and placed it after the Export element.
2019-04-05 00:32:53 +05:00
Saurabh Srivastava
d792bc68a2 Fix #15119 - Uninterpreted HTML on Settings->Export page
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
2019-03-30 18:58:39 +05:30
Nupur Agrawal
b09d9565df Deleted redundant help/tool tip on page settings (#15061)
Removed redundant help/tool tip in page settings "Query history length" area.

Fixes issue #15029

Signed-off-by: Nupur Agrawal <nupur202000@gmail.com>
2019-03-24 19:31:58 -04:00
Maurício Meneghini Fauth
aa0796c7db Move special_schema_links.inc.php to Config\SpecialSchemaLinks
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-03-22 21:29:58 -03:00
Isaac Bennetch
704f96fc31 Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-03-20 11:24:31 -04:00
Isaac Bennetch
5445d51a64 Improve grammar for a message from the validator.
Thanks mostly to Si Jie sijie123@gmail.com for raising pull request

This modifies the po files as well to prevent the string from being
marked as fuzzy.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-03-20 11:20:08 -04:00
Maurício Meneghini Fauth
1f7e7cee92 Fix some PHPStan errors
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-03-19 01:13:27 -03:00
Hugues Peccatte
f06883d2a7 Remove useless parenthesis
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-20 01:23:53 +01:00
Maurício Meneghini Fauth
071a3ff137
Merge pull request #14863 from Tithugues/fix/remove-useless-semicolon
Remove useless semicolon
2019-01-16 02:08:53 -03:00
Hugues Peccatte
9406e922cc Update PHPDoc
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-13 09:52:46 +01:00
Hugues Peccatte
8b246760e6 Remove useless semicolon
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-13 00:21:51 +01:00
Maurício Meneghini Fauth
ae20364830 Upgrade phpmyadmin/coding-standard to v1.0
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-08 01:26:26 -02:00
Maurício Meneghini Fauth
23c3579804 Format array declarations
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-07 14:31:39 -02:00
Maurício Meneghini Fauth
4cee0cbc12 Adds space after not (!) and type cast
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:56:34 -02:00
Maurício Meneghini Fauth
999b4d14f0 Fix some coding standard errors
- Fixes array identation
- Removes empty statements

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:25:08 -02:00
Maurício Meneghini Fauth
38e5b12c1c Define an absolute path to use for require statements
Fixes #6167

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-22 14:37:31 -02:00
Maurício Meneghini Fauth
9eba565bf4 Remove unnecessary HTML closing tags
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 00:12:54 -02:00
Tomas Votruba
637fe6de06 [cs] remove unused brackets, clean unused property assign
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
2018-11-26 17:54:40 +01:00
William Desportes
cc2665121d
phpstan level 2 - fixes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-25 13:57:57 +01:00
Tomas Votruba
bf720bad29 remove unused and fix @param, @var and @return annotation values
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
2018-11-24 21:47:26 +01:00
lkopo
764de6b600 Issue #12158: auto expand the single database (#14650)
* Navigation menu automatically expands database if there is only one record
* Added a new configuration for auto-expanding navigation tree for single database

Signed-off-by: Eduard Karpiel <eduard@karpiel.sk>
2018-10-31 19:21:39 -03:00
Aswani Prakash
e5fb032ff7 Drop view and or replace added to exporting view #14404
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
2018-10-29 19:41:45 -03:00
Aswani Prakash
ba673e3046 Issue #13057 fix: Option to exclude user definition from views on export
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
2018-10-29 16:11:46 -03:00
Maurício Meneghini Fauth
619f9813b0 Fix uncaught TypeError in setup script
Fixes #14580

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-20 01:47:23 -03:00
Maurício Meneghini Fauth
117f76ff50 Reduce complexity in PhpMyAdmin\Config\Descriptions
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-14 18:35:55 -03:00
Jack Cherng
d0233a047a Fix PHP 7.3 warning: "continue" in "switch" is equal to "break"
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
(cherry picked from commit 9a7a1e35b0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-06 20:55:07 -03:00
Jack Cherng
9a7a1e35b0
Fix PHP 7.3 warning: "continue" in "switch" is equal to "break"
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
2018-08-06 02:47:26 +08:00
Isaac Bennetch
f9b55de9f4
Merge pull request #14421 from nulll-pointer/enh_5
Add configuration setting to toggle drag drop file Import
2018-06-29 11:23:31 -04:00
William Desportes
e816e45c18 phpstan level 0 (#14405)
* Fix phpdoc @return

- Fixed @return typehint

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix incorrect case on function calls

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Type hint + typo fix

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fixes

- @return fix
- @var fix
- Class names
- Throws fix
- test/classes/Plugins/Export/ExportSqlTest.php any() invoked with 1 parameter, 0 required
-  libraries/classes/Controllers/Table/TableStructureController.php Array has 2 duplicate keys with value 'columns_list'
- Call parent constructor  libraries/classes/Error.php

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Update config

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Access to an undefined property

- Access to an undefined property PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema::$diagram_row
- Access to an undefined property PhpMyAdmin\Plugins\Schema\Pdf\Pdf::$cMargin
- Undefined properties

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Update config

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix bootstrap-phpstan

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix typos and phpstan config

Fixes: #14399
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-06-25 20:34:46 -03:00
Lakshay arora
9d08a1dcaf Puts PMA import handler in a separate javascript file.
Makes 'enable_drag_drop_import' as a separate configuration directive, removes it from group of $cfg['IMPORT'] directives.
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
2018-06-25 12:37:43 +05:30
Lakshay arora
61163cd14b Add configuration setting to toggle drag drop file Import
This commit-
Adds a configuration directive to toggle drag drop Import feature as requested in #13155
TODO:
1. Test it on multiple servers.
2. Disable javascript handlers for drag drop
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
2018-06-24 14:21:24 +05:30
Maurício Meneghini Fauth
244d4e8e81 Replace Template::get calls in libraries/classes
Uses Template::render() instead of Template::get().

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-18 18:18:24 -03:00
Maurício Meneghini Fauth
2f99429917 Fix coding style errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-09 16:57:05 -03:00
Maurício Meneghini Fauth
f24545e633 Refactor Config/FormDisplayTemplate
Replaces $GLOBALS['PMA_Config'] with DI

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-06 15:47:00 -03:00
Maurício Meneghini Fauth
8cad698ead Refactor FormDisplayTemplate
Uses a class member instead of a global.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-05 23:07:16 -03:00
Maurício Meneghini Fauth
b25be9ee75 Refactor Config/FormDisplayTemplate methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-05 22:47:17 -03:00
Maurício Meneghini Fauth
010a72dc00 Use camelCase for variable names
PhpMyAdmin\Config\* classes

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-04 21:25:24 -03:00
Maurício Meneghini Fauth
b101167220 Refactor libraries/config.values.php
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-01 01:56:25 -03:00
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
Isaac Bennetch
83f433695b Merge branch 'QA_4_8' 2018-05-20 21:20:07 -04:00
Isaac Bennetch
f2b068e1d3 Better fix for issue #14309
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-05-20 21:17:16 -04:00
Maurício Meneghini Fauth
447f7ae3d1 Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-19 16:33:10 -03:00
Maurício Meneghini Fauth
54eb5ffff8 Fix Config\FormDisplayTemplateTest failed test
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-19 16:29:17 -03:00
Phoenix Eve Aspacio
e84c7f60e3 fixes broken links to icons in the setup page
fixes broken links to icons in the setup page

Signed-off-by: Phoenix Eve Aspacio <aspaciop@phoenixpeca.xyz>
(cherry picked from commit bc1fee27be)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-19 14:56:08 -03:00
Maurício Meneghini Fauth
2dcf6615f5
Merge pull request #14272 from PhoenixPeca/patch-1
fixes broken links to icons in the setup page
2018-05-19 14:54:15 -03:00
Maurício Meneghini Fauth
baf0985e5f Fix phpcs errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-18 01:59:38 -03:00