Skip to content

Commit 2e2ddcc

Browse files
d8vjorkd8vjork
committed
add Laravel 11 support
1 parent 4ac9dfd commit 2e2ddcc

File tree

6 files changed

+102
-60
lines changed

6 files changed

+102
-60
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
# Check for updates to GitHub Actions every week
7+
interval: "weekly"

‎.github/workflows/phpstan.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: phpstan
22

3-
on: [ push, pull_request ]
3+
on: [push, pull_request]
44

55
jobs:
66
analyze:
@@ -9,28 +9,29 @@ jobs:
99
name: PHPStan
1010

1111
steps:
12-
- uses: actions/checkout@v3
12+
- name: 🏗 Checkout code
13+
uses: actions/checkout@v4
1314

14-
- name: Setup PHP
15+
- name: 🏗 Setup PHP
1516
uses: shivammathur/setup-php@v2
1617
with:
17-
php-version: '8.2'
18+
php-version: "8.3"
1819
coverage: none
1920
tools: phpstan
2021

21-
- name: Get composer cache directory
22+
- name: 🏗 Get composer cache directory
2223
id: composer-cache
2324
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
2425

25-
- name: Cache dependencies
26-
uses: actions/cache@v3
26+
- name: 🏗 Cache dependencies
27+
uses: actions/cache@v4
2728
with:
2829
path: ${{ steps.composer-cache.outputs.dir }}
2930
key: phpstan-composer-${{ hashFiles('**/composer.lock') }}
3031
restore-keys: phpstan-composer-
3132

32-
- name: Install dependencies
33+
- name: 📦 Install dependencies
3334
run: composer install --no-interaction --no-suggest
3435

35-
- name: Run analysis
36+
- name: 🧪 Analyse code
3637
run: phpstan analyse

‎.github/workflows/pint.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: pint
22

3-
on: [ push, pull_request ]
3+
on: [push, pull_request]
44

55
jobs:
66
analyze:
@@ -9,14 +9,15 @@ jobs:
99
name: Laravel Pint
1010

1111
steps:
12-
- uses: actions/checkout@v3
12+
- name: 🏗 Checkout code
13+
uses: actions/checkout@v4
1314

14-
- name: Setup PHP
15+
- name: 🏗 Setup PHP
1516
uses: shivammathur/setup-php@v2
1617
with:
17-
php-version: '8.2'
18+
php-version: "8.3"
1819
coverage: none
1920
tools: laravel/pint
2021

21-
- name: Run analysis
22+
- name: 🧪 Analyse code
2223
run: pint

‎.github/workflows/publish.yml‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,50 @@ name: Publish
33
on:
44
push:
55
tags:
6-
- '**'
6+
- "**"
77

88
jobs:
9+
# @see https://stackoverflow.com/a/72959712/8179249
10+
check-current-branch:
11+
runs-on: ubuntu-latest
12+
13+
outputs:
14+
branch: ${{ steps.check_step.outputs.branch }}
15+
16+
steps:
17+
- name: 🏗 Checkout code
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
22+
- name: 🏗 Get current branch
23+
id: check_step
24+
run: |
25+
raw=$(git branch -r --contains ${{ github.ref }})
26+
branch="$(echo ${raw//origin\//} | tr -d '\n')"
27+
echo "{name}=branch" >> $GITHUB_OUTPUT
28+
echo "Branches where this tag exists : $branch."
29+
930
build:
1031
runs-on: ubuntu-latest
32+
33+
needs: check-current-branch
34+
1135
steps:
12-
- uses: actions/checkout@v3
36+
- name: 🏗 Checkout code
37+
uses: actions/checkout@v4
1338

14-
- name: Get latest release info
15-
id: get-release-info
16-
uses: release-flow/keep-a-changelog-action/get-release-info@v1
39+
- name: 🏗 Get release info
40+
id: query-release-info
41+
uses: release-flow/keep-a-changelog-action@v3
1742
with:
18-
release-version: latest
43+
command: query
44+
version: latest
1945

20-
- name: Publish to Github releases
21-
uses: softprops/action-gh-release@v1
46+
- name: 🚀 Publish to Github releases
47+
uses: softprops/action-gh-release@v2
2248
with:
23-
body: ${{ steps.get-release-info.outputs.release-notes }}
49+
body: ${{ steps.query-release-info.outputs.release-notes }}
50+
make_latest: contains(${{ needs.check.outputs.branch }}, 'main')
2451
# prerelease: true
25-
# files: '*.vsix'
52+
# files: '*.vsix'

‎.github/workflows/tests.yml‎

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: tests
22

3-
on: [ push, pull_request ]
3+
on: [push, pull_request]
44

55
jobs:
66
test:
@@ -9,59 +9,64 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
os: [ ubuntu-latest ]
13-
php: [ 8.0, 8.1, 8.2 ]
14-
laravel: [ 9.*, 10.* ]
15-
dependency-version: [ prefer-stable ]
16-
exclude:
17-
- laravel: 10.*
18-
php: 8.0
12+
os: [ubuntu-latest]
13+
php: [8.0, 8.1, 8.2, 8.3]
14+
stability: [prefer-stable]
15+
laravel: [9.*, 10.*, 11.*]
1916
include:
2017
- laravel: 9.*
2118
testbench: 7.*
2219

2320
- laravel: 10.*
2421
testbench: 8.*
2522

26-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
23+
- laravel: 11.*
24+
testbench: 9.*
25+
exclude:
26+
- php: 8.0
27+
laravel: 10.*
2728

28-
steps:
29-
- name: Checkout code
30-
uses: actions/checkout@v3
29+
- php: 8.0
30+
laravel: 11.*
3131

32-
- name: Setup Meilisearch container
33-
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key="1234" --no-analytics
32+
- php: 8.1
33+
laravel: 11.*
34+
35+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
36+
37+
steps:
38+
- name: 🏗 Checkout code
39+
uses: actions/checkout@v4
3440

35-
- name: Setup PHP
41+
- name: 🏗 Setup PHP
3642
uses: shivammathur/setup-php@v2
3743
with:
3844
php-version: ${{ matrix.php }}
39-
extensions: dom, curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, intl, exif
4045
coverage: pcov
4146

42-
- name: Get composer cache directory
47+
- name: 🏗 Get composer cache directory
4348
id: composer-cache
4449
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
4550

46-
- name: Cache dependencies
47-
uses: actions/cache@v3
51+
- name: 🏗 Cache dependencies
52+
uses: actions/cache@v4
4853
with:
4954
path: ${{ steps.composer-cache.outputs.dir }}
50-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
51-
restore-keys: ${{ runner.os }}-composer-${{ matrix.dependency-version }}-
55+
key: dependencies-composer-laravel-${{ matrix.laravel }}-${{ hashFiles('**/composer.lock') }}
56+
restore-keys: dependencies-composer-laravel-${{ matrix.laravel }}-
5257

53-
- name: Install dependencies
58+
- name: 📦 Install dependencies
5459
run: |
5560
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
56-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
61+
composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }}
5762
58-
- name: Execute tests with coverage
63+
- name: 🧪 Execute tests
5964
run: vendor/bin/phpunit -c phpunit.coverage.dist.xml
6065

61-
- name: Upload coverage reports to Codecov
62-
uses: codecov/codecov-action@v3
66+
- name: 🚀 Upload coverage reports to Codecov
67+
uses: codecov/codecov-action@v4
6368
with:
6469
token: ${{ secrets.CODECOV_TOKEN }}
6570
files: ./clover.xml
6671
fail_ci_if_error: true
67-
verbose: true
72+
# verbose: true

‎composer.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919
}
2020
],
2121
"require": {
22-
"php": "^8.0|^8.1|^8.2",
23-
"illuminate/console": "^9.0|^10.0",
22+
"php": "^8.0",
23+
"illuminate/console": "^9.0 || ^10.0 || ^11.0",
2424
"laravel/scout": "^10.0",
2525
"meilisearch/meilisearch-php": "^1.0"
2626
},
2727
"require-dev": {
2828
"guzzlehttp/guzzle": "^7.1",
2929
"http-interop/http-factory-guzzle": "^1.0",
30-
"nunomaduro/larastan": "^2.0",
31-
"orchestra/testbench": "^7.0|^8.0",
30+
"larastan/larastan": "^2.0",
31+
"orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
3232
"phpstan/phpstan": "^1.0",
33-
"phpunit/phpunit": "^9.0|^10.0"
33+
"phpunit/phpunit": "^9.0 || ^10.0"
3434
},
35+
"minimum-stability": "stable",
36+
"prefer-stable": true,
3537
"autoload": {
3638
"psr-4": {
3739
"OpenSoutheners\\LaravelScoutAdvancedMeilisearch\\": "src"
@@ -43,17 +45,16 @@
4345
}
4446
},
4547
"config": {
46-
"sort-packages": true,
4748
"allow-plugins": {
4849
"php-http/discovery": true
49-
}
50+
},
51+
"sort-packages": true
5052
},
5153
"extra": {
5254
"laravel": {
5355
"providers": [
5456
"OpenSoutheners\\LaravelScoutAdvancedMeilisearch\\ServiceProvider"
5557
]
5658
}
57-
},
58-
"minimum-stability": "dev"
59+
}
5960
}

0 commit comments

Comments
 (0)