Merge pull request #286 from silverstripeltd/pulls/cms6-support

Author: edwilde

composer.json

@@ -24,7 +24,7 @@
     ],
     "require": {
         "php": "^8.3",
-        "silverstripe/vendor-plugin": "^2",
+        "silverstripe/vendor-plugin": "^3",
         "silverstripe/framework": "^6",
         "silverstripe/cms": "^6",
         "silverstripe/reports": "^6",

src/Extensions/ContentReviewCMSExtension.php

@@ -149,7 +149,7 @@ protected function getSchemaRequested()
      * @param array $extraData Any extra data to be merged with the schema response
      * @return HTTPResponse
      */
-    protected function getSchemaResponse($schemaID, $form = null, ValidationResult $errors = null, $extraData = [])
+    protected function getSchemaResponse($schemaID, $form = null, ?ValidationResult $errors = null, $extraData = [])
     {
         $parts = $this->owner->getRequest()->getHeader(FormSchema::SCHEMA_HEADER);
         $data = $this->owner

src/Extensions/SiteTreeContentReview.php

@@ -196,7 +196,7 @@ protected function updateCMSActions(FieldList $actions)
      *
      * @return null|DBDate
      */
-    public function getReviewDate(SiteTree $page = null)
+    public function getReviewDate(?SiteTree $page = null)
     {
         if ($page === null) {
             $page = $this->owner;
@@ -527,7 +527,7 @@ public function advanceReviewDate()
      *
      * @return bool
      */
-    public function canBeReviewedBy(Member $member = null)
+    public function canBeReviewedBy(?Member $member = null)
     {
         if (!$this->owner->obj('NextReviewDate')->exists()) {
             return false;

tests/behat/features/content-reviews.feature

@@ -53,6 +53,6 @@ Feature: Set up reviews
     And I press "Mark as reviewed"
     And I wait for 1 second
     Then I should see "Review successfully added"
-    When I click on the ".close" element
+    When I click on the ".btn-close" element
     And I press the "Save" button
     Then I should see "My review"