Downward compatibility

Author: Roman Gsponer

README.md

@@ -64,8 +64,6 @@ With the integrated mailview field you can display requests allover the panel.
 
 # Installation
 
-For use with Kirby > 4.0 only!
-
 **Manually**
 
 [Download](https://github.com/youngcut/kirby-form-block-suite/archive/refs/heads/main.zip) and copy the plugin into your plugin folder: `/site/plugins/`
@@ -159,7 +157,7 @@ The placeholders in **Display title** is taken from the data the visitor enter i
 |4|Radio| ![radio](./.github/radio.png)|
 |5|Checkbox| ![checkbox](./.github/checkbox.png)|
 |6|Attachment | ![attachment](./.github/attachment.png)|
-|7|Captcha<br>(< 4.2.0) | ![captcha](./.github/captcha.png)|
+|7|Captcha | ![captcha](./.github/captcha.png)|
 
 > **Note for attachment field type:**  To increase the maximum file size set the `upload_max_filesize`, `post_max_size` and `memory_limit` to desiered values in your php.ini.
 
@@ -376,7 +374,7 @@ my_custom_message:
 
 ```
 
-You can do the same with `form_confirm.yml` and `form_notify.yml`. For example (> v4.1.0), if you like to give the opurtunity to set the reply adress, add these lines to `form_notify.yml`:
+You can do the same with `form_confirm.yml` and `form_notify.yml`. For example, if you like to give the opurtunity to set the reply adress, add these lines to `form_notify.yml`:
 
 
 ```xml
@@ -507,7 +505,7 @@ The corresponding function will be no longer executed and in the panel the tab/f
 
 ## Email templating
 
-Since Version 4.3.6 you can set the templates for outgoing emails like this:
+You can set the templates for outgoing emails like this:
 
 ```php
 'microman.formblock' => [

classes/Form.php

@@ -373,7 +373,7 @@ public function message($key, $replaceArray = [], $fallback = null): string
      * Get translatin from options or translation files.
      *
      * @param string $key 
-     * @param string $default if set, return it. 
+     * @param object $default if set, return it. 
      * @param array $replaceArray Additional array for replacing
      * 
      * @return string

classes/FormBlueprint.php

@@ -12,7 +12,6 @@
 
 use Kirby\Filesystem\Dir;
 use Kirby\Filesystem\F;
-use Kirby\Toolkit\Str;
 use Kirby\Data\Yaml;
 
 class FormBlueprint

classes/FormField.php

@@ -11,12 +11,10 @@
  */
 
 use Kirby\Cms\Block;
-use Kirby\Cms\Structure;
+use Kirby\Filesystem\F;
 use Kirby\Toolkit\A;
 use Kirby\Toolkit\V;
-use Kirby\Toolkit\F;
 use Kirby\Toolkit\Str;
-use Kirby\Toolkit\I18n;
 use Kirby\Toolkit\Escape;
 use Kirby\Http\Request\Files;
 use Kirby\Filesystem\Mime;
@@ -36,7 +34,7 @@ class FormField extends Block
     /**
      * Visitor send some values
      *
-     * @var Bool
+     * @var Array
      */
     protected $errors;
 
@@ -157,7 +155,7 @@ public function value($raw = false): string
 
 
         if (!is_null($this->files)) {
-            return implode(', ', array_map(fn($f) => f::safeName($f['name']), $this->files));
+            return implode(', ', array_map(fn($f) => F::safeName($f['name']), $this->files));
         }
 
         // Prefill value from query string variable matching slug
@@ -455,7 +453,7 @@ public function errorMessage(): string
      */
     public function isValid(): bool
     {
-        return count($this->errors) == 0;
+        return count($this->errors) === 0;
     }
 
     /**

classes/FormFields.php

@@ -12,7 +12,6 @@
 
 use Kirby\Cms\Blocks;
 use Kirby\Http\Environment;
-use Kirby\Filesystem\F;
 
 class FormFields extends Blocks
 {

classes/FormRequest.php

@@ -10,15 +10,9 @@
  * @license   https://license.microman.ch/license/ 
  */
 
-use Kirby\Cms\Page;
-use Kirby\Cms\Site;
-use Kirby\Cms\Template;
 use Kirby\Toolkit\I18n;
-use Kirby\Toolkit\F;
-use Kirby\Uuid\Uuid;
 use Kirby\Http\Request\Files;
-
-use Kirby\Exception\Exception;
+use Kirby\Filesystem\F;
 
 class FormRequest
 {

composer.json

@@ -2,7 +2,7 @@
     "name": "microman/kirby-form-block-suite",
     "description": "Contactform based on Kirby blocks.",
     "type": "kirby-plugin",
-    "version": "5.0.0",
+    "version": "5.0.1",
     "license": "proprietary",
     "authors": [{
         "name": "Roman Gsponer",

index.css

@@ -9,7 +9,7 @@
 use Kirby\Cms\App as Kirby;
 use Kirby\Data\Data;
 
-Kirby::plugin('microman/formblock', [
+$setup = [
     'options' => [ 
         'from_email' => 'no-reply@' . Kirby::instance()->environment()->host(),
         'placeholders' => FormBlueprint::getPlaceholders(),
@@ -112,5 +112,11 @@
         'hu' => Data::read(__DIR__ . '/i18n/hu.json'),
         'fr' => Data::read(__DIR__ . '/i18n/fr.json'),
     ]
-],
-license: FormLicense::licenseObj());
+];
+
+//Extend downwards compatibility
+if (version_compare(Kirby::version() ?? '0.0.0', '4.9.9', '>')) {
+    Kirby::plugin('microman/formblock', $setup, license: FormLicense::licenseObj());
+} else {
+    Kirby::plugin('microman/formblock', $setup);
+}