Merge branch '2.9' into 2.10

Author: emteknetnz

.github/workflows/ci.yml

@@ -0,0 +1,16 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  # Every Monday at 12:10pm UTC
+  schedule:
+    - cron: '10 12 * * 1'
+
+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 @@
 # CWP features modules
 
-[![Build Status](https://api.travis-ci.com/silverstripe/cwp.svg?branch=2)](https://travis-ci.com/silverstripe/cwp)
+[![CI](https://github.com/silverstripe/cwp/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/cwp/actions/workflows/ci.yml)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/cwp/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/cwp/?branch=master)
 [![codecov](https://codecov.io/gh/silverstripe/cwp/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/cwp)
 [![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)

composer.json

@@ -17,7 +17,11 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3"
+        "squizlabs/php_codesniffer": "^3",
+        "cwp/starter-theme": "^2"
+    },
+    "conflict": {
+        "silverstripe/auditor": "<2.2.1"
     },
     "suggest": {
         "silverstripe/crontask": "Allows CWP cleanup tasks to be scheduled"

src/PageTypes/DatedUpdateHolder.php

@@ -5,11 +5,13 @@
 use DateTime;
 use Page;
 use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTP;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\ArrayList;
+use SilverStripe\ORM\Connect\DatabaseException;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\PaginatedList;
@@ -146,6 +148,15 @@ public static function AllUpdates(
             ));
         }
 
+        try {
+            // Try running query inside try/catch block to handle any invalid date format
+            $items->dataQuery()->execute();
+        } catch (DatabaseException $e) {
+            self::handleInvalidDateFormat($e);
+            // Ensure invalid SQL does not get run again
+            $items = $className::get()->limit(0);
+        }
+
         // Unpaginated DataList.
         return $items;
     }
@@ -185,20 +196,25 @@ public static function ExtractMonths(
             $link = Director::makeRelative($_SERVER['REQUEST_URI']);
         }
 
-        $dates = $updates->dataQuery()
-            ->groupby('YEAR("Date")')
-            ->groupby('MONTH("Date")')
-            ->query()
-            ->setSelect([
-                'Year' => 'YEAR("Date")',
-                'Month' => 'MONTH("Date")',
-            ])
-            ->addWhere('"Date" IS NOT NULL')
-            ->setOrderBy([
-                'YEAR("Date")' => 'DESC',
-                'MONTH("Date")' => 'DESC',
-            ])
-            ->execute();
+        $dates = [];
+        try {
+            $dates = $updates->dataQuery()
+                ->groupby('YEAR("Date")')
+                ->groupby('MONTH("Date")')
+                ->query()
+                ->setSelect([
+                    'Year' => 'YEAR("Date")',
+                    'Month' => 'MONTH("Date")',
+                ])
+                ->addWhere('"Date" IS NOT NULL')
+                ->setOrderBy([
+                    'YEAR("Date")' => 'DESC',
+                    'MONTH("Date")' => 'DESC',
+                ])
+                ->execute();
+        } catch (DatabaseException $e) {
+            self::handleInvalidDateFormat($e);
+        }
 
         $years = [];
         foreach ($dates as $date) {
@@ -260,4 +276,19 @@ public function getSubscriptionTitle()
     {
         return $this->Title;
     }
+
+    private static function handleInvalidDateFormat(DatabaseException $e): void
+    {
+        $controller = Controller::curr();
+        if ($controller instanceof DatedUpdateHolderController &&
+            strpos($e->getMessage(), 'Incorrect DATETIME value') !== false
+        ) {
+            $controller->getRequest()->getSession()->set(DatedUpdateHolderController::TEMP_FORM_MESSAGE, _t(
+                DatedUpdateHolderController::class . '.InvalidDateFormat',
+                'Dates must be in "y-MM-dd" format.'
+            ));
+        } else {
+            throw $e;
+        }
+    }
 }