Skip to content

Commit cfb3243

Browse files
committed
.
1 parent c9314b9 commit cfb3243

File tree

3 files changed

+15769
-8
lines changed

3 files changed

+15769
-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
@@ -20,7 +20,7 @@
2020
"silverstripe/environmentcheck": "3.1.x-dev",
2121
"silverstripe/hybridsessions": "3.0.x-dev",
2222
"silverstripe/registry": "3.3.x-dev",
23-
"silverstripe/totp-authenticator": "5.3.x-dev",
23+
"silverstripe/totp-authenticator": "dev-pulls/5.3/behat as 5.3.x-dev",
2424
"silverstripe/mfa": "5.4.x-dev",
2525
"silverstripe/crontask": "3.1.x-dev",
2626
"silverstripe/gridfieldqueuedexport": "3.3.x-dev",
@@ -41,13 +41,12 @@
4141
"colymba/gridfield-bulk-editing-tools": "4.1.x-dev",
4242
"tractorcow/silverstripe-fluent": "7.3.x-dev",
4343
"silverstripe/dynamodb": "5.0.x-dev",
44-
"silverstripe/linkfield": "4.2.x-dev"
45-
},
46-
"require-dev": {
47-
"silverstripe/frameworktest": "^1",
44+
"silverstripe/linkfield": "4.2.x-dev",
45+
"silverstripe/frameworktest": "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/session-manager": "dev-pulls/2.3/behat as 2.3.x-dev"
5150
},
5251
"extra": {
5352
"project-files": [
@@ -63,9 +62,30 @@
6362
"allow-plugins": {
6463
"composer/installers": true,
6564
"silverstripe/recipe-plugin": true,
66-
"silverstripe/vendor-plugin": true
65+
"silverstripe/vendor-plugin": true,
66+
"dealerdirect/phpcodesniffer-composer-installer": true
67+
},
68+
"platform": {
69+
"php": "8.1"
6770
}
6871
},
6972
"prefer-stable": true,
70-
"minimum-stability": "dev"
73+
"minimum-stability": "dev",
74+
"repositories": {
75+
"x0": {
76+
"type": "vcs",
77+
"url": "[email protected]:creative-commoners/silverstripe-session-manager"
78+
},
79+
"x1": {
80+
"type": "vcs",
81+
"url": "[email protected]:creative-commoners/silverstripe-totp-authenticator"
82+
}
83+
},
84+
"conflict": {
85+
"symfony/cache-contracts": "3.2.1",
86+
"symfony/deprecation-contracts": "3.2.1",
87+
"symfony/event-dispatcher-contracts": "3.2.1",
88+
"symfony/service-contracts": "3.2.1",
89+
"symfony/translation-contracts": "3.2.1"
90+
}
7191
}

0 commit comments

Comments
 (0)