Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 99d6941

Browse files
andrey-helldarandrey-helldar
authored
Merge branch 'main' into main
2 parents f3d14f5 + 48520e0 commit 99d6941

File tree

261 files changed

+2014
-832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+2014
-832
lines changed

‎.github/FUNDING.yml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
blank_issues_enabled: false
22
contact_links:
3+
- name: Bug Report
4+
url: https://github.com/Laravel-Lang/common/issues/new?assignees=andrey-helldar&labels=bug%2Clang&template=bug_report.yml&title=%5BBug%5D%3A+&environment-package-name=laravel-lang%2Flang
5+
about: Report a bug or other issue
6+
- name: Feature Request
7+
url: https://github.com/Laravel-Lang/common/issues/new?labels=feature%2Clang&projects=&template=feature_request.yml
8+
about: Propose a new feature
39
- name: Questions & Other
410
url: https://github.com/Laravel-Lang/common/discussions
511
about: 'If you want to ask about something else, use the discussions.'
6-
- name: Laravel issue
12+
- name: Laravel Issue
713
url: https://github.com/laravel/framework/issues
814
about: 'If you have a question about your Laravel implementation, ask it in your Laravel project.'

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.github/workflows/code-style.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Check the code style
1616
uses: TheDragonCode/codestyler@v3

‎.github/workflows/download.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115

116116
steps:
117117
- name: Checkout code
118-
uses: actions/checkout@v3
118+
uses: actions/checkout@v4
119119

120120
- name: Setup PHP
121121
uses: shivammathur/setup-php@v2

‎.github/workflows/phpunit.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: phpunit
1+
name: Tests
22

33
on:
44
push:
@@ -11,23 +11,32 @@ on:
1111
permissions: read-all
1212

1313
jobs:
14-
build:
14+
laravel:
1515
runs-on: ubuntu-latest
1616

17-
name: PHP Unit
17+
strategy:
18+
fail-fast: true
19+
matrix:
20+
php: [ "8.1", "8.2" ]
21+
publisher: [ "14.0", "15.0" ]
22+
23+
name: PHP ${{ matrix.php }}, Publisher ${{ matrix.publisher }}
1824

1925
steps:
2026
- name: Checkout code
21-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2228

2329
- name: Setup PHP
2430
uses: shivammathur/setup-php@v2
2531
with:
26-
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, json
27-
coverage: none
32+
php-version: ${{ matrix.php }}
33+
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
34+
coverage: xdebug
35+
env:
36+
COMPOSER_TOKEN: ${{ secrets.COMPOSER_TOKEN }}
2837

2938
- name: Install dependencies
30-
run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction
39+
run: composer require laravel-lang/publisher:^${{ matrix.publisher }}
3140

3241
- name: Execute tests
3342
run: sudo vendor/bin/phpunit --colors=always

‎.github/workflows/update.yml‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Setup PHP
2222
uses: shivammathur/setup-php@v2
@@ -33,6 +33,18 @@ jobs:
3333
- name: Install dependencies
3434
run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction
3535

36+
- name: Adding missing locales
37+
id: locales
38+
if: success()
39+
run: |
40+
IS_DIRTY=1
41+
42+
vendor/bin/lang create
43+
44+
{ git add . && git commit -a -m "✏️ Adding missing locales"; } || IS_DIRTY=0
45+
46+
echo "is_dirty=${IS_DIRTY}" >> "$GITHUB_OUTPUT"
47+
3648
- name: Keys actualization
3749
id: keys
3850
if: success()
@@ -41,9 +53,9 @@ jobs:
4153
4254
vendor/bin/lang sync
4355
44-
{ git add . && git commit -a -m "🔑 Updated keys"; } || IS_DIRTY=0
56+
{ git add . && git commit -a -m "🔑 Synchronization of translation keys"; } || IS_DIRTY=0
4557
46-
echo ::set-output name=is_dirty::${IS_DIRTY}
58+
echo "is_dirty=${IS_DIRTY}" >> "$GITHUB_OUTPUT"
4759
4860
- name: Update status
4961
id: status
@@ -53,15 +65,28 @@ jobs:
5365
5466
vendor/bin/lang status
5567
56-
{ git add . && git commit -a -m "📃 Updated status of translations"; } || IS_DIRTY=0
68+
{ git add . && git commit -a -m "📃 Translation statuses have been updated"; } || IS_DIRTY=0
5769
58-
echo ::set-output name=is_dirty::${IS_DIRTY}
70+
echo "is_dirty=${IS_DIRTY}" >> "$GITHUB_OUTPUT"
5971
6072
- name: Push changes
6173
uses: ad-m/github-push-action@master
6274
if: success() &&
75+
steps.locales.outputs.is_dirty == 1 ||
6376
steps.keys.outputs.is_dirty == 1 ||
64-
steps.status.outputs.is_dirty == 1 ||
65-
steps.changelog.outputs.is_dirty == 1
77+
steps.status.outputs.is_dirty == 1
6678
with:
6779
github_token: ${{ secrets.COMPOSER_TOKEN }}
80+
81+
- name: Generate docs trigger
82+
uses: myrotvorets/[email protected]
83+
if: |
84+
success() && (
85+
steps.locales.outputs.is_dirty == 1 ||
86+
steps.keys.outputs.is_dirty == 1 ||
87+
steps.status.outputs.is_dirty == 1
88+
)
89+
with:
90+
token: ${{ secrets.COMPOSER_TOKEN }}
91+
repo: Laravel-Lang/common
92+
type: docs

‎composer.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,32 @@
2121
"require": {
2222
"php": "^8.1",
2323
"ext-json": "*",
24-
"laravel-lang/publisher": "^14.0"
24+
"laravel-lang/publisher": "^14.0 || ^15.0"
2525
},
2626
"require-dev": {
27-
"laravel-lang/status-generator": "^1.19",
27+
"laravel-lang/status-generator": "^1.19 || ^2.0",
2828
"phpunit/phpunit": "^10.0",
2929
"symfony/var-dumper": "^6.0"
3030
},
3131
"minimum-stability": "stable",
3232
"prefer-stable": true,
3333
"autoload": {
3434
"psr-4": {
35-
"LaravelLang\\Lang\\": "src"
35+
"LaravelLang\\Lang\\": "src/"
3636
}
3737
},
3838
"autoload-dev": {
3939
"psr-4": {
40-
"Tests\\": "tests"
40+
"Tests\\": "tests/"
4141
}
4242
},
4343
"config": {
4444
"allow-plugins": {
4545
"composer/package-versions-deprecated": true,
46-
"ergebnis/composer-normalize": true,
4746
"dragon-code/codestyler": true,
48-
"symfony/thanks": true,
49-
"php-http/discovery": true
47+
"ergebnis/composer-normalize": true,
48+
"php-http/discovery": true,
49+
"symfony/thanks": true
5050
},
5151
"preferred-install": "dist",
5252
"sort-packages": true

0 commit comments

Comments
 (0)