Skip to content

Commit 9c334b1

Browse files
committed
.
1 parent c9314b9 commit 9c334b1

File tree

3 files changed

+15789
-7
lines changed

3 files changed

+15789
-7
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-7
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
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/admin": "dev-pulls/2.4/sudo2 as 2.4.x-dev",
50+
"silverstripe/framework": "dev-pulls/5.4/sudo2 as 5.4.x-dev"
5151
},
5252
"extra": {
5353
"project-files": [
@@ -63,9 +63,30 @@
6363
"allow-plugins": {
6464
"composer/installers": true,
6565
"silverstripe/recipe-plugin": true,
66-
"silverstripe/vendor-plugin": true
66+
"silverstripe/vendor-plugin": true,
67+
"dealerdirect/phpcodesniffer-composer-installer": true
68+
},
69+
"platform": {
70+
"php": "8.1"
6771
}
6872
},
6973
"prefer-stable": true,
70-
"minimum-stability": "dev"
74+
"minimum-stability": "dev",
75+
"repositories": {
76+
"x0": {
77+
"type": "vcs",
78+
"url": "[email protected]:creative-commoners/silverstripe-admin"
79+
},
80+
"x1": {
81+
"type": "vcs",
82+
"url": "[email protected]:creative-commoners/silverstripe-framework"
83+
}
84+
},
85+
"conflict": {
86+
"symfony/cache-contracts": "3.2.1",
87+
"symfony/deprecation-contracts": "3.2.1",
88+
"symfony/event-dispatcher-contracts": "3.2.1",
89+
"symfony/service-contracts": "3.2.1",
90+
"symfony/translation-contracts": "3.2.1"
91+
}
7192
}

0 commit comments

Comments
 (0)