Skip to content

Commit 3264c0c

Browse files
iifawziiifawzi
authored
Merge branch 'phpmyadmin:master' into master
2 parents 8b10aae + a9cd167 commit 3264c0c

File tree

14 files changed

+87
-60
lines changed

14 files changed

+87
-60
lines changed

‎.github/workflows/lint-and-analyse-php.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install dependencies
2929
run: composer install
3030
- name: Lint files
31-
run: ./vendor/bin/phpcs
31+
run: composer run phpcs
3232

3333
analyse-php:
3434
runs-on: ubuntu-latest
@@ -59,6 +59,6 @@ jobs:
5959
- name: Install dependencies
6060
run: composer install
6161
- name: Analyse files with PHPStan
62-
run: ./vendor/bin/phpstan analyse
62+
run: composer run phpstan
6363
- name: Analyse files with Psalm
64-
run: ./vendor/bin/psalm --shepherd
64+
run: composer run psalm -- --shepherd

‎.github/workflows/mutation-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ jobs:
5757
composer update --no-interaction --no-progress
5858
5959
- name: Collect coverage report
60-
run: |
61-
./vendor/bin/phpunit --stop-on-failure
60+
run: composer run phpunit -- --stop-on-failure
6261

6362
- name: Infection
6463
if: ${{ github.base_ref != '' }}

‎.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
if: ${{ matrix.php-version == '7.1' }}
5555
run: composer require phpmyadmin/motranslator:^3.0
5656
- name: Run php tests
57-
run: ./vendor/bin/phpunit
57+
run: composer run phpunit
5858
- name: Send coverage
5959
uses: codecov/codecov-action@v1
6060
- name: Send coverage to Scrutinizer

‎composer.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,23 @@
5454
"PhpMyAdmin\\SqlParser\\Tests\\": "tests"
5555
}
5656
},
57+
"scripts": {
58+
"phpcbf": "@php phpcbf",
59+
"phpcs": "@php phpcs",
60+
"phpstan": "@php phpstan analyse",
61+
"psalm": "@php psalm --no-diff",
62+
"phpunit": "@php phpunit --color=always",
63+
"test": [
64+
"@phpcs",
65+
"@phpstan",
66+
"@psalm",
67+
"@phpunit"
68+
],
69+
"update:baselines": [
70+
"@php phpstan analyse --generate-baseline",
71+
"@php psalm --set-baseline=psalm-baseline.xml"
72+
]
73+
},
5774
"config": {
5875
"sort-packages": true,
5976
"allow-plugins": {

‎locale/cs/LC_MESSAGES/sqlparser.mo

253 Bytes
Binary file not shown.

‎locale/cs/LC_MESSAGES/sqlparser.po

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ msgstr ""
66
"Project-Id-Version: SQL parser 5\n"
77
"Report-Msgid-Bugs-To: [email protected]\n"
88
"POT-Creation-Date: 2021-12-29 16:13-0300\n"
9-
"PO-Revision-Date: 2022-05-27 05:56+0000\n"
10-
"Last-Translator: David Kindl <[email protected]>\n"
9+
"PO-Revision-Date: 2022-10-25 08:02+0000\n"
10+
"Last-Translator: mixeros <[email protected]>\n"
1111
"Language-Team: Czech <https://hosted.weblate.org/projects/phpmyadmin/"
1212
"sql-parser/cs/>\n"
1313
"Language: cs\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18-
"X-Generator: Weblate 4.13-dev\n"
18+
"X-Generator: Weblate 4.14.2-dev\n"
1919

2020
#: src/Component.php:42 src/Component.php:62
2121
msgid "Not implemented yet."
@@ -251,26 +251,20 @@ msgid "Unexpected keyword"
251251
msgstr "Neočekávané klíčové slovo"
252252

253253
#: src/Statements/WithStatement.php:119
254-
#, fuzzy
255-
#| msgid "The name of the entity was expected."
256254
msgid "The name of the CTE was expected."
257-
msgstr "Byl očekáván název entity."
255+
msgstr "Byl očekáván název CTE."
258256

259257
#: src/Statements/WithStatement.php:138
260258
msgid "AS keyword was expected."
261259
msgstr "Bylo očekáváno klíčové slovo AS."
262260

263261
#: src/Statements/WithStatement.php:154
264-
#, fuzzy
265-
#| msgid "The name of the entity was expected."
266262
msgid "Subquery of the CTE was expected."
267-
msgstr "Byl očekáván název entity."
263+
msgstr "Byl očekáván dílčí dotaz CTE."
268264

269265
#: src/Statements/WithStatement.php:271
270-
#, fuzzy
271-
#| msgid "Unexpected end of LOCK statement."
272266
msgid "Unexpected end of the WITH CTE."
273-
msgstr "Neočekávaný konec LOCK výrazu."
267+
msgstr "Neočekávaný konec WITH CTE."
274268

275269
#~ msgid "error #1"
276270
#~ msgstr "chyba #1"

‎locale/et/LC_MESSAGES/sqlparser.mo

262 Bytes
Binary file not shown.

‎locale/et/LC_MESSAGES/sqlparser.po

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ msgstr ""
66
"Project-Id-Version: SQL parser 5\n"
77
"Report-Msgid-Bugs-To: [email protected]\n"
88
"POT-Creation-Date: 2021-12-29 16:13-0300\n"
9-
"PO-Revision-Date: 2020-03-30 06:26+0000\n"
9+
"PO-Revision-Date: 2022-10-20 10:05+0000\n"
1010
"Last-Translator: Kristjan Räts <[email protected]>\n"
11-
"Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/sql-"
12-
"parser/et/>\n"
11+
"Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/"
12+
"sql-parser/et/>\n"
1313
"Language: et\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18-
"X-Generator: Weblate 4.0-dev\n"
18+
"X-Generator: Weblate 4.14.2-dev\n"
1919

2020
#: src/Component.php:42 src/Component.php:62
2121
msgid "Not implemented yet."
@@ -251,28 +251,20 @@ msgid "Unexpected keyword"
251251
msgstr "Ootamatu võtmesõna"
252252

253253
#: src/Statements/WithStatement.php:119
254-
#, fuzzy
255-
#| msgid "The name of the entity was expected."
256254
msgid "The name of the CTE was expected."
257-
msgstr "Oodati olemi nime."
255+
msgstr "Oodati CTE nime."
258256

259257
#: src/Statements/WithStatement.php:138
260-
#, fuzzy
261-
#| msgid "A \"RETURNS\" keyword was expected."
262258
msgid "AS keyword was expected."
263-
msgstr "Oodati võtmesõna \"RETURNS\"."
259+
msgstr "Oodati võtmesõna \"AS\"."
264260

265261
#: src/Statements/WithStatement.php:154
266-
#, fuzzy
267-
#| msgid "The name of the entity was expected."
268262
msgid "Subquery of the CTE was expected."
269-
msgstr "Oodati olemi nime."
263+
msgstr "Oodati CTE alampäringut."
270264

271265
#: src/Statements/WithStatement.php:271
272-
#, fuzzy
273-
#| msgid "Unexpected end of LOCK statement."
274266
msgid "Unexpected end of the WITH CTE."
275-
msgstr "Ootamatu LOCK lause lõpp."
267+
msgstr "Ootamatu WITH CTE lõpp."
276268

277269
#~ msgid "error #1"
278270
#~ msgstr "viga #1"

‎locale/mk/LC_MESSAGES/sqlparser.mo

491 Bytes
Binary file not shown.

‎locale/mk/LC_MESSAGES/sqlparser.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ msgstr ""
44
"Project-Id-Version: SQL parser 5\n"
55
"Report-Msgid-Bugs-To: [email protected]\n"
66
"POT-Creation-Date: 2021-12-29 16:13-0300\n"
7-
"PO-Revision-Date: 2022-07-24 19:24+0000\n"
7+
"PO-Revision-Date: 2022-10-28 04:03+0000\n"
88
"Last-Translator: Kristijan Fremen Velkovski <[email protected]>\n"
99
"Language-Team: Macedonian <https://hosted.weblate.org/projects/phpmyadmin/"
1010
"sql-parser/mk/>\n"
@@ -13,20 +13,20 @@ msgstr ""
1313
"Content-Type: text/plain; charset=UTF-8\n"
1414
"Content-Transfer-Encoding: 8bit\n"
1515
"Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
16-
"X-Generator: Weblate 4.14-dev\n"
16+
"X-Generator: Weblate 4.14.2-dev\n"
1717

1818
#: src/Component.php:42 src/Component.php:62
1919
msgid "Not implemented yet."
20-
msgstr ""
20+
msgstr "Сеуште не е имплементирано."
2121

2222
#: src/Components/AlterOperation.php:346 src/Statement.php:352
2323
msgid ""
2424
"A new statement was found, but no delimiter between it and the previous one."
25-
msgstr ""
25+
msgstr "Пронајдена е нова изјава, но нема разграница меѓу неа и претходната."
2626

2727
#: src/Components/AlterOperation.php:358
2828
msgid "Missing comma before start of a new alter operation."
29-
msgstr ""
29+
msgstr "Недостига запирка пред почетокот на новата alter операција."
3030

3131
#: src/Components/AlterOperation.php:368
3232
msgid "Unrecognized alter operation."

0 commit comments

Comments
 (0)