summaryrefslogtreecommitdiffstats
path: root/src/Utils
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'QA'William Desportes2019-12-311-1/+1
|\ | | | | | | Signed-off-by: William Desportes <williamdes@wdes.fr>
| * Fix phpdoc using phpstan level 3William Desportes2019-12-311-1/+1
| | | | | | | | Signed-off-by: William Desportes <williamdes@wdes.fr>
* | Remove left overs of old array syntaxWilliam Desportes2019-12-313-3/+3
| | | | | | | | Signed-off-by: William Desportes <williamdes@wdes.fr>
* | Merge branch 'QA'William Desportes2019-12-311-1/+1
|\ \ | |/ | | | | Signed-off-by: William Desportes <williamdes@wdes.fr>
| * Fix #249 - Notice - Undefined index: ORDER BYWilliam Desportes2019-12-311-1/+1
| | | | | | | | Signed-off-by: William Desportes <williamdes@wdes.fr>
* | Merge branch 'QA'William Desportes2019-12-311-1/+1
|\ \ | |/ | | | | Signed-off-by: William Desportes <williamdes@wdes.fr>
| * Add more tests for CLI stdinWilliam Desportes2019-12-311-1/+1
| | | | | | | | Signed-off-by: William Desportes <williamdes@wdes.fr>
* | Add PHPStan at level 2Maurício Meneghini Fauth2019-12-161-0/+4
| | | | | | | | Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
* | Fix uncaught TypeError with CASE StatementMaurício Meneghini Fauth2019-12-141-1/+1
| | | | | | | | | | | | Related to #272 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
* | Remove useless comments and annotationsMaurício Meneghini Fauth2019-12-149-40/+0
| | | | | | | | Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
* | Replace is_null($var) with $var === nullMaurício Meneghini Fauth2019-12-141-2/+2
| | | | | | | | Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
* | Remove useless parenthesesMaurício Meneghini Fauth2019-12-142-5/+5
| | | | | | | | Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
* | Merge branch 'QA'William Desportes2019-10-291-4/+5
|\ \ | |/ | | | | | | | | This merge includes phpcs fixes Signed-off-by: William Desportes <williamdes@wdes.fr>
| * revert usage of new array syntax []William Desportes2019-05-291-1/+1
| | | | | | | | | | | | See: 86c5baebda24c1721fb6881df8671a3c7df60e8b Related-to: 930a860bc7f0684c45babd012070f88a9505d427, 5d5089a259d0195c4a1e4aa3588c31c839954067 Signed-off-by: William Desportes <williamdes@wdes.fr>
| * Revert "Enable strict mode on PHP files"William Desportes2019-05-289-13/+13
| | | | | | | | | | This reverts commit 17da8a34b81442524a8e01fead7b5968fa1cc39d. Signed-off-by: William Desportes <williamdes@wdes.fr>
| * revert of new array syntaxWilliam Desportes2019-05-288-113/+113
| | | | | | | | | | See: 86c5baebda24c1721fb6881df8671a3c7df60e8b Signed-off-by: William Desportes <williamdes@wdes.fr>
| * Revert array syntaxWilliam Desportes2019-05-288-28/+28
|/ | | | | See: 86c5baebda24c1721fb6881df8671a3c7df60e8b Signed-off-by: William Desportes <williamdes@wdes.fr>
* Fix merge conflicts for pull request #242Isaac Bennetch2019-05-091-0/+7
|\ | | | | | | Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
| * Recognize question mark as parameter, add formatter for parametersRadosław Kowalewski2019-04-191-0/+7
| |
* | Add usage hints for command line stdinIsaac Bennetch2019-04-291-0/+3
| | | | | | | | Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
* | Support reading from stdinMarkus Staab2019-04-051-0/+23
| |
* | fix: incorrect lastClauseIdx in Util::getQueryDeven Bansod2019-03-121-2/+2
| |
* | Enable strict mode on PHP filesMaurício Meneghini Fauth2019-01-169-13/+13
| | | | | | | | Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
* | Apply phpmyadmin/coding-standardMaurício Meneghini Fauth2019-01-169-173/+278
|/ | | | Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
* Fix unused variableBruno Perel2018-12-091-3/+3
|
* Use triple (in)equalities when type compatibility is ensuredBruno Perel2018-11-264-8/+8
|
* Cleanup and improve readability:Bruno Perel2018-11-266-68/+65
| | | | | Avoid duplicate if conditions Use switch/case instead of ifs when possible
* Apply php-cs-fixerMichal Čihař2017-10-101-0/+2
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Always initialize querytype flagMichal Čihař2017-09-041-1/+1
| | | | | | | | This avoids problems later when using it to detect handling of query. Fixes https://github.com/phpmyadmin/phpmyadmin/issues/13640 Signed-off-by: Michal Čihař <michal@cihar.com>
* Allow to specify context on lint-queryMichal Čihař2017-08-301-2/+6
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Provide $expr consistently for CaseExpression as with ExpressionMichal Čihař2017-07-121-3/+0
| | | | | | | This is probably better approach to address https://github.com/phpmyadmin/phpmyadmin/issues/13487 Signed-off-by: Michal Čihař <michal@cihar.com>
* Correctly handle CASE expression in SELECT statementMichal Čihař2017-07-121-0/+3
| | | | | | Fixes https://github.com/phpmyadmin/phpmyadmin/issues/13487 Signed-off-by: Michal Čihař <michal@cihar.com>
* Add recognizer for SET StatementsDeven Bansod2017-07-071-0/+3
| | | | | | | | Fix #157 Add Tests for SET statement flag Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
* Honor newlines before comments in formatterMichal Čihař2017-06-081-2/+11
| | | | | | Issue #156 Signed-off-by: Michal Čihař <michal@cihar.com>
* Merge commit 'bb384a13abf5b8e96c2b50fef29e6be3b5ba9d04'Michal Čihař2017-05-171-2/+13
|\
| * Don't print duplicated cli formatting charactersDamian Dlugosz2017-05-171-2/+13
| |
* | Inline CREATE PROCEDUREDamian Dlugosz2017-05-161-0/+1
|/
* Improved format of INSERT queries.Dan Ungureanu2017-05-161-1/+24
| | | | Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
* Merge pull request #148 from nijel/inline-comment-newlineMichal Čihař2017-04-061-0/+4
|\ | | | | Fixed inline comments parsing
| * Keep linebreaks after commentsMichal Čihař2017-04-041-0/+4
| | | | | | | | | | | | Concatenating line terminated comments will change the query. Signed-off-by: Michal Čihař <michal@cihar.com>
* | Merge pull request #146 from Achilles-96/Issue-11717Michal Čihař2017-04-061-3/+5
|\ \ | |/ |/| Fixes striping of inline comments #11717
| * Fixes striping of inline comments #11717Raghuram2017-04-051-3/+5
| | | | | | | | Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
* | Add utility to tokenize queryMichal Čihař2017-04-031-0/+50
|/ | | | | | | | It's mostly useful for debugging changes in parser. See #147. Signed-off-by: Michal Čihař <michal@cihar.com>
* This is already doneMichal Čihař2017-02-201-1/+1
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Fix BEGIN/END indentationMichal Čihař2017-02-201-6/+1
| | | | | | Ensure we never have negative indentation Signed-off-by: Michal Čihař <michal@cihar.com>
* Merge pull request #143 from devenbansod/fix_131Michal Čihař2017-02-201-0/+5
|\ | | | | Parse LOAD statement properly
| * Parse LOAD statement properlyDeven Bansod2017-02-181-0/+5
| | | | | | | | | | | | | | | | Fix #131 Might help to fix phpmyadmin/phpmyadmin#12345 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
* | Inline JOINsDamian Dlugosz2017-02-161-0/+10
|/
* Order importsDamian Dlugosz2017-02-123-6/+6
|
* Apply cs fixesDamian Dlugosz2017-02-121-0/+1
|
* Fix parameters documentationMichal Čihař2017-02-071-2/+2
| | | | | | This function will only get SelectStatement, so be clear on that. Signed-off-by: Michal Čihař <michal@cihar.com>
* Split select flags calculation to separate methodMichal Čihař2017-02-071-62/+76
| | | | | | It's the most complex case right now, so let's separate it. Signed-off-by: Michal Čihař <michal@cihar.com>
* Move all flags definition outside of methodMichal Čihař2017-02-071-155/+157
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Various coding style fixesMichal Čihař2017-02-071-11/+11
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Remove double spacingMichal Čihař2017-02-061-2/+2
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Fix comment typeMichal Čihař2017-02-061-11/+11
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Merge remote-tracking branch 'origin/pull/120' into tmpMichal Čihař2017-02-061-4/+1
|\
| * Remove @varDamian Dlugosz2017-02-031-2/+0
| |
| * And now?Damian Dlugosz2017-02-011-6/+3
| |
| * Testing create tableDamian Dlugosz2017-02-011-1/+3
| |
* | Use keyword attribute for comparing keyword nameMichal Čihař2017-02-062-12/+12
|/ | | | | | | We do not uppercase non reserved keywords, so this way we make the comparison properly handle that. Signed-off-by: Michal Čihař <michal@cihar.com>
* Coding style fixesMichal Čihař2017-01-231-3/+1
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Added PhpMyAdmin namespace prefix to follow PSR-4.Michal Čihař2017-01-239-54/+54
| | | | | | Fixes #126 Signed-off-by: Michal Čihař <michal@cihar.com>
* Run php-cs-fixerMichal Čihař2017-01-201-2/+2
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Merge pull request #123 from bigfoot90/fix-comment-parsingMichal Čihař2017-01-201-51/+21
|\ | | | | Fix comment parsing
| * Fix comment parsingDamian Dlugosz2017-01-101-51/+21
| |
* | Remove unuseful bracketsDamian Dlugosz2017-01-081-7/+9
|/
* Merge pull request #117 from bigfoot90/small-fixMichal Čihař2017-01-071-22/+28
|\ | | | | Some clean, remove useless brackets
| * Remove useless bracketsDamian Dlugosz2017-01-061-22/+28
| |
* | Fix indentation on html formatDamian Dlugosz2017-01-061-1/+5
|/
* Apply php-cs-fixerDamian Dlugosz2017-01-069-266/+232
|
* Simplify rules mergingMichal Čihař2017-01-031-28/+23
| | | | | | | We first sanitize the merged array and we can later use it without checking. Signed-off-by: Michal Čihař <michal@cihar.com>
* Make the code a bit more readableMichal Čihař2017-01-031-1/+5
| | | | | | | Do not misuse ternary erorr silence operator to check if variable is set. Signed-off-by: Michal Čihař <michal@cihar.com>
* Handling merging formats arraysDamian Dlugosz2016-12-301-115/+188
|
* Fix return value of Formatter.toString() when type is textMadhura Jayaratne2016-12-051-0/+1
| | | | Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
* Prevent incorrect error messages in UNION queriesDeven Bansod2016-11-201-0/+2
| | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
* Remove unused variable (#96)Michal Čihař2016-11-081-8/+0
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Validate order of clauses in the parsing of statementsDeven Bansod2016-11-031-0/+62
| | | | | | Fix #22 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
* Clarify licenseMichal Čihař2016-09-269-9/+9
| | | | | | | | | - Add link to official license text - Use SPDX identifier for license - Clarify that the code is GPL or later - See issue #89 Signed-off-by: Michal Čihař <michal@cihar.com>
* Remove @author from comment metadataMichal Čihař2016-09-269-9/+0
| | | | | | | | - We're doing this for ages in phpmyadmin repo - The comments get outdated over time - See issue #89 Signed-off-by: Michal Čihař <michal@cihar.com>
* Fixed escaping of control chars in CLI formatterMichal Čihař2016-09-201-2/+23
| | | | | | Fixes #84 Signed-off-by: Michal Čihař <michal@cihar.com>
* Fixed escaping HTML entities in HTML formatterMichal Čihař2016-09-201-2/+3
| | | | | | Fixes #83 Signed-off-by: Michal Čihař <michal@cihar.com>
* fix default options in Formater constructorRemi Collet2016-09-131-1/+5
|
* Correctly handle getopt failuresMichal Čihař2016-09-131-0/+3
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Add tests for CLI interfaceMichal Čihař2016-09-131-2/+7
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Do not use \e as it's not supported on PHP 5.3Michal Čihař2016-09-131-9/+9
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Fix parsing of query with \v3.4.3Michal Čihař2016-04-191-3/+3
| | | | | | | | The previous fix was wrong, it didn't properly handle double escaping. Fixes https://github.com/phpmyadmin/phpmyadmin/issues/12197 Signed-off-by: Michal Čihař <michal@cihar.com>
* Improve formatting of non indented groupsv3.4.2Michal Čihař2016-04-071-0/+11
| | | | | | | | We don't want to insert newlines insite non indented groups. Fixes #20 Signed-off-by: Michal Čihař <michal@cihar.com>
* Add command line query linterMichal Čihař2016-03-181-7/+52
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Prepare for multiple CLI utilsMichal Čihař2016-03-181-7/+12
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Add error messageMichal Čihař2016-03-181-0/+1
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Add command line script for highlighting SQL queryMichal Čihař2016-03-181-0/+69
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Reset console formatting at the end of queryMichal Čihař2016-03-181-0/+4
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Fix splitting query when escaped quotes are involvedMichal Čihař2016-03-021-2/+2
| | | | | | Fixes https://github.com/phpmyadmin/phpmyadmin/issues/12054 Signed-off-by: Michal Čihař <michal@cihar.com>
* Escape query when displayingMichal Čihař2016-02-251-1/+1
| | | | Signed-off-by: Michal Čihař <michal@cihar.com>
* Misc: Fixed some more issues reported by Scrutinizer.Dan Ungureanu2016-02-211-9/+10
| | | | Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
* Misc: Fixed some issues reported by Scrutinizer.Dan Ungureanu2016-02-211-2/+2
| | | | Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
* Change return value from getAll in case of not parsed queryMichal Čihař2016-02-171-1/+1
| | | | | | Fixes https://github.com/phpmyadmin/phpmyadmin/issues/11609 Signed-off-by: Michal Čihař <michal@cihar.com>
* Misc: Fixed coding style.Dan Ungureanu2016-02-101-2/+2
|
* BufferedQuery: Backslashes in comments escaped characters in comments.Dan Ungureanu2016-01-091-7/+13
|
generated by cgit v1.1 at 2025-05-12 00:42:02 +0000