Merge branch '3' into 4.0

# Conflicts: # _config.php
2023-06-16 12:10:02 +12:00 · 2023-04-27 14:31:23 +12:00 · 2023-04-26 08:22:45 +12:00 · 2023-04-24 16:31:47 +12:00 · 2023-03-30 12:58:33 +13:00 · 2023-03-08 12:02:33 +13:00
4 changed files with 11 additions and 32 deletions
--- a/.upgrade.yml
+++ b/.upgrade.yml
@ -1,11 +0,0 @@
-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
--- a/README.md
+++ b/README.md
@ -3,6 +3,12 @@
 [![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
@ -11,16 +17,6 @@
 * 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
--- a/composer.json
+++ b/composer.json
@ -17,14 +17,14 @@
        }
    ],
    "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "^4.10"
+        "php": "^8.1",
+        "silverstripe/framework": "^5"
    },
    "require-dev": {
        "phpunit/phpunit": "^9.5",
-        "silverstripe/versioned": "^1.0",
-        "squizlabs/php_codesniffer": "^3.0",
-        "silverstripe/userforms": "^5"
+        "silverstripe/versioned": "^2",
+        "squizlabs/php_codesniffer": "^3",
+        "silverstripe/userforms": "^6"
    },
    "extra": {
        "expose": [
--- a/legacy.yml
+++ b/legacy.yml
@ -1,6 +0,0 @@
---
-Name: spamprotectionlegacy
---
-SilverStripe\ORM\DatabaseAdmin:
-  classname_value_remapping:
-    EditableSpamProtectionField: 'SilverStripe\SpamProtection\EditableSpamProtectionField'
Author	SHA1	Message	Date
Steve Boyd	4b3f5a2599	Merge branch '3' into 4.0	2023-06-16 12:10:02 +12:00
Guy Sartorelli	e1b4ea2807	Merge branch '3' into 4.0 # Conflicts: # _config.php	2023-04-27 14:31:23 +12:00
Sabina Talipova	c08ec451bf	Merge pull request #96 from creative-commoners/pulls/4.0/cms5-readme DOC Update README.md for CMS 5	2023-04-26 08:22:45 +12:00
Guy Sartorelli	00869b6755	DOC Update README.md for CMS 5	2023-04-24 16:31:47 +12:00
Steve Boyd	cfcfa9352c	Merge branch '3' into 4.0	2023-03-30 12:58:33 +13:00
Steve Boyd	9e74d2749e	Merge branch '3' into 4.0	2023-03-08 12:02:33 +13:00
Steve Boyd	04f6d63258	Merge branch '3' into 4	2023-02-03 10:30:15 +13:00
Maxime Rainville	41cd3190ee	Merge pull request #90 from creative-commoners/pulls/4/remove-legacy-upgrader MNT Remove legacy upgrader config	2023-01-23 10:10:38 +13:00
Steve Boyd	20270caef8	MNT Remove legacy upgrader config	2023-01-20 16:49:42 +13:00
Sabina Talipova	ad2dd60c77	Merge pull request #89 from creative-commoners/pulls/4/unit-test MNT Explicitly test with default_spam_protector set to null	2023-01-18 16:00:21 +13:00
Steve Boyd	f194344efe	MNT Explicitly test with default_spam_protector set to null	2023-01-18 15:52:48 +13:00
Sabina Talipova	537b1b9290	Merge branch '3' into 4	2023-01-17 12:49:21 +13:00
Maxime Rainville	d4df0bad4c	Merge pull request #86 from creative-commoners/pulls/4/upgrade-cms5 DEP PHP Support in CMS5	2023-01-13 13:44:24 +13:00
Sabina Talipova	d669b42cc9	DEP PHP Support in CMS5	2023-01-13 11:35:58 +13:00