From 9baa0e9b302594d35190e2ecb7ce616adfca15bf Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@silverstripe.com>
Date: Wed, 31 Jan 2024 10:13:43 +1300
Subject: [PATCH 1/2] MNT Run module-standardiser

---
 .github/workflows/dispatch-ci.yml | 4 ++--
 .github/workflows/merge-up.yml    | 4 ++--
 composer.json                     | 6 ++++--
 phpstan.neon.dist                 | 3 +++
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 phpstan.neon.dist

diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml
index 9db0ff8e..db4844e2 100644
--- a/.github/workflows/dispatch-ci.yml
+++ b/.github/workflows/dispatch-ci.yml
@@ -1,9 +1,9 @@
 name: Dispatch CI
 
 on:
-  # At 12:10 PM UTC, only on Tuesday and Wednesday
+  # At 10:50 PM UTC, only on Saturday and Sunday
   schedule:
-    - cron: '10 12 * * 2,3'
+    - cron: '50 22 * * 6,0'
 
 jobs:
   dispatch-ci:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
index 1cc51d66..9f867182 100644
--- a/.github/workflows/merge-up.yml
+++ b/.github/workflows/merge-up.yml
@@ -1,9 +1,9 @@
 name: Merge-up
 
 on:
-  # At 12:10 PM UTC, only on Saturday
+  # At 10:50 PM UTC, only on Wednesday
   schedule:
-    - cron: '10 12 * * 6'
+    - cron: '50 22 * * 3'
   workflow_dispatch:
 
 jobs:
diff --git a/composer.json b/composer.json
index dd3b7a97..82cf6d9f 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,9 @@
         "silverstripe/recipe-testing": "^3",
         "silverstripe/versioned": "^2",
         "squizlabs/php_codesniffer": "^3.7",
-        "mikey179/vfsstream": "^v1.6.11"
+        "mikey179/vfsstream": "^v1.6.11",
+        "silverstripe/standards": "^1",
+        "phpstan/extension-installer": "^1.3"
     },
     "suggest": {
         "ext-exif": "If you use GD backend (the default) you may want to have EXIF extension installed to elude some tricky issues"
@@ -50,4 +52,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
\ No newline at end of file
+}
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
new file mode 100644
index 00000000..beb9de3c
--- /dev/null
+++ b/phpstan.neon.dist
@@ -0,0 +1,3 @@
+parameters:
+  paths:
+    - src

From 11ed0d17080e12cec5f2cd29d7189f8ad4b5ff06 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@silverstripe.com>
Date: Wed, 31 Jan 2024 14:12:54 +1300
Subject: [PATCH 2/2] MNT Update `@method` annotations

---
 src/Shortcodes/FileLinkTracking.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Shortcodes/FileLinkTracking.php b/src/Shortcodes/FileLinkTracking.php
index 15bae1d0..c7a42564 100644
--- a/src/Shortcodes/FileLinkTracking.php
+++ b/src/Shortcodes/FileLinkTracking.php
@@ -9,7 +9,7 @@
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBHTMLText;
-use SilverStripe\ORM\ManyManyList;
+use SilverStripe\ORM\ManyManyThroughList;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\Parsers\HTMLValue;
 
@@ -24,7 +24,7 @@
  * only be enabled for the Stage record.
  *
  * @property DataObject|FileLinkTracking $owner
- * @method SilverStripe\ORM\ManyManyThroughList<File> FileTracking()
+ * @method ManyManyThroughList<File> FileTracking()
  */
 class FileLinkTracking extends DataExtension
 {