Merge branch '2.x'

* 2.x:
  Update CHANGELOG
  Replace Backend Facade import
  Bump version
  Update CHANGELOG
  Add PHP 8.0 version constraint and composer/installers package

CHANGELOG.md

@@ -1,52 +1,75 @@
-# 2.5.6
+# CHANGELOG
+
+## 2.5.11
+
+* Fix bad use of import.
+
+## 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
 
-# 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
@@ -55,35 +78,35 @@
 * 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+
 * Improve caching mechanism #54
 * 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.

Plugin.php

@@ -4,7 +4,7 @@
 
 namespace Vdlp\Redirect;
 
-use Backend\Facades\Backend;
+use Backend;
 use Event;
 use Exception;
 use Illuminate\Console\Scheduling\Schedule;

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": [

updates/version.yaml

@@ -89,3 +89,7 @@
     - "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"
+2.5.11:
+    - "Minor fixes -- See: https://github.com/vdlp/oc-redirect-plugin/releases/tag/2.5.11"