Merge tag '4.0.0' into develop

4.0.0

Author: nathan-van-der-werf

.github/workflows/php.yml

@@ -20,7 +20,7 @@ jobs:
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -36,7 +36,7 @@ jobs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

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).
 
+## [Unreleased]
+
+* Add support for October CMS 4.x.
+  * Minimal version of PHP required is 8.2.0
+* Drop support for October CMS 3.x.
+
 ## [3.1.11] - 2023-11-30
 
 * Add option to keep query string when redirecting.

Plugin.php

@@ -217,12 +217,18 @@ public function registerReportWidgets(): array
         /** @var Translator $translator */
         $translator = resolve(Translator::class);
 
-        $reportWidgets[ReportWidgets\CreateRedirect::class] = [
-            'label' => 'vdlp.redirect::lang.buttons.create_redirect',
-            'context' => 'dashboard',
-        ];
+        $reportWidgets = [];
 
-        if (Settings::isStatisticsEnabled()) {
+        if (class_exists('Dashboard\Classes\VueReportWidgetBase')) {
+            $reportWidgets[VueComponents\CreateRedirect::class] = [
+                'label' => e($translator->trans(
+                    'vdlp.redirect::lang.buttons.create_redirect'
+                )),
+                'context' => 'dashboard',
+            ];
+        }
+
+        if (class_exists('Dashboard\Classes\ReportWidgetBase') && Settings::isStatisticsEnabled()) {
             $reportWidgets[ReportWidgets\TopTenRedirects::class] = [
                 'label' => e($translator->trans(
                     'vdlp.redirect::lang.statistics.top_redirects_this_month',

README.md

@@ -64,8 +64,8 @@ This plugin adds a 'Redirects' section to the main menu of October CMS. This plu
 
 ## Requirements
 
-* October CMS 3
-* PHP version 8.0.2 or higher.
+* October CMS 4
+* PHP version 8.2.0 or higher.
 * PHP extensions: `ext-curl` and `ext-json`.
 
 ## Supported HTTP status codes

composer.json

@@ -14,14 +14,14 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.2.0",
         "ext-curl": "*",
         "ext-json": "*",
         "composer/installers": "^1.0 || ^2.0",
         "davaxi/sparkline": "^2.0",
         "jaybizzle/crawler-detect": "^1.2",
         "league/csv": "^9.0",
-        "october/rain": "^3.0 || ^4.0",
+        "october/rain": "^4.0",
         "symfony/stopwatch": "^6.0"
     },
     "require-dev": {
@@ -33,6 +33,9 @@
             "url": "https://gateway.octobercms.com"
         }
     ],
+    "suggest": {
+        "october/dashboard": "Allows to add the widgets to the dashboard."
+    },
     "config": {
         "allow-plugins": {
             "composer/installers": true,

controllers/Redirects.php

@@ -19,6 +19,7 @@
 use Illuminate\Support\Arr;
 use October\Rain\Database\Builder;
 use October\Rain\Database\Model;
+use October\Rain\Element\ElementHolder;
 use October\Rain\Exception\ApplicationException;
 use October\Rain\Exception\SystemException;
 use October\Rain\Flash\FlashBag;
@@ -37,7 +38,6 @@
 /**
  * @mixin Behaviors\FormController
  * @mixin Behaviors\ListController
- * @mixin Behaviors\ReorderController
  * @mixin Behaviors\ImportExportController
  * @mixin Behaviors\RelationController
  */
@@ -46,7 +46,6 @@ final class Redirects extends Controller
     public $implement = [
         Behaviors\FormController::class,
         Behaviors\ListController::class,
-        Behaviors\ReorderController::class,
         Behaviors\ImportExportController::class,
         Behaviors\RelationController::class,
     ];
@@ -58,7 +57,6 @@ final class Redirects extends Controller
         'requestLog' => 'request-log/config_list.yaml',
     ];
 
-    public $reorderConfig = 'config_reorder.yaml';
     public $importExportConfig = 'config_import_export.yaml';
     public $relationConfig = 'config_relation.yaml';
     public $requiredPermissions = ['vdlp.redirect.access_redirects'];
@@ -302,7 +300,7 @@ public function listExtendQuery(Builder $query, $definition = null): void
         }
     }
 
-    public function formExtendFields(Form $host, array $fields = []): void
+    public function formExtendFields(Form $host, ElementHolder|array $fields = []): void
     {
         $disableFields = [
             'from_url',
@@ -330,7 +328,7 @@ public function formExtendFields(Form $host, array $fields = []): void
         }
     }
 
-    public function formExtendRefreshFields(Form $host, array $fields): void
+    public function formExtendRefreshFields(Form $host, ElementHolder|array $fields): void
     {
         /** @var Models\Redirect $model */
         $model = $host->model;

controllers/redirects/_list_toolbar.htm

@@ -15,11 +15,6 @@
         </a>
     <?php endif; ?>
 
-    <a class="btn btn-default oc-icon-sort-amount-asc"
-       href="<?= Backend::url('vdlp/redirect/redirects/reorder'); ?>">
-        <?= e(trans('vdlp.redirect::lang.buttons.reorder_redirects')); ?>
-    </a>
-
     <div class="btn-group" id="checkBoxTriggeredButtons">
         <button class="btn btn-default oc-icon-trash-o"
                 disabled=""

controllers/redirects/_reorder_toolbar.htm

@@ -44,3 +44,8 @@ toolbar:
         prompt: backend::lang.list.search_prompt
 
 filter: config_filter.yaml
+
+structure:
+    showTree: false
+    showReorder: true
+    dragRow: false