Skip to content

Commit 16d1014

Browse files
committed
.
1 parent 3edd419 commit 16d1014

File tree

3 files changed

+15939
-11
lines changed

3 files changed

+15939
-11
lines changed

.github/workflows/ci.yml

+2-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
@@ -26,7 +27,7 @@ jobs:
2627
- php: 8.2
2728
phpunit: true
2829
phpunit_suite: recipe-cms
29-
- php: 8.3
30+
- php: 8.1
3031
phpunit: true
3132
phpunit_suite: recipe-cms
3233
- php: 8.1

composer.json

+63-10
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"silverstripe/environmentcheck": "3.x-dev",
2121
"silverstripe/hybridsessions": "3.x-dev",
2222
"silverstripe/registry": "3.x-dev",
23-
"silverstripe/totp-authenticator": "5.x-dev",
24-
"silverstripe/mfa": "5.x-dev",
23+
"silverstripe/totp-authenticator": "dev-pulls/5/form-sudo-mode as 5.x-dev",
24+
"silverstripe/mfa": "dev-pulls/5/form-sudo-mode as 5.x-dev",
2525
"silverstripe/crontask": "3.x-dev",
2626
"silverstripe/gridfieldqueuedexport": "3.x-dev",
2727
"silverstripe/ldap": "2.x-dev",
@@ -41,13 +41,17 @@
4141
"colymba/gridfield-bulk-editing-tools": "4.x-dev",
4242
"tractorcow/silverstripe-fluent": "7.x-dev",
4343
"silverstripe/dynamodb": "5.x-dev",
44-
"silverstripe/linkfield": "4.x-dev"
45-
},
46-
"require-dev": {
47-
"silverstripe/frameworktest": "^1",
44+
"silverstripe/linkfield": "4.x-dev",
45+
"silverstripe/frameworktest": "dev-pulls/1/form-sudo-mode as 1.x-dev",
4846
"silverstripe/graphql-devtools": "1.x-dev",
4947
"silverstripe/recipe-testing": "^3",
50-
"mikey179/vfsstream": "^1.6"
48+
"mikey179/vfsstream": "^1.6.10",
49+
"silverstripe/framework": "dev-pulls/5/form-sudo-mode as 5.x-dev",
50+
"silverstripe/admin": "dev-pulls/2/form-sudo-mode as 2.x-dev",
51+
"silverstripe/contentreview": "dev-pulls/5/fix-fallback-email as 5.x-dev",
52+
"silverstripe/siteconfig": "dev-pulls/5/form-sudo-mode as 5.x-dev",
53+
"silverstripe/cms": "dev-pulls/5/form-sudo-mode as 5.x-dev",
54+
"silverstripe/session-manager": "dev-pulls/2/form-sudo-mode as 2.x-dev"
5155
},
5256
"extra": {
5357
"project-files": [
@@ -63,9 +67,58 @@
6367
"allow-plugins": {
6468
"composer/installers": true,
6569
"silverstripe/recipe-plugin": true,
66-
"silverstripe/vendor-plugin": true
70+
"silverstripe/vendor-plugin": true,
71+
"dealerdirect/phpcodesniffer-composer-installer": true
72+
},
73+
"platform": {
74+
"php": "8.1"
6775
}
6876
},
6977
"prefer-stable": true,
70-
"minimum-stability": "dev"
71-
}
78+
"minimum-stability": "dev",
79+
"repositories": {
80+
"x0": {
81+
"type": "vcs",
82+
"url": "[email protected]:creative-commoners/silverstripe-framework"
83+
},
84+
"x1": {
85+
"type": "vcs",
86+
"url": "[email protected]:creative-commoners/silverstripe-admin"
87+
},
88+
"x2": {
89+
"type": "vcs",
90+
"url": "[email protected]:creative-commoners/silverstripe-contentreview"
91+
},
92+
"x3": {
93+
"type": "vcs",
94+
"url": "[email protected]:creative-commoners/silverstripe-siteconfig"
95+
},
96+
"x4": {
97+
"type": "vcs",
98+
"url": "[email protected]:creative-commoners/silverstripe-frameworktest"
99+
},
100+
"x5": {
101+
"type": "vcs",
102+
"url": "[email protected]:creative-commoners/silverstripe-mfa"
103+
},
104+
"x6": {
105+
"type": "vcs",
106+
"url": "[email protected]:creative-commoners/silverstripe-cms"
107+
},
108+
"x7": {
109+
"type": "vcs",
110+
"url": "[email protected]:creative-commoners/silverstripe-session-manager"
111+
},
112+
"x8": {
113+
"type": "vcs",
114+
"url": "[email protected]:creative-commoners/silverstripe-totp-authenticator"
115+
}
116+
},
117+
"conflict": {
118+
"symfony/cache-contracts": "3.2.1",
119+
"symfony/deprecation-contracts": "3.2.1",
120+
"symfony/event-dispatcher-contracts": "3.2.1",
121+
"symfony/service-contracts": "3.2.1",
122+
"symfony/translation-contracts": "3.2.1"
123+
}
124+
}

0 commit comments

Comments
 (0)