Skip to content

Commit 5c51db8

Browse files
committed
.
1 parent a64e0f5 commit 5c51db8

File tree

3 files changed

+12486
-8
lines changed

3 files changed

+12486
-8
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
name: CI
1111
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
1212
with:
13+
composer_install: true
1314
# Use simple_matrix to limit the number of created jobs
1415
# phpunit.xml.dist has a large number of testsuites, all of which are tested with
1516
# multiple versions of php + databases in both the modules themselves and other recipes

composer.json

+28-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"php": "^8.3",
99
"silverstripe/recipe-plugin": "2.0.x-dev",
1010
"silverstripe/installer": "6.0.x-dev",
11-
"silverstripe/developer-docs": "6.0.x-dev",
11+
"silverstripe/developer-docs": "dev-pulls/6.0/validation-values as 6.0.x-dev",
1212
"silverstripe/hybridsessions": "4.0.x-dev",
1313
"silverstripe/totp-authenticator": "6.0.x-dev",
1414
"silverstripe/mfa": "6.0.x-dev",
@@ -35,14 +35,13 @@
3535
"silverstripe/graphql": "6.0.x-dev",
3636
"silverstripe/subsites": "4.0.x-dev",
3737
"silverstripe/blog": "5.0.x-dev",
38-
"silverstripe/crontask": "4.0.x-dev"
39-
},
40-
"require-dev": {
41-
"silverstripe/frameworktest": "^2",
38+
"silverstripe/crontask": "4.0.x-dev",
39+
"silverstripe/frameworktest": "2.x-dev",
4240
"silverstripe/graphql-devtools": "2.x-dev",
4341
"silverstripe/recipe-testing": "^4",
4442
"silverstripe/webauthn-authenticator": "6.x-dev",
45-
"mikey179/vfsstream": "^1.6"
43+
"mikey179/vfsstream": "^1.6.10",
44+
"silverstripe/framework": "dev-pulls/6.0/validation-values as 6.0.x-dev"
4645
},
4746
"extra": {
4847
"project-files": [
@@ -58,9 +57,30 @@
5857
"allow-plugins": {
5958
"composer/installers": true,
6059
"silverstripe/recipe-plugin": true,
61-
"silverstripe/vendor-plugin": true
60+
"silverstripe/vendor-plugin": true,
61+
"dealerdirect/phpcodesniffer-composer-installer": true
62+
},
63+
"platform": {
64+
"php": "8.3"
6265
}
6366
},
6467
"prefer-stable": true,
65-
"minimum-stability": "dev"
68+
"minimum-stability": "dev",
69+
"repositories": {
70+
"x0": {
71+
"type": "vcs",
72+
"url": "[email protected]:creative-commoners/silverstripe-framework"
73+
},
74+
"x1": {
75+
"type": "vcs",
76+
"url": "[email protected]:creative-commoners/developer-docs"
77+
}
78+
},
79+
"conflict": {
80+
"symfony/cache-contracts": "3.2.1",
81+
"symfony/deprecation-contracts": "3.2.1",
82+
"symfony/event-dispatcher-contracts": "3.2.1",
83+
"symfony/service-contracts": "3.2.1",
84+
"symfony/translation-contracts": "3.2.1"
85+
}
6686
}

0 commit comments

Comments
 (0)