From f5594140d950b3377062569f9761613ff85db1bd Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Fri, 27 Aug 2021 17:09:36 +0200 Subject: [PATCH 1/5] Add PHP 8.0 version constraint and composer/installers package --- composer.json | 5 +++-- updates/version.yaml | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3360d07..7593387 100644 --- a/composer.json +++ b/composer.json @@ -14,12 +14,13 @@ } ], "require": { - "php": "^7.1.3", + "php": "^7.1.3 || ^8.0", "ext-json": "*", "ext-curl": "*", "jaybizzle/crawler-detect": "^1.2", "symfony/stopwatch": "^4.0|^5.0", - "davaxi/sparkline": "~1.2.0" + "davaxi/sparkline": "~1.2.0", + "composer/installers": "^1.0" }, "archive": { "exclude": [ diff --git a/updates/version.yaml b/updates/version.yaml index abe8e67..606d1d4 100644 --- a/updates/version.yaml +++ b/updates/version.yaml @@ -89,3 +89,5 @@ - "Improve redirect caching management (revised) -- See: https://github.com/vdlp/oc-redirect-plugin/releases/tag/2.5.8" 2.5.9: - "Fix import in Plugin file" +2.5.10: + - "Add PHP 8.0 version constraint and composer/installers package" From 7db6fa80c6c24b51061332aaf57753d9457ec584 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Fri, 27 Aug 2021 17:15:45 +0200 Subject: [PATCH 2/5] Update CHANGELOG --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44bd993..89699b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +# 2.5.10 + +* Add PHP 8.0 version constraint. +* Add composer/installers package. + +# 2.5.9 + +* Fix import in Plugin file. + +# 2.5.8 + +* Improve redirect caching management (revised). + +# 2.5.7 + +* Improve redirect caching management. + # 2.5.6 * Prevent connection exception when accessing settings in CLI mode From f060c5b81461f6267e1c51455a1bc00884a0759e Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 31 Aug 2021 12:42:14 +0200 Subject: [PATCH 3/5] Bump version --- CHANGELOG.md | 51 +++++++++++++++++++++++++------------------- updates/version.yaml | 2 ++ 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89699b9..55a9a12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,69 +1,76 @@ -# 2.5.10 +# CHANGELOG + +## 2.5.11 + +* Remove CMS support check. +* Fix bad use of import. + +## 2.5.10 * Add PHP 8.0 version constraint. * Add composer/installers package. -# 2.5.9 +## 2.5.9 * Fix import in Plugin file. -# 2.5.8 +## 2.5.8 * Improve redirect caching management (revised). -# 2.5.7 +## 2.5.7 * Improve redirect caching management. -# 2.5.6 +## 2.5.6 * Prevent connection exception when accessing settings in CLI mode -# 2.5.5 +## 2.5.5 * Suppress logging when redirect rules file is empty -# 2.5.4 +## 2.5.4 * Add support for symfony/stopwatch:^5.0 (version 4.0 is still supported) * Update Spanish language (thanks to Juan David M) * Hide button "From Request log" when request logging is disabled -# 2.5.3 +## 2.5.3 * Improve / fixes redirect rule caching (thanks to Eric Pfeiffer) * Update Spanish language (thanks to Juan David M) * Update Language files (help wanted!) -# 2.5.2 +## 2.5.2 * Fix bug that causes re-writing the redirect rules file when hits are updated -# 2.5.1 +## 2.5.1 * Fixes issues with redirect rules file not being present -# 2.5.0 +## 2.5.0 * Add support for using relative paths -# 2.4.1 +## 2.4.1 * Add Redirect Extensions promo page -# 2.4.0 +## 2.4.0 * Skip requests with header "X-Requested-With: XMLHttpRequest" -# 2.3.2 +## 2.3.2 * Improve error handling in plugin migration process -# 2.3.1 +## 2.3.1 * Fix SQLSTATE[42S22] error when installing plugin -# 2.3.0 +## 2.3.0 * Add new Redirect options: * Ignore Case @@ -72,17 +79,17 @@ * Fix warning dialog position (when scheduled redirect is not active) * Minor translation improvements (en, nl). -# 2.2.0 +## 2.2.0 * Add "Cache-Control: no-store" header. This will prevent (modern) web browsers to cache the redirects. Very convenient when testing your redirects. * Add extra tab "Event logs" to Redirect update page. This tab shows a list with the related event logs of the redirect. * UI improvements -# 2.1.1 +## 2.1.1 * Update CHANGELOG -# 2.1.0 +## 2.1.0 * Improve exception handling #52 * Add support for league/csv:9.0+ @@ -90,17 +97,17 @@ * Suppress cache flush log message * Skip sparkline routes from being processed -# 2.0.2 +## 2.0.2 * Force type of vdlp.redirect::log_redirect_changes #53 * Apply config check to prevent log redirect changes #53 * Convert database column types (char to varchar) #51 -# 2.0.1 +## 2.0.1 * Fix Middleware not being invoked in newer PHP versions -# 2.0.0 +## 2.0.0 * Drop support for PHP 7.0, only supports PHP 7.1.3+. * Most of the classes are made final. For extending use October CMS proposed solutions. diff --git a/updates/version.yaml b/updates/version.yaml index 606d1d4..0e8f0fa 100644 --- a/updates/version.yaml +++ b/updates/version.yaml @@ -91,3 +91,5 @@ - "Fix import in Plugin file" 2.5.10: - "Add PHP 8.0 version constraint and composer/installers package" +2.5.11: + - "Minor fixes -- See: https://github.com/vdlp/oc-redirect-plugin/releases/tag/2.5.11" From ba2652c42c16f1ebaf313064112c97fdc29e0003 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 31 Aug 2021 12:45:14 +0200 Subject: [PATCH 4/5] Replace Backend Facade import --- Plugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugin.php b/Plugin.php index 5be14c0..e8f327d 100644 --- a/Plugin.php +++ b/Plugin.php @@ -4,7 +4,7 @@ namespace Vdlp\Redirect; -use Backend\Facades\Backend; +use Backend; use Event; use Exception; use Illuminate\Console\Scheduling\Schedule; From 9b83ad0e4edbbeb9c2c0d34c34015751e2dcfea9 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 31 Aug 2021 12:48:55 +0200 Subject: [PATCH 5/5] Update CHANGELOG --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55a9a12..1b759c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ ## 2.5.11 -* Remove CMS support check. * Fix bad use of import. ## 2.5.10