Merge branch 'release/3.1.0'

.gitattributes

@@ -0,0 +1,7 @@
+#
+# Exclude files from exporting
+#
+
+/.gitattributes     export-ignore
+/.github            export-ignore
+/.gitignore         export-ignore

.github/workflows/php.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.0, 7.4 ]
+        php: [ 8.0 ]
         stability: [ prefer-lowest, prefer-stable ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
@@ -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
 

CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.0] - 2022-09-23
+
+### Added
+
+- Added missing translation for 'access_feeds' (Manage feeds).
+
+### Removed
+
+- Dropped support for PHP 7.4
+- Dropped support for October CMS 1.0
+
 ## [3.0.4] - 2021-09-10
 
 ### Fixes

composer.json

@@ -1,9 +1,14 @@
 {
     "name": "vdlp/oc-rssfetcher-plugin",
     "description": "Fetches RSS headlines from various sources to put on your website.",
+    "license": "GPL-2.0-only",
     "type": "october-plugin",
-    "keywords": ["october", "cms", "rss", "plugin"],
-    "license": "GPL-2.0",
+    "keywords": [
+        "october",
+        "cms",
+        "rss",
+        "plugin"
+    ],
     "authors": [
         {
             "name": "Van der Let & Partners",
@@ -15,16 +20,28 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0.2",
+        "composer/installers": "^1.0 || ^2.0",
         "laminas/laminas-feed": "^2.14",
         "laminas/laminas-http": "^2.14",
-        "composer/installers": "^1.0"
+        "october/system": ">=2.0"
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://gateway.octobercms.com"
+        }
+    ],
     "archive": {
         "exclude": [
-            ".gitignore",
-            ".idea/",
-            ".github/"
+            ".gitattributes",
+            ".github",
+            ".gitignore"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true
+        }
     }
 }

lang/en/lang.php

@@ -11,6 +11,7 @@
         'access_sources' => 'Manage sources',
         'access_items' => 'Manege items',
         'access_import_export' => 'Allowed to import and export',
+        'access_feeds' => 'Manage feeds',
     ],
     'navigation' => [
         'menu_label' => 'RSS Fetcher',

lang/nl/lang.php

@@ -11,6 +11,7 @@
         'access_sources' => 'Beheer bronnen',
         'access_items' => 'Beheer items',
         'access_import_export' => 'Toestaan importeren en exporteren',
+        'access_feeds' => 'Beheer feeds',
     ],
     'navigation' => [
         'menu_label' => 'RSS Fetcher',

updates/version.yaml

@@ -1,27 +1,28 @@
-1.0.0:
+v1.0.0:
     - "First version of RssFetcher"
     - 20180718_0001_create_sources_table.php
     - 20180718_0002_create_items_table.php
     - 20180718_0003_seed_feeds_table.php
     - 20180718_0004_seed_sources_table.php
-1.0.1: "Add correct controller permissions"
-1.0.2:
+v1.0.1: "Add correct controller permissions"
+v1.0.2:
     - "Move publish_new_items to Sources table"
     - 20181012_0005_move_publish_new_items_to_sources_table.php
-1.0.3: "Fix SQL error with `enclosure_length` attribute"
-1.0.4: "Code optimizations"
-1.0.5: "Escape output to prevent XSS injections"
-1.1.0: "Code improvements (>= PHP 7.1)"
-1.2.0:
+v1.0.3: "Fix SQL error with `enclosure_length` attribute"
+v1.0.4: "Code optimizations"
+v1.0.5: "Escape output to prevent XSS injections"
+v1.1.0: "Code improvements (>= PHP 7.1)"
+v1.2.0:
     - "Improve item saving"
     - 20200206_0006_remove_unique_constraint_from_items.php
-2.0.0:
+v2.0.0:
     - "Replace Zend Framework with Laminas and added events"
-2.1.0: "Fix Author parsing for Atom/RSS feeds"
-2.2.0: Update plugin dependencies (minimum required PHP version 7.3)
-2.2.1: "Fix error when performing a migration rollback"
-3.0.0: Drop support for PHP 7.3 (minimum required PHP version 7.4)
-3.0.1: "Fix type in Sources component (Sources::$sources)"
-3.0.2: "Fix type in Items component (Items::$items)"
-3.0.3: "Replace the use of Event facade with Event dispatcher"
-3.0.4: "Update CHANGELOG.md and fix v3.0.0 description"
+v2.1.0: "Fix Author parsing for Atom/RSS feeds"
+v2.2.0: Update plugin dependencies (minimum required PHP version 7.3)
+v2.2.1: "Fix error when performing a migration rollback"
+v3.0.0: Drop support for PHP 7.3 (minimum required PHP version 7.4)
+v3.0.1: "Fix type in Sources component (Sources::$sources)"
+v3.0.2: "Fix type in Items component (Items::$items)"
+v3.0.3: "Replace the use of Event facade with Event dispatcher"
+v3.0.4: "Update CHANGELOG.md and fix v3.0.0 description"
+v3.1.0: "Maintenance update -- see CHANGELOG.md"