MNT Use temporary fork of fluent

silverstripe · Jan 19, 2023 · 43f0fcd · 43f0fcd
1 parent 6701348
commit 43f0fcd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git 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
@@ -6,7 +6,7 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",
-        "silverstripe/recipe-plugin": "^2",
+        "silverstripe/recipe-plugin": "2.x-dev",
         "silverstripe/installer": "5.x-dev",
         "silverstripe/recipe-authoring-tools": "2.x-dev",
         "silverstripe/recipe-blog": "2.x-dev",
@@ -17,33 +17,30 @@
         "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",
-        "tractorcow/silverstripe-fluent": "5.x-dev"
+        "silverstripe/silverstripe-fluent": "7.x-dev"
     },
     "require-dev": {
         "silverstripe/frameworktest": "^1",
-        "silverstripe/graphql-devtools": "2.x-dev",
+        "silverstripe/graphql-devtools": "1.x-dev",
         "silverstripe/recipe-testing": "^3",
         "mikey179/vfsstream": "^1.6"
     },
@@ -66,4 +63,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -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>
@@ -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>