Merge branch '5.0' into 5

silverstripe · Dec 13, 2024 · bbcfff6 · bbcfff6
2 parents 1538b6f + cfcafd2
commit bbcfff6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "phpunit/phpunit": "^11.3",
         "silverstripe/versioned": "^3",
         "squizlabs/php_codesniffer": "^3",
-        "silverstripe/userforms": "^7",
+        "silverstripe/userforms": "7.x-dev",
         "silverstripe/standards": "^1",
         "phpstan/extension-installer": "^1.3"
     },

diff --git a/tests/EditableSpamProtectionFieldTest.php b/tests/EditableSpamProtectionFieldTest.php
@@ -9,7 +9,7 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldGroup;
 use SilverStripe\Forms\Form;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Forms\TextField;
 use SilverStripe\SpamProtection\EditableSpamProtectionField;
 use SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension;
@@ -127,15 +127,9 @@ public function testGetIcon()
     protected function getFormMock()
     {
         $formMock = $this->getMockBuilder(Form::class)
-            ->onlyMethods(['sessionMessage', 'sessionError', 'getValidator'])
+            ->onlyMethods(['sessionMessage', 'sessionError'])
             ->disableOriginalConstructor()
             ->getMock();
-
-        $formMock
-            ->expects($this->any())
-            ->method('getValidator')
-            ->willReturn(new RequiredFields());
-
         return $formMock;
     }