Skip to content

Commit d78a107

Browse files
committed
.
1 parent 3edd419 commit d78a107

File tree

3 files changed

+15905
-10
lines changed

3 files changed

+15905
-10
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

+48-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"silverstripe/hybridsessions": "3.x-dev",
2222
"silverstripe/registry": "3.x-dev",
2323
"silverstripe/totp-authenticator": "5.x-dev",
24-
"silverstripe/mfa": "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,15 @@
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"
5153
},
5254
"extra": {
5355
"project-files": [
@@ -63,9 +65,46 @@
6365
"allow-plugins": {
6466
"composer/installers": true,
6567
"silverstripe/recipe-plugin": true,
66-
"silverstripe/vendor-plugin": true
68+
"silverstripe/vendor-plugin": true,
69+
"dealerdirect/phpcodesniffer-composer-installer": true
70+
},
71+
"platform": {
72+
"php": "8.1"
6773
}
6874
},
6975
"prefer-stable": true,
70-
"minimum-stability": "dev"
71-
}
76+
"minimum-stability": "dev",
77+
"repositories": {
78+
"x0": {
79+
"type": "vcs",
80+
"url": "[email protected]:creative-commoners/silverstripe-framework"
81+
},
82+
"x1": {
83+
"type": "vcs",
84+
"url": "[email protected]:creative-commoners/silverstripe-admin"
85+
},
86+
"x2": {
87+
"type": "vcs",
88+
"url": "[email protected]:creative-commoners/silverstripe-contentreview"
89+
},
90+
"x3": {
91+
"type": "vcs",
92+
"url": "[email protected]:creative-commoners/silverstripe-siteconfig"
93+
},
94+
"x4": {
95+
"type": "vcs",
96+
"url": "[email protected]:creative-commoners/silverstripe-frameworktest"
97+
},
98+
"x5": {
99+
"type": "vcs",
100+
"url": "[email protected]:creative-commoners/silverstripe-mfa"
101+
}
102+
},
103+
"conflict": {
104+
"symfony/cache-contracts": "3.2.1",
105+
"symfony/deprecation-contracts": "3.2.1",
106+
"symfony/event-dispatcher-contracts": "3.2.1",
107+
"symfony/service-contracts": "3.2.1",
108+
"symfony/translation-contracts": "3.2.1"
109+
}
110+
}

0 commit comments

Comments
 (0)