Skip to content

Commit 3670ec8

Browse files
committed
.
1 parent ecc6cb3 commit 3670ec8

File tree

3 files changed

+12683
-19
lines changed

3 files changed

+12683
-19
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

+103-19
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,44 @@
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/ctrl-curr as 6.0.x-dev",
1212
"silverstripe/hybridsessions": "4.0.x-dev",
1313
"silverstripe/totp-authenticator": "6.0.x-dev",
14-
"silverstripe/mfa": "6.0.x-dev",
15-
"silverstripe/gridfieldqueuedexport": "4.0.x-dev",
16-
"silverstripe/realme": "6.0.x-dev",
14+
"silverstripe/mfa": "dev-pulls/6.0/ctrl-curr as 6.0.x-dev",
15+
"silverstripe/gridfieldqueuedexport": "dev-pulls/4.0/ctrl-curr as 4.0.x-dev",
16+
"silverstripe/realme": "dev-pulls/6.0/ctrl-curr as 6.0.x-dev",
1717
"silverstripe/segment-field": "4.0.x-dev",
18-
"silverstripe/sharedraftcontent": "4.0.x-dev",
18+
"silverstripe/sharedraftcontent": "dev-pulls/4.0/ctrl-curr as 4.0.x-dev",
1919
"silverstripe/spamprotection": "5.0.x-dev",
2020
"silverstripe/lumberjack": "4.0.x-dev",
2121
"silverstripe/staticpublishqueue": "7.0.x-dev",
2222
"silverstripe/tagfield": "4.0.x-dev",
2323
"silverstripe/taxonomy": "4.0.x-dev",
2424
"silverstripe/textextraction": "5.0.x-dev",
25-
"silverstripe/userforms": "7.0.x-dev",
26-
"dnadesign/silverstripe-elemental": "6.0.x-dev",
25+
"silverstripe/userforms": "dev-pulls/7.0/ctrl-curr as 7.0.x-dev",
26+
"dnadesign/silverstripe-elemental": "dev-pulls/6.0/ctrl-curr as 6.0.x-dev",
2727
"dnadesign/silverstripe-elemental-userforms": "5.0.x-dev",
2828
"symbiote/silverstripe-advancedworkflow": "7.0.x-dev",
2929
"symbiote/silverstripe-gridfieldextensions": "5.0.x-dev",
30-
"symbiote/silverstripe-queuedjobs": "6.0.x-dev",
30+
"symbiote/silverstripe-queuedjobs": "dev-pulls/6.0/ctrl-curr as 6.0.x-dev",
3131
"colymba/gridfield-bulk-editing-tools": "5.0.x-dev",
32-
"tractorcow/silverstripe-fluent": "8.0.x-dev",
32+
"tractorcow/silverstripe-fluent": "dev-pulls/8.0/ctrl-curr as 8.0.x-dev",
3333
"silverstripe/dynamodb": "6.0.x-dev",
3434
"silverstripe/linkfield": "5.0.x-dev",
35-
"silverstripe/graphql": "6.0.x-dev",
36-
"silverstripe/subsites": "4.0.x-dev",
37-
"silverstripe/blog": "5.0.x-dev",
38-
"silverstripe/crontask": "4.0.x-dev"
39-
},
40-
"require-dev": {
41-
"silverstripe/frameworktest": "^2",
35+
"silverstripe/graphql": "dev-pulls/6.0/ctrl-curr as 6.0.x-dev",
36+
"silverstripe/subsites": "dev-pulls/4.0/ctrl-curr as 4.0.x-dev",
37+
"silverstripe/blog": "dev-pulls/5.0/ctrl-curr as 5.0.x-dev",
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/remove-ctrl-curr as 6.0.x-dev",
45+
"silverstripe/admin": "dev-pulls/3.0/ctrl-curr as 3.0.x-dev",
46+
"silverstripe/errorpage": "dev-pulls/3.0/ctrl-curr as 3.0.x-dev",
47+
"silverstripe/session-manager": "dev-pulls/3.0/ctrl-curr as 3.0.x-dev",
48+
"silverstripe/versioned": "dev-pulls/3.0/ctrl-curr as 3.0.x-dev"
4649
},
4750
"extra": {
4851
"project-files": [
@@ -58,9 +61,90 @@
5861
"allow-plugins": {
5962
"composer/installers": true,
6063
"silverstripe/recipe-plugin": true,
61-
"silverstripe/vendor-plugin": true
64+
"silverstripe/vendor-plugin": true,
65+
"dealerdirect/phpcodesniffer-composer-installer": true
66+
},
67+
"platform": {
68+
"php": "8.3"
6269
}
6370
},
6471
"prefer-stable": true,
65-
"minimum-stability": "dev"
72+
"minimum-stability": "dev",
73+
"repositories": {
74+
"x0": {
75+
"type": "vcs",
76+
"url": "[email protected]:creative-commoners/silverstripe-framework"
77+
},
78+
"x1": {
79+
"type": "vcs",
80+
"url": "[email protected]:creative-commoners/silverstripe-elemental"
81+
},
82+
"x2": {
83+
"type": "vcs",
84+
"url": "[email protected]:creative-commoners/silverstripe-admin"
85+
},
86+
"x3": {
87+
"type": "vcs",
88+
"url": "[email protected]:creative-commoners/silverstripe-blog"
89+
},
90+
"x4": {
91+
"type": "vcs",
92+
"url": "[email protected]:creative-commoners/developer-docs"
93+
},
94+
"x5": {
95+
"type": "vcs",
96+
"url": "[email protected]:creative-commoners/silverstripe-errorpage"
97+
},
98+
"x6": {
99+
"type": "vcs",
100+
"url": "[email protected]:creative-commoners/silverstripe-graphql"
101+
},
102+
"x7": {
103+
"type": "vcs",
104+
"url": "[email protected]:creative-commoners/silverstripe-gridfieldqueuedexport"
105+
},
106+
"x8": {
107+
"type": "vcs",
108+
"url": "[email protected]:creative-commoners/silverstripe-mfa"
109+
},
110+
"x9": {
111+
"type": "vcs",
112+
"url": "[email protected]:creative-commoners/silverstripe-realme"
113+
},
114+
"x10": {
115+
"type": "vcs",
116+
"url": "[email protected]:creative-commoners/silverstripe-session-manager"
117+
},
118+
"x11": {
119+
"type": "vcs",
120+
"url": "[email protected]:creative-commoners/silverstripe-sharedraftcontent"
121+
},
122+
"x12": {
123+
"type": "vcs",
124+
"url": "[email protected]:creative-commoners/silverstripe-subsites"
125+
},
126+
"x13": {
127+
"type": "vcs",
128+
"url": "[email protected]:creative-commoners/silverstripe-userforms"
129+
},
130+
"x14": {
131+
"type": "vcs",
132+
"url": "[email protected]:creative-commoners/silverstripe-versioned"
133+
},
134+
"x15": {
135+
"type": "vcs",
136+
"url": "[email protected]:creative-commoners/silverstripe-queuedjobs"
137+
},
138+
"x16": {
139+
"type": "vcs",
140+
"url": "[email protected]:creative-commoners/silverstripe-fluent"
141+
}
142+
},
143+
"conflict": {
144+
"symfony/cache-contracts": "3.2.1",
145+
"symfony/deprecation-contracts": "3.2.1",
146+
"symfony/event-dispatcher-contracts": "3.2.1",
147+
"symfony/service-contracts": "3.2.1",
148+
"symfony/translation-contracts": "3.2.1"
149+
}
66150
}

0 commit comments

Comments
 (0)