Skip to content

Commit 1c610f4

Browse files
authored
Merge pull request #83 from tdwesten/80-statamic-v6
2 parents 36a3865 + 603060f commit 1c610f4

File tree

12 files changed

+3816
-2727
lines changed

12 files changed

+3816
-2727
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,10 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
php: [ 8.2, 8.3, 8.4 ]
36-
laravel: [ 11.*, 12.* ]
37-
statamic: [ 5.* ]
35+
php: [ 8.3, 8.4, 8.5 ]
36+
laravel: [ 12.* ]
37+
statamic: [ 6.* ]
3838
stability: [ prefer-stable ]
39-
exclude:
40-
- php: 8.2
41-
laravel: 11.*
42-
- php: 8.2
43-
laravel: 12.*
4439

4540
name: P${{ matrix.php }} - L${{ matrix.laravel }} - S${{ matrix.statamic }} - ${{ matrix.stability }}
4641

@@ -57,7 +52,7 @@ jobs:
5752

5853
- name: Install dependencies
5954
run: |
60-
composer require "laravel/framework:${{ matrix.laravel }}" "statamic/cms:${{ matrix.statamic }}" "orchestra/testbench:${{ matrix.laravel == '11.*' && '^9.0' || '^10.0' }}" --no-interaction --no-update
55+
composer require "laravel/framework:${{ matrix.laravel }}" "statamic/cms:${{ matrix.statamic }}" "orchestra/testbench:^10.0" --no-interaction --no-update
6156
composer update --${{ matrix.stability }} --prefer-dist --no-interaction -W
6257
6358
- name: Execute tests

composer.json

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
{
2-
"name": "tdwesten/statamic-builder",
3-
"description": "A fluent blueprint and fieldset builder for Statamic.",
4-
"version": "v2.0.0",
5-
"license": "MIT",
6-
"autoload": {
7-
"psr-4": {
8-
"Tdwesten\\StatamicBuilder\\": "src"
9-
}
10-
},
11-
"autoload-dev": {
12-
"psr-4": {
13-
"Tests\\": "tests"
14-
}
15-
},
16-
"extra": {
17-
"statamic": {
18-
"name": "Statamic Builder",
19-
"description": "Statamic Builder addon"
20-
},
21-
"laravel": {
22-
"providers": [
23-
"Tdwesten\\StatamicBuilder\\ServiceProvider"
24-
]
25-
}
26-
},
27-
"scripts": {
28-
"test": [
29-
"./vendor/bin/pest && ./vendor/bin/rector"
30-
],
31-
"generate-field": [
32-
"php field-generator/Generator.php"
33-
]
34-
},
35-
"require": {
36-
"php": "^8.2",
37-
"illuminate/support": "^11.0|^12.0",
38-
"laravel/framework": "^11.0|^12.0",
39-
"statamic/cms": "^5.4"
40-
},
41-
"require-dev": {
42-
"pestphp/pest": "*",
43-
"laravel/pint": "^1.2",
44-
"orchestra/testbench": "^9.0",
45-
"pestphp/pest-plugin-laravel": "*",
46-
"statamic/eloquent-driver": "^4.16",
47-
"rector/rector": "^2.0"
2+
"name": "tdwesten/statamic-builder",
3+
"description": "A fluent blueprint and fieldset builder for Statamic.",
4+
"version": "v3.0.0",
5+
"license": "MIT",
6+
"autoload": {
7+
"psr-4": {
8+
"Tdwesten\\StatamicBuilder\\": "src"
9+
}
10+
},
11+
"autoload-dev": {
12+
"psr-4": {
13+
"Tests\\": "tests"
14+
}
15+
},
16+
"extra": {
17+
"statamic": {
18+
"name": "Statamic Builder",
19+
"description": "Statamic Builder addon"
4820
},
49-
"config": {
50-
"allow-plugins": {
51-
"pestphp/pest-plugin": true,
52-
"pixelfear/composer-dist-plugin": true
53-
}
21+
"laravel": {
22+
"providers": [
23+
"Tdwesten\\StatamicBuilder\\ServiceProvider"
24+
]
25+
}
26+
},
27+
"scripts": {
28+
"test": [
29+
"./vendor/bin/pest && ./vendor/bin/rector"
30+
],
31+
"generate-field": [
32+
"php field-generator/Generator.php"
33+
]
34+
},
35+
"require": {
36+
"php": "^8.3",
37+
"illuminate/support": "^12.0",
38+
"laravel/framework": "^12.0",
39+
"statamic/cms": "^6.0"
40+
},
41+
"require-dev": {
42+
"pestphp/pest": "^4.1",
43+
"laravel/pint": "^1.2",
44+
"orchestra/testbench": "^10.0",
45+
"pestphp/pest-plugin-laravel": "^4.0",
46+
"statamic/eloquent-driver": "dev-master",
47+
"rector/rector": "^2.0"
48+
},
49+
"config": {
50+
"allow-plugins": {
51+
"pestphp/pest-plugin": true,
52+
"pixelfear/composer-dist-plugin": true
5453
}
54+
}
5555
}

0 commit comments

Comments
 (0)