Skip to content

Commit 5d21035

Browse files
authored
Merge pull request #28 from BinarCode/laravel-12
Laravel 12
2 parents 84fd90a + 30d5d25 commit 5d21035

File tree

6 files changed

+38
-34
lines changed

6 files changed

+38
-34
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Ask a question
4-
url: https://github.com/BinarCode/laravel-restify/discussions/new?category=q-a
4+
url: https://github.com/BinarCode/laravel-tenantable/discussions/new?category=q-a
55
about: Ask the community for help
66
- name: Request a feature
7-
url: https://github.com/BinarCode/laravel-restify/discussions/new?category=ideas
7+
url: https://github.com/BinarCode/laravel-tenantable/discussions/new?category=ideas
88
about: Share ideas for new features
99
- name: Report a bug
10-
url: https://github.com/BinarCode/laravel-restify/issues/new
10+
url: https://github.com/BinarCode/laravel-tenantable/issues/new
1111
about: Report a reproducable bug

.github/workflows/auto-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.event.pull_request.merged == true
1313
runs-on: "ubuntu-latest"
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- uses: ncipollo/release-action@v1
1717
with:
1818
name: ${{ github.event.pull_request.title }}

.github/workflows/php-cs-fixer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
with:
1313
ref: ${{ github.head_ref }}
1414

@@ -18,6 +18,6 @@ jobs:
1818
args: --config=.php_cs.dist.php --allow-risky=yes
1919

2020
- name: Commit changes
21-
uses: stefanzweifel/git-auto-commit-action@v4
21+
uses: stefanzweifel/git-auto-commit-action@v5
2222
with:
2323
commit_message: Fix styling

.github/workflows/psalm.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
name: Psalm
22

33
on:
4-
push:
5-
paths:
6-
- '**.php'
7-
- 'psalm.xml.dist'
4+
push:
5+
paths:
6+
- '**.php'
7+
- 'psalm.xml.dist'
88

99
jobs:
10-
psalm:
10+
psalm:
1111
name: psalm
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

16-
- name: Setup PHP
17-
uses: shivammathur/setup-php@v2
18-
with:
19-
php-version: '8.1'
20-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
21-
coverage: none
16+
- name: Setup PHP
17+
uses: shivammathur/setup-php@v2
18+
with:
19+
php-version: '8.2'
20+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
21+
coverage: none
2222

23-
- name: Cache composer dependencies
24-
uses: actions/cache@v2
25-
with:
26-
path: vendor
27-
key: composer-${{ hashFiles('composer.lock') }}
23+
- name: Cache composer dependencies
24+
uses: actions/cache@v4
25+
with:
26+
path: vendor
27+
key: composer-${{ hashFiles('composer.lock') }}
2828

29-
- name: Run composer install
30-
run: composer install -n --prefer-dist
29+
- name: Run composer install
30+
run: composer install -n --prefer-dist
3131

32-
- name: Run psalm
33-
run: ./vendor/bin/psalm --output-format=github
32+
- name: Run psalm
33+
run: ./vendor/bin/psalm --output-format=github

.github/workflows/run-tests.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,27 @@ jobs:
1313
fail-fast: true
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
16-
php: [8.1, 8.2]
17-
laravel: [10.*, 11.*]
16+
php: [8.1, 8.2, 8.3, 8.4]
17+
laravel: [10.*, 11.*, 12.*]
1818
stability: [prefer-lowest, prefer-stable]
1919
include:
2020
- laravel: 10.*
2121
testbench: 8.*
2222
- laravel: 11.*
2323
testbench: 9.*
24+
- laravel: 12.*
25+
testbench: 10.*
2426
exclude:
2527
- laravel: 11.*
2628
php: 8.1
29+
- laravel: 12.*
30+
php: 8.1
2731

2832
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2933

3034
steps:
3135
- name: Checkout code
32-
uses: actions/checkout@v2
36+
uses: actions/checkout@v4
3337

3438
- name: Setup PHP
3539
uses: shivammathur/setup-php@v2

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
}
2424
],
2525
"require": {
26-
"php": "^8.1",
27-
"illuminate/contracts": "^10.0|^11.0"
26+
"php": "^8.1|^8.2",
27+
"illuminate/contracts": "^10.0|^11.0|^12.0"
2828
},
2929
"require-dev": {
3030
"brianium/paratest": "^6.3|^7.0",
31-
"orchestra/testbench": "^8.0|^9.0",
32-
"phpunit/phpunit": "^9.3.3|^10.0|^11.0",
31+
"orchestra/testbench": "^8.0|^9.0|^10.0",
32+
"phpunit/phpunit": "^9.3.3|^10.0|^11.0|^12.0",
3333
"spatie/laravel-ray": "^1.9",
3434
"vimeo/psalm": "^4.4|^5.0|^6.0"
3535
},

0 commit comments

Comments
 (0)