Merge pull request #1 from phpmyadmin/master

From Original

Author: sinri

.gitignore

@@ -7,3 +7,4 @@ coverage.xml
 *~
 .php_cs.cache
 *sw[op]
+phpunit.xml

.travis.yml

@@ -3,33 +3,24 @@ language: php
 dist: trusty
 
 php:
-  - "5.4"
-  - "5.5"
-  - "5.6"
-  - "7.0"
-  - "7.1"
-  - "7.2"
-  - "hhvm-3.12"
-  - "hhvm-3.18"
-  - "hhvm-3.24"
-  - "nightly"
+  - 7.1
+  - 7.2
+  - 7.3
+  - nightly
 
 matrix:
   fast_finish: true
   allow_failures:
-    - php: "nightly"
+    - php: nightly
   include:
-    - php: "7.1"
+    - php: 7.2
       env: DOCS=yes
-    - php: "7.1"
+    - php: 7.1
       env: REQUIRE="phpmyadmin/motranslator:^3.0"
-    - dist: precise
-      php: "5.3"
 
 sudo: false
 
 install:
-  - if [ "$TRAVIS_PHP_VERSION" = "5.3" ] ; then sed -i '/apigen/D' composer.json ; fi
   - if [ -n "$REQUIRE" ] ; then composer require "$REQUIRE" ; fi
   - composer install
 
@@ -40,6 +31,6 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-script: 
-  - if [ "$DOCS" != "yes" ] ; then ./vendor/bin/phpunit --configuration phpunit.xml ; fi
-  - if [ "$DOCS" = "yes" ] ; then ./vendor/bin/apigen generate --destination doc --source src/ ; fi
+script:
+  - if [ "$DOCS" != "yes" ] ; then ./vendor/bin/phpunit --configuration phpunit.xml.dist ; fi
+  - if [ "$DOCS" = "yes" ] ; then ./vendor/bin/sami.php --no-interaction update ./tools/sami-config.php ; fi

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 ## [Unreleased]
 
+* Drop support for PHP 5.3, PHP 5.4, PHP 5.5, PHP 5.6, PHP 7.0 and HHVM
+
+## [4.3.1] - 2019-01-05
+
+* Fixed incorrect error thrown on DEFAULT keyword in ALTER statement (#218)
+
+## [4.3.0] - 2018-12-25
+
+* Add support for aliases on CASE expressions (#162 and #192)
+* Add support for INDEX hints in SELECT statement (#199)
+* Add support for LOCK and UNLOCK TABLES statement (#180)
+* Add detection of extraneous comma in UPDATE statement (#160)
+* Add detection of a missing comma between two ALTER operations (#189)
+* Add missing support for STRAIGHT_JOIN (#196)
+* Add support for end options in SET statement (#190)
+* Fix building of RENAME statements (#201)
+* Add support for PURGE statements (#207)
+* Add support for COLLATE keyword (#190)
+
+## [4.2.5] - 2018-10-31
+
+* Fix issue with CREATE OR REPLACE VIEW.
+
 ## [4.2.4] - 2017-12-06
 
 * Fix parsing of CREATE TABLE with per field COLLATE.
@@ -312,4 +335,3 @@ __Breaking changes:__
 ## [1.0.0] - 2015-08-20
 
 * First release of this library.
-

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

composer.json

@@ -16,13 +16,13 @@
         "source": "https://github.com/phpmyadmin/sql-parser"
     },
     "require": {
-        "php": ">=5.3.0",
+        "php": "^7.1",
         "symfony/polyfill-mbstring": "^1.3"
     },
     "require-dev": {
-        "apigen/apigen": "^4.1",
+        "sami/sami": "^4.0",
         "phpunit/php-code-coverage": "*",
-        "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5"
+        "phpunit/phpunit": "^7.4"
     },
     "conflict": {
         "phpmyadmin/motranslator": "<3.0"

locale/fr/LC_MESSAGES/sqlparser.mo

@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2017-08-21 12:54+0200\n"
-"PO-Revision-Date: 2017-09-03 19:37+0000\n"
+"PO-Revision-Date: 2018-12-23 05:01+0000\n"
 "Last-Translator: tmtisfree <[email protected]>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/phpmyadmin/sql-"
-"parser/fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/phpmyadmin/"
+"sql-parser/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.17-dev\n"
+"X-Generator: Weblate 3.4-dev\n"
 
 #: src/Component.php:43 src/Component.php:63
 msgid "Not implemented yet."
@@ -184,7 +184,7 @@ msgstr "Mot clé non reconnu."
 
 #: src/Statement.php:377
 msgid "Keyword at end of statement."
-msgstr "Mot-clé à la fin de l'énoncé."
+msgstr "Mot clé à la fin de l'énoncé."
 
 #: src/Statement.php:503
 msgid "Unexpected ordering of clauses."

locale/fr/LC_MESSAGES/sqlparser.po

@@ -8,42 +8,43 @@ msgstr ""
 "Project-Id-Version: SQL parser 0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2017-08-21 12:54+0200\n"
-"PO-Revision-Date: 2016-01-08 17:45+0000\n"
-"Last-Translator: Nijraj Gelani <gelaninijraj@gmail.com>\n"
+"PO-Revision-Date: 2018-12-05 14:09+0000\n"
+"Last-Translator: Hardik Jogadia <hardikbjogadia@gmail.com>\n"
 "Language-Team: Gujarati <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/gu/>\n"
+"sql-parser/gu/>\n"
 "Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.5-dev\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.4-dev\n"
 
 #: src/Component.php:43 src/Component.php:63
 msgid "Not implemented yet."
-msgstr ""
+msgstr "હજુ સુધી અમલમાં નથી મુકાયુ."
 
 #: src/Components/AlterOperation.php:241 src/Statement.php:334
 msgid ""
 "A new statement was found, but no delimiter between it and the previous one."
 msgstr ""
+"નવો નિવેદન મળ્યો હતો, પરંતુ તે અને પાછલા એક વચ્ચે કોઈ વિભાજક અક્ષરો નથી મળયા."
 
 #: src/Components/AlterOperation.php:253
 msgid "Unrecognized alter operation."
-msgstr ""
+msgstr "આ ફેરફાર માન્ય નથી."
 
 #: src/Components/Array2d.php:88
 #, php-format
 msgid "%1$d values were expected, but found %2$d."
-msgstr ""
+msgstr "%1$d આ પ્રકાર ની values અપેક્ષિત હતી, પણ મળ્યું  %2$d."
 
 #: src/Components/Array2d.php:111
 msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: src/Components/ArrayObj.php:114 src/Components/CreateDefinition.php:201
 msgid "An opening bracket was expected."
-msgstr ""
+msgstr "ઓપનિંગ બ્રેકેટ અપેક્ષિત હતું."
 
 #: src/Components/CaseExpression.php:135 src/Components/CaseExpression.php:164
 #: src/Components/CaseExpression.php:176 src/Components/CaseExpression.php:190
@@ -58,11 +59,11 @@ msgstr ""
 #: src/Statements/ReplaceStatement.php:155
 #: src/Statements/ReplaceStatement.php:182
 msgid "Unexpected keyword."
-msgstr ""
+msgstr "અનપેક્ષિત કીવર્ડ."
 
 #: src/Components/CaseExpression.php:199
 msgid "Unexpected end of CASE expression"
-msgstr ""
+msgstr "અનપેક્ષિત અંત CASE નિવેદન નો"
 
 #: src/Components/CreateDefinition.php:223
 msgid ""
@@ -76,15 +77,15 @@ msgstr ""
 
 #: src/Components/CreateDefinition.php:270
 msgid "A comma or a closing bracket was expected."
-msgstr ""
+msgstr "અલ્પવિરામ અથવા કલોસિંગ બ્રેકેટની અપેક્ષા હતી."
 
 #: src/Components/CreateDefinition.php:286
 msgid "A closing bracket was expected."
-msgstr ""
+msgstr "કલોસિંગ બ્રેકેટની અપેક્ષા હતી."
 
 #: src/Components/DataType.php:123
 msgid "Unrecognized data type."
-msgstr ""
+msgstr "અનપેક્ષિત ડેટા પ્રકાર."
 
 #: src/Components/Expression.php:244 src/Components/Expression.php:394
 msgid "An alias was expected."
@@ -97,15 +98,15 @@ msgstr ""
 
 #: src/Components/Expression.php:364
 msgid "Unexpected dot."
-msgstr ""
+msgstr "અનપેક્ષિત પૂર્ણ વિરામ."
 
 #: src/Components/ExpressionArray.php:102
 msgid "An expression was expected."
-msgstr ""
+msgstr "નિવેદનની અપેક્ષા હતી."
 
 #: src/Components/Limit.php:86 src/Components/Limit.php:108
 msgid "An offset was expected."
-msgstr ""
+msgstr "ઓફસેટ અપેક્ષિત હતી."
 
 #: src/Components/OptionsArray.php:143
 #, php-format
@@ -114,11 +115,11 @@ msgstr ""
 
 #: src/Components/RenameOperation.php:109
 msgid "The old name of the table was expected."
-msgstr ""
+msgstr "ટેબલનુ જૂનું નામ અપેક્ષિત હતુ."
 
 #: src/Components/RenameOperation.php:119
 msgid "Keyword \"TO\" was expected."
-msgstr ""
+msgstr "કીવર્ડ \"TO\" અપેક્ષિત હતો."
 
 #: src/Components/RenameOperation.php:135
 msgid "The new name of the table was expected."