Merge branch '3.4' into 3

.github/workflows/keepalive.yml

@@ -1,10 +1,10 @@
 name: Keepalive
 
 on:
-  # At 8:40 AM UTC, on day 9 of the month
-  schedule:
-    - cron: '40 8 9 * *'
   workflow_dispatch:
+  # The 4th of every month at 10:50am UTC
+  schedule:
+    - cron: '50 10 4 * *'
 
 jobs:
   keepalive:

.github/workflows/merge-up.yml

@@ -1,17 +0,0 @@
-name: Merge-up
-
-on:
-  # At 11:10 AM UTC, only on Wednesday
-  schedule:
-    - cron: '10 11 * * 3'
-  workflow_dispatch:
-
-jobs:
-  merge-up:
-    name: Merge-up
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Merge-up
-        uses: silverstripe/gha-merge-up@v1

.upgrade.yml

@@ -0,0 +1,11 @@
+mappings:
+  SpamProtector: SilverStripe\SpamProtection\SpamProtector
+  CommentSpamProtection: SilverStripe\SpamProtection\Extension\CommentSpamProtection
+  EditableSpamProtectionField: SilverStripe\SpamProtection\EditableSpamProtectionField
+  FormSpamProtectionExtension: SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension
+  EditableSpamProtectionFieldTest: SilverStripe\SpamProtection\Tests\EditableSpamProtectionFieldTest
+  EditableSpamProtectionFieldTest_Protector: SilverStripe\SpamProtection\Tests\Stub\Protector
+  FormSpamProtectionExtensionTest: SilverStripe\SpamProtection\Tests\FormSpamProtectionExtensionTest
+  FormSpamProtectionExtensionTest_BarProtector: SilverStripe\SpamProtection\Tests\Stub\BarProtector
+  FormSpamProtectionExtensionTest_BazProtector: SilverStripe\SpamProtection\Tests\Stub\BazProtector
+  FormSpamProtectionExtensionTest_FooProtector: SilverStripe\SpamProtection\Tests\Stub\FooProtector

README.md

@@ -3,12 +3,6 @@
 [![CI](https://github.com/silverstripe/silverstripe-spamprotection/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-spamprotection/actions/workflows/ci.yml)
 [![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
-## Installation
-
-```sh
-composer require silverstripe/spamprotection
-```
-
 ## Maintainer Contact
 
  * Saophalkun Ponlu
@@ -17,6 +11,16 @@ composer require silverstripe/spamprotection
  * Will Rossiter
    <will (at) fullscreen (dot) io>
 
+## Requirements
+
+Silverstripe 4.0+
+
+**Note:** For Silverstripe 3.x, please use the [2.x release line](https://github.com/silverstripe/silverstripe-spamprotection/tree/2.0).
+
+## Install
+
+To install run `composer require silverstripe/spamprotection`.
+
 ## Documentation
 
 This module provides a generic, consistent API for adding spam protection to
@@ -28,7 +32,6 @@ implementations. Currently available options are:
 * [MathSpamProtection](https://github.com/silverstripe/silverstripe-mathspamprotection)
 * [Akismet](https://github.com/silverstripe/silverstripe-akismet)
 * [Mollom](https://github.com/silverstripe-archive/silverstripe-mollom)
-* [Cloudflare Turnstile](https://github.com/silverstripe-terraformers/turnstile-captcha/)
 
 As a developer you can also provide your own protector by creating a class which
 implements the `\SilverStripe\SpamProtection\SpamProtector` interface. More on that below.

composer.json

@@ -17,14 +17,14 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "silverstripe/framework": "^5"
+        "php": "^7.4 || ^8.0",
+        "silverstripe/framework": "^4.10"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6",
-        "silverstripe/versioned": "^2",
-        "squizlabs/php_codesniffer": "^3",
-        "silverstripe/userforms": "^6"
+        "phpunit/phpunit": "^9.5",
+        "silverstripe/versioned": "^1.0",
+        "squizlabs/php_codesniffer": "^3.0",
+        "silverstripe/userforms": "^5"
     },
     "extra": {
         "expose": [
@@ -40,4 +40,4 @@
     "license": "BSD-3-Clause",
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

lang/sk.yml

@@ -1,6 +1,12 @@
 sk:
   SilverStripe\SpamProtection\EditableSpamProtectionField:
     PLURALNAME: 'Polia ochrany proti spamu'
+    PLURALS:
+      few: '{count} polia ochrany proti spamu'
+      many: '{count} polí ochrany proti spamu'
+      one: 'Pole ochrany proti spamu'
+      other: '{count} polí ochrany proti spamu'
     SINGULARNAME: 'Pole ochrany proti spamu'
     SPAMFIELDMAPPING: 'Mapovanie spamového poľa'
     SPAMFIELDMAPPINGDESCRIPTION: 'Vyberte polia formulára, ktoré zodpovedajú všetkým príslušným identifikátorom ochrany proti spamu'
+    db_SpamFieldSettings: 'Nastavenia poľa spamu'

legacy.yml

@@ -0,0 +1,6 @@
+---
+Name: spamprotectionlegacy
+---
+SilverStripe\ORM\DatabaseAdmin:
+  classname_value_remapping:
+    EditableSpamProtectionField: 'SilverStripe\SpamProtection\EditableSpamProtectionField'

license.md

@@ -1,4 +1,4 @@
-Copyright (c) 2017, Silverstripe Limited
+Copyright (c) 2017, SilverStripe Limited
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: