Skip to content
This repository was archived by the owner on Jul 6, 2026. It is now read-only.

Commit ad8b71e

Browse files
author
Mark de Heij
committed
Merge branch 'release/1.4.0'
2 parents 7eee5db + 87fcd26 commit ad8b71e

2 files changed

Lines changed: 13 additions & 12 deletions

File tree

.github/workflows/php.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: [ 8.0 ]
17+
php: [ 8.0, 8.1, 8.2, 8.3 ]
1818
stability: [ prefer-lowest, prefer-stable ]
1919

2020
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2424

2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Cache Composer packages
3838
id: composer-cache
39-
uses: actions/cache@v2
39+
uses: actions/cache@v4
4040
with:
4141
path: vendor
4242
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

composer.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,24 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^8.0",
13+
"php": "^8.0.2",
1414
"composer/installers": "^1.0 || ^2.0",
15-
"october/system": "^3.0",
15+
"october/rain": "^3.0 || ^4.0",
1616
"spatie/schema-org": "^3.11"
1717
},
18-
"minimum-stability": "stable",
18+
"require-dev": {
19+
"ergebnis/composer-normalize": "^2.42"
20+
},
1921
"repositories": [
2022
{
2123
"type": "composer",
2224
"url": "https://gateway.octobercms.com"
2325
}
2426
],
25-
"archive": {
26-
"exclude": [
27-
".gitattributes",
28-
".github",
29-
".gitignore"
30-
]
27+
"config": {
28+
"allow-plugins": {
29+
"composer/installers": true,
30+
"ergebnis/composer-normalize": true
31+
}
3132
}
3233
}

0 commit comments

Comments
 (0)