diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e9477a..a30cb0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/composer.json b/composer.json index 5e14c3d..7915750 100644 --- a/composer.json +++ b/composer.json @@ -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": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3bd98ff..358397e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -64,7 +64,6 @@ vendor/silverstripe/documentconverter/tests vendor/silverstripe/iframe/tests - vendor/silverstripe/spellcheck/tests vendor/silverstripe/tagfield/tests vendor/silverstripe/taxonomy/tests @@ -75,7 +74,6 @@ vendor/silverstripe/widgets/tests vendor/silverstripe/content-widget/tests vendor/silverstripe/spamprotection/tests - vendor/silverstripe/akismet/tests vendor/silverstripe/comments/tests vendor/silverstripe/comment-notifications/tests