Merge branch '3.7' into 3.8

.github/workflows/ci.yml

@@ -0,0 +1,16 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  # Every Wednesday at 11:10am UTC
+  schedule:
+    - cron: '10 11 * * 3'
+
+jobs:
+  ci:
+    name: CI
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
+    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

.github/workflows/keepalive.yml

@@ -0,0 +1,17 @@
+name: Keepalive
+
+on:
+  workflow_dispatch:
+  # The 4th of every month at 10:50am UTC
+  schedule:
+    - cron: '50 10 4 * *'
+
+jobs:
+  keepalive:
+    name: Keepalive
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Keepalive
+        uses: silverstripe/gha-keepalive@v1

README.md

@@ -1,6 +1,6 @@
 # Comments
 
-[![Build Status](https://api.travis-ci.com/silverstripe/silverstripe-comments.svg?branch=3)](https://travis-ci.com/silverstripe/silverstripe-comments)
+[![CI](https://github.com/silverstripe/silverstripe-comments/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-comments/actions/workflows/ci.yml)
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/silverstripe/silverstripe-comments.svg)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-comments/?branch=master)
 [![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 [![Code Coverage](https://img.shields.io/codecov/c/github/silverstripe/silverstripe-comments.svg)](https://codecov.io/gh/silverstripe/silverstripe-comments)

composer.json

@@ -23,7 +23,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.0"
+        "squizlabs/php_codesniffer": "^3.0",
+        "ezyang/htmlpurifier": "^4.14"
     },
     "extra": {
         "expose": [

tests/CommentsTest.php

@@ -462,7 +462,7 @@ class CommentsTest extends FunctionalTest
         $comment->write();
 
         $html = $item->customise(['CommentsEnabled' => true])->renderWith('CommentsInterface');
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<p>my comment</p>',
             $html
         );
@@ -470,7 +470,7 @@ class CommentsTest extends FunctionalTest
         $comment->AllowHtml = true;
         $comment->write();
         $html = $item->customise(['CommentsEnabled' => true])->renderWith('CommentsInterface');
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<p>my comment</p>',
             $html
         );