Skip to content

Commit 4616d07

Browse files
authored
Merge pull request #36 from laravelcm/laravel-12
laravel 12
2 parents 3bd2900 + e5e0124 commit 4616d07

File tree

6 files changed

+28
-36
lines changed

6 files changed

+28
-36
lines changed

.github/workflows/phpstan.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,24 @@ jobs:
88
strategy:
99
fail-fast: true
1010
matrix:
11-
php: [8.1, 8.2]
12-
laravel: [9.*, 10.*, 11.*]
13-
dependency-version: [prefer-lowest, prefer-stable]
11+
php: [8.2, 8.3]
12+
laravel: [10.*, 11.*, 12.*]
13+
dependency-version: [prefer-stable]
1414
include:
15+
- laravel: 12.*
16+
testbench: 10.*
1517
- laravel: 11.*
1618
testbench: 9.*
1719
- laravel: 10.*
1820
testbench: 8.*
19-
- laravel: 9.*
20-
testbench: 7.*
21-
exclude:
22-
- laravel: 11.*
23-
php: 8.1
2421
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
2522

2623
steps:
2724
- name: Checkout code
2825
uses: actions/checkout@v4
2926

3027
- name: Cache dependencies
31-
uses: actions/cache@v2
28+
uses: actions/cache@v4
3229
with:
3330
path: ~/.composer/cache/files
3431
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

.github/workflows/pint.yml

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

99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212

1313
- name: Setup PHP
1414
uses: shivammathur/setup-php@v2
1515
with:
16-
php-version: 8.2
16+
php-version: 8.3
1717
extensions: json, dom, curl, libxml, mbstring
1818
coverage: none
1919

.github/workflows/tests.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ jobs:
88
strategy:
99
fail-fast: true
1010
matrix:
11-
php: [8.3, 8.2, 8.1]
12-
laravel: [11.*, 10.*]
11+
php: [8.3, 8.2]
12+
laravel: [12.*, 11.*, 10.*]
1313
dependency-version: [prefer-stable]
1414
include:
15+
- laravel: 12.*
16+
testbench: 10.*
1517
- laravel: 11.*
1618
testbench: 9.*
1719
- laravel: 10.*
1820
testbench: 8.*
19-
exclude:
20-
- laravel: 11.*
21-
php: 8.1
2221
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
2322

2423
steps:
@@ -33,6 +32,11 @@ jobs:
3332
tools: composer:v2
3433
coverage: none
3534

35+
- name: Setup problem matchers
36+
run: |
37+
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
38+
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
39+
3640
- name: Install Composer dependencies
3741
run: |
3842
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update

.github/workflows/update-changelog.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ jobs:
88
update:
99
runs-on: ubuntu-latest
1010

11+
permissions:
12+
contents: write
13+
1114
steps:
1215
- name: Checkout code
1316
uses: actions/checkout@v4

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
}
3232
],
3333
"require": {
34-
"php": "^8.1",
35-
"illuminate/console": "^10.0|^11.0",
36-
"illuminate/container": "^10.0|^11.0",
37-
"illuminate/database": "^10.0|^11.0",
38-
"illuminate/support": "^10.0|^11.0",
34+
"php": "^8.2",
35+
"illuminate/console": "^10.0|^11.0|^12.0",
36+
"illuminate/container": "^10.0|^11.0|^12.0",
37+
"illuminate/database": "^10.0|^11.0|^12.0",
38+
"illuminate/support": "^10.0|^11.0|^12.0",
3939
"spatie/eloquent-sortable": "^4.0.0",
4040
"spatie/laravel-package-tools": "^1.16",
4141
"spatie/laravel-sluggable": "^3.4.2",
4242
"spatie/laravel-translatable": "^6.5.0"
4343
},
4444
"require-dev": {
45-
"larastan/larastan": "^2.0",
45+
"larastan/larastan": "^2.0|^3.0",
4646
"laravel/pint": "^1.13",
47-
"orchestra/testbench": "^8.0|^9.0",
48-
"pestphp/pest": "^2.18",
47+
"orchestra/testbench": "^8.0|^9.0|^10.0",
48+
"pestphp/pest": "^2.18|^3.7",
4949
"spatie/test-time": "^1.3"
5050
},
5151
"autoload": {

tests/Feature/SubscribeTest.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@
1515
$this->plan = Plan::factory()->create();
1616
});
1717

18-
it('User model implement subscription methods', function (): void {
19-
expect($this->user)
20-
->toHaveMethods([
21-
'activePlanSubscriptions',
22-
'planSubscription',
23-
'planSubscriptions',
24-
'newPlanSubscription',
25-
'subscribedPlans',
26-
'subscribedTo',
27-
]);
28-
});
29-
3018
it('a user can subscribe to a plan', function (): void {
3119
$this->user->newPlanSubscription('main', $this->plan);
3220

0 commit comments

Comments
 (0)