From d20c16b1bd01bdccae773090154659a154652755 Mon Sep 17 00:00:00 2001
From: Alwin Drenth <adrenth@gmail.com>
Date: Tue, 8 Mar 2022 09:38:20 +0100
Subject: [PATCH] Maintenance release (see CHANGELOG.md)

---
 .gitattributes            |  7 +++++++
 .github/workflows/php.yml |  3 +++
 CHANGELOG.md              |  6 ++++++
 README.md                 |  1 +
 composer.json             |  5 +++--
 updates/version.yaml      | 17 +++++++++--------
 6 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..eca2e30
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+#
+# Exclude files from exporting
+#
+
+/.gitattributes     export-ignore
+/.github            export-ignore
+/.gitignore         export-ignore
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index b1c4618..b311ece 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -28,6 +28,9 @@ jobs:
         php-version: ${{ matrix.php }}
         coverage: none
 
+    - name: Add HTTP basic auth credentials
+      run: echo '${{ secrets.VDLP_OCTOBER_CMS_AUTH_JSON }}' > $GITHUB_WORKSPACE/auth.json
+
     - name: Validate composer.json and composer.lock
       run: composer validate
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f60158e..e39a9c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.4] - 2022-03-08
+
+- Update GitHub workflow configuration
+- Add .gitattributes file
+- Add version constraint for "october/system"
+
 ## [2.0.3] - 2021-09-24
 
 ### Fixes
diff --git a/README.md b/README.md
index 499eb2d..43663a8 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ Adds CSRF protection.
 ## Requirements
 
 * PHP 7.4 or higher
+* October CMS 1.0 or higher
 
 ## Installation
 
diff --git a/composer.json b/composer.json
index 1faf35f..d8ef9eb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "vdlp/oc-csrf-plugin",
     "description": "Adds CSRF protection to October CMS frontend.",
-    "type": "october-plugin",
     "license": "GPL-2.0",
+    "type": "october-plugin",
     "authors": [
         {
             "name": "Van der Let & Partners",
@@ -11,6 +11,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "composer/installers": "^1.0 || ^2.0"
+        "composer/installers": "^1.0 || ^2.0",
+        "october/system": "^1.0 || ^2.0"
     }
 }
diff --git a/updates/version.yaml b/updates/version.yaml
index e0c9086..627681c 100644
--- a/updates/version.yaml
+++ b/updates/version.yaml
@@ -1,8 +1,9 @@
-1.0.0: "First version of Vdlp.Csrf -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.0.0"
-1.1.0: "Added configuration to exclude paths from CSRF validation -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.1.0"
-1.1.1: "Prevent error on CSRF token conversion -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.1.1"
-1.1.2: "Update plugin dependencies"
-2.0.0: "Support for PHP 7.4 or higher"
-2.0.1: "Fix location of plugin config.php file"
-2.0.2: "Minor improvements -- See: CHANGELOG.md"
-2.0.3: "Fixes type error when using `csrf_token()` Twig function"
+v1.0.0: "First version of Vdlp.Csrf -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.0.0"
+v1.1.0: "Added configuration to exclude paths from CSRF validation -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.1.0"
+v1.1.1: "Prevent error on CSRF token conversion -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.1.1"
+v1.1.2: "Update plugin dependencies"
+v2.0.0: "Support for PHP 7.4 or higher"
+v2.0.1: "Fix location of plugin config.php file"
+v2.0.2: "Minor improvements -- See: CHANGELOG.md"
+v2.0.3: "Fixes type error when using `csrf_token()` Twig function"
+v2.0.4: "Maintenance release"