Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEP PHP Support in CMS5 #26

Merged
merged 3 commits into from
Jan 19, 2023
Merged

DEP PHP Support in CMS5 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd343c3
DEP PHP Support in CMS5
Dec 19, 2022
6701348
DEP remove cwp/cwp-pdfexport
emteknetnz Jan 18, 2023
43f0fcd
MNT Use temporary fork of fluent
emteknetnz Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ jobs:
# This should be php 7.3 & 8.0 in 4.10, and php 7.4 & 8.1 in 4.11+
# Run recipe-cms testsuite because that's the most likely to have weird conflicts e.g. graphql
extra_jobs: |
- php: 7.4
composer_args: --prefer-lowest
phpunit: true
phpunit_suite: recipe-cms
- php: 8.1
phpunit: true
phpunit_suite: recipe-cms
# TODO: renable prefer-lowest build once CMS 5 beta is out
# - php: 8.1
# composer_args: --prefer-lowest
# phpunit: true
# phpunit_suite: recipe-cms
Comment on lines +31 to +35
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added this to silverstripe/gha-generate-matrix#41

70 changes: 34 additions & 36 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,43 @@
"homepage": "https://github.com/silverstripe/recipe-kitchen-sink",
"license": "BSD-3-Clause",
"require": {
"php": "^7.4 || ^8.0",
"silverstripe/recipe-plugin": "^1",
"silverstripe/installer": "4.x-dev",
"silverstripe/recipe-authoring-tools": "1.x-dev",
"silverstripe/recipe-blog": "1.x-dev",
"silverstripe/recipe-collaboration": "1.x-dev",
"silverstripe/recipe-form-building": "1.x-dev",
"silverstripe/recipe-reporting-tools": "1.x-dev",
"silverstripe/recipe-services": "1.x-dev",
"silverstripe/recipe-content-blocks": "2.x-dev",
"silverstripe/recipe-solr-search": "2.x-dev",
"silverstripe/recipe-ccl": "2.x-dev",
"silverstripe/developer-docs": "4.x-dev",
"silverstripe/registry": "2.x-dev",
"silverstripe/totp-authenticator": "4.x-dev",
"silverstripe/mfa": "4.x-dev",
"silverstripe/crontask": "2.x-dev",
"silverstripe/gridfieldqueuedexport": "2.x-dev",
"silverstripe/ldap": "1.x-dev",
"silverstripe/textextraction": "3.x-dev",
"silverstripe/realme": "4.x-dev",
"silverstripe/ckan-registry": "1.x-dev",
"silverstripe/webauthn-authenticator": "4.x-dev",
"silverstripe/security-extensions": "4.x-dev",
"silverstripe/subsites": "2.x-dev",
"silverstripe/html5": "2.x-dev",
"cwp/starter-theme": "3.x-dev",
"cwp/agency-extensions": "2.x-dev",
"cwp/watea-theme": "3.x-dev",
"cwp/cwp": "2.x-dev",
"cwp/cwp-pdfexport": "1.x-dev",
"dnadesign/silverstripe-elemental-userforms": "~3.2.1@stable",
"symbiote/silverstripe-multivaluefield": "5.x-dev",
"tractorcow/silverstripe-fluent": "4.x-dev"
"php": "^8.1",
"silverstripe/recipe-plugin": "2.x-dev",
"silverstripe/installer": "5.x-dev",
"silverstripe/recipe-authoring-tools": "2.x-dev",
"silverstripe/recipe-blog": "2.x-dev",
"silverstripe/recipe-collaboration": "2.x-dev",
"silverstripe/recipe-form-building": "2.x-dev",
"silverstripe/recipe-reporting-tools": "2.x-dev",
"silverstripe/recipe-services": "2.x-dev",
"silverstripe/recipe-content-blocks": "3.x-dev",
"silverstripe/recipe-solr-search": "3.x-dev",
"silverstripe/recipe-ccl": "3.x-dev",
"silverstripe/developer-docs": "5.x-dev",
"silverstripe/registry": "3.x-dev",
"silverstripe/totp-authenticator": "5.x-dev",
"silverstripe/mfa": "5.x-dev",
"silverstripe/crontask": "3.x-dev",
"silverstripe/gridfieldqueuedexport": "3.x-dev",
"silverstripe/ldap": "2.x-dev",
"silverstripe/textextraction": "4.x-dev",
"silverstripe/realme": "5.x-dev",
"silverstripe/ckan-registry": "2.x-dev",
"silverstripe/webauthn-authenticator": "5.x-dev",
"silverstripe/security-extensions": "5.x-dev",
"silverstripe/subsites": "3.x-dev",
"cwp/starter-theme": "4.x-dev",
"cwp/agency-extensions": "3.x-dev",
"cwp/watea-theme": "4.x-dev",
"cwp/cwp": "3.x-dev",
"dnadesign/silverstripe-elemental-userforms": "4.x-dev",
"symbiote/silverstripe-multivaluefield": "6.x-dev",
"silverstripe/silverstripe-fluent": "7.x-dev"
},
"require-dev": {
"silverstripe/frameworktest": "^0.4.6",
"silverstripe/frameworktest": "^1",
"silverstripe/graphql-devtools": "1.x-dev",
"silverstripe/recipe-testing": "^2",
"silverstripe/recipe-testing": "^3",
"mikey179/vfsstream": "^1.6"
},
"extra": {
Expand Down
2 changes: 0 additions & 2 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<testsuite name="recipe-authoring-tools">
<directory>vendor/silverstripe/documentconverter/tests</directory>
<directory>vendor/silverstripe/iframe/tests</directory>
<directory>vendor/silverstripe/spellcheck/tests</directory>
<directory>vendor/silverstripe/tagfield/tests</directory>
<directory>vendor/silverstripe/taxonomy/tests</directory>
</testsuite>
Expand All @@ -75,7 +74,6 @@
<directory>vendor/silverstripe/widgets/tests</directory>
<directory>vendor/silverstripe/content-widget/tests</directory>
<directory>vendor/silverstripe/spamprotection/tests</directory>
<directory>vendor/silverstripe/akismet/tests</directory>
<directory>vendor/silverstripe/comments/tests</directory>
<directory>vendor/silverstripe/comment-notifications/tests</directory>
</testsuite>
Expand Down