Merge branch 'master' into dev

CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="1.8.0"></a>
+# [1.8.0](https://github.com/flextype-plugins/form/compare/v1.7.0...v1.8.0) (2020-12-30)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.14
+* **core** Moving to PHP 7.4
+* **core** use new TWIG Plugin 1.7.0
+
 <a name="1.7.0"></a>
 # [1.7.0](https://github.com/flextype-plugins/form/compare/v1.6.0...v1.7.0) (2020-12-20)
 

README.md

@@ -1,7 +1,7 @@
 <h1 align="center">Form Plugin for <a href="https://flextype.org/">Flextype</a></h1>
 
 <p align="center">
-<a href="https://github.com/flextype-plugins/form/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/form.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/form"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/form"><img src="https://img.shields.io/github/downloads/flextype-plugins/form/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.13-green.svg?color=black" alt="Flextype"></a> <a href="https://scrutinizer-ci.com/g/flextype-plugins/form?branch=dev&color=black"><img src="https://img.shields.io/scrutinizer/g/flextype-plugins/form.svg?branch=dev" alt="Quality Score"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+<a href="https://github.com/flextype-plugins/form/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/form.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/form"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/form"><img src="https://img.shields.io/github/downloads/flextype-plugins/form/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.14-green.svg?color=black" alt="Flextype"></a> <a href="https://scrutinizer-ci.com/g/flextype-plugins/form?branch=dev&color=black"><img src="https://img.shields.io/scrutinizer/g/flextype-plugins/form.svg?branch=dev" alt="Quality Score"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
 </p>
 
 Form Plugin to render user forms for Flextype.
@@ -12,7 +12,7 @@ The following dependencies need to be installed for Form Plugin.
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.13 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.14 | [download](https://github.com/flextype/flextype/releases) |
 | [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 | [jquery](https://github.com/flextype-plugins/jquery) | >=1.0.0 | [download](https://github.com/flextype-plugins/jquery/releases) |
 
@@ -482,7 +482,7 @@ form:
 ```
 {% set registration_form_file = PATH_PROJECT ~ '/fieldsets/default.yaml' %}
 
-{{ form.render(yaml_decode(filesystem_read(registration_form_file)), {})|raw }}
+{{ flextype.form.render(flextype.serializers.yaml.decode(filesystem().file(registration_form_file).get()), {})|raw }}
 ```
 
 ### Processing form in the Backend
@@ -497,7 +497,7 @@ flextype()->post('{uri:.+}', function(Request $request, Response $response) {
     $post_data = $request->getParsedBody();
 
     // save date from $post_data
-    flextype()->container()['entries']->create($post_data['name'], ['title' => $post_data['name']]);
+    flextype('entries')->create($post_data['name'], ['title' => $post_data['name']]);
 
     // redirect
     return $response->withRedirect('./');

app/Models/Fieldsets.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
@@ -22,8 +22,6 @@ class Fieldsets
      */
     public function __construct()
     {
-
-
         if (! Filesystem::has($this->getDirLocation())) {
             Filesystem::createDir($this->getDirLocation());
         }

app/Models/Form.php

@@ -19,14 +19,6 @@
 
 class Form
 {
-    /**
-     * __construct
-     */
-    public function __construct()
-    {
-
-    }
-
     /**
      * Render form
      *

composer.json

@@ -16,15 +16,15 @@
       "issues": "https://github.com/flextype/issues"
     },
     "require": {
-        "php": ">=7.3.0",
+        "php": ">=7.4.0",
         "flextype-components/arrays" : "3.0.1",
         "flextype-components/filesystem": "2.0.8"
     },
     "config": {
         "apcu-autoloader": true,
         "optimize-autoloader": true,
         "platform": {
-            "php": "7.3.0"
+            "php": "7.4.0"
         }
     },
     "autoload": {

dependencies.php

@@ -14,39 +14,36 @@
 use Flextype\Plugin\Form\Models\Fieldsets;
 use Flextype\Plugin\Form\Models\Form;
 use Flextype\Plugin\Form\Twig\FormTwigExtension;
+use Flextype\Plugin\Twig\Twig\FlextypeTwig;
 use function array_merge;
 use function strtolower;
 use function substr;
 
 /**
  * Add Form Model to Flextype container
  */
-flextype()->container()['form'] = static function () {
-    return new Form();
-};
+flextype()->container()['form'] = fn() => new Form();
 
 /**
  * Add Fieldsets Model to Flextype container
  */
-flextype()->container()['fieldsets'] = static function () {
-    return new Fieldsets();
-};
+flextype()->container()['fieldsets'] = fn() => new Fieldsets();
 
 /**
  * Add Form Twig extension
  */
-flextype('twig')->addExtension(new FormTwigExtension());
+FlextypeTwig::macro('form', fn() => flextype('form'));
 
 /**
  * Add Assets
  */
-$_admin_css = flextype('registry')->has('assets.admin.css') ? flextype('registry')->get('assets.admin.css') : [];
-$_site_css  = flextype('registry')->has('assets.site.css') ? flextype('registry')->get('assets.site.css') : [];
+$adminCSS = flextype('registry')->has('assets.admin.css') ? flextype('registry')->get('assets.admin.css') : [];
+$siteCSS  = flextype('registry')->has('assets.site.css') ? flextype('registry')->get('assets.site.css') : [];
 
 if (flextype('registry')->get('plugins.form.settings.load_on_admin')) {
     flextype('registry')->set(
         'assets.admin.css',
-        array_merge($_admin_css, [
+        array_merge($adminCSS, [
             'project/plugins/form/assets/dist/css/form-vendor-build.min.css',
             'project/plugins/form/assets/dist/css/form-build.min.css',
         ])
@@ -56,7 +53,7 @@
 if (flextype('registry')->get('plugins.form.settings.load_on_site')) {
     flextype('registry')->set(
         'assets.site.css',
-        array_merge($_site_css, [
+        array_merge($siteCSS, [
             'project/plugins/form/assets/dist/css/form-vendor-build.min.css',
             'project/plugins/form/assets/dist/css/form-build.min.css',
         ])
@@ -70,23 +67,23 @@
 }
 
 if ($_locale !== 'en') {
-    $trumbowyg_locale_js = 'project/plugins/form/assets/dist/lang/trumbowyg/langs/' . $_locale . '.min.js';
-    $flatpickr_locale_js = 'project/plugins/form/assets/dist/lang/flatpickr/l10n/' . $_locale . '.js';
+    $trumbowygLocaleJS = 'project/plugins/form/assets/dist/lang/trumbowyg/langs/' . $_locale . '.min.js';
+    $flatpickrLocaleJS = 'project/plugins/form/assets/dist/lang/flatpickr/l10n/' . $_locale . '.js';
 } else {
-    $trumbowyg_locale_js = '';
-    $flatpickr_locale_js = '';
+    $trumbowygLocaleJS = '';
+    $flatpickrLocaleJS = '';
 }
 
-$_admin_js = flextype('registry')->has('assets.admin.js') ? flextype('registry')->get('assets.admin.js') : [];
-$_site_js  = flextype('registry')->has('assets.site.js') ? flextype('registry')->get('assets.site.js') : [];
+$adminJS = flextype('registry')->has('assets.admin.js') ? flextype('registry')->get('assets.admin.js') : [];
+$siteJS  = flextype('registry')->has('assets.site.js') ? flextype('registry')->get('assets.site.js') : [];
 
 if (flextype('registry')->get('plugins.form.settings.load_on_admin')) {
     flextype('registry')->set(
         'assets.admin.js',
-        array_merge($_admin_js, [
+        array_merge($adminJS, [
             'project/plugins/form/assets/dist/js/form-vendor-build.min.js',
-            $trumbowyg_locale_js,
-            $flatpickr_locale_js,
+            $trumbowygLocaleJS,
+            $flatpickrLocaleJS,
             'project/plugins/form/assets/dist/js/form-build.min.js',
         ])
     );
@@ -95,10 +92,10 @@
 if (flextype('registry')->get('plugins.form.settings.load_on_site')) {
     flextype('registry')->set(
         'assets.site.js',
-        array_merge($_site_js, [
+        array_merge($siteJS, [
             'project/plugins/form/assets/dist/js/form-vendor-build.min.js',
-            $trumbowyg_locale_js,
-            $flatpickr_locale_js,
+            $trumbowygLocaleJS,
+            $flatpickrLocaleJS,
             'project/plugins/form/assets/dist/js/form-build.min.js',
         ])
     );

fieldsets/base.html

@@ -32,15 +32,15 @@
     {% endif %}
 
     {% if fieldset.form.messages.success %}
-        {% for message in flash()['success'] %}
+        {% for message in flextype.flash.getMessages()['success'] %}
             <div class="form-message-success">
                 {{ message }}
             </div>
         {% endfor %}
     {% endif %}
 
     {% if fieldset.form.messages.error %}
-        {% for message in flash()['error'] %}
+        {% for message in flextype.flash.getMessages()['error'] %}
             <div class="form-message-error">
                 {{ message }}
             </div>

fieldsets/fields/datetimepicker/field.html

@@ -1,16 +1,16 @@
 <div class="form-group {% if properties.size %}{{ sizes[properties.size] }}{% else %}{{ sizes[12] }}{% endif %}">
     <label for="{{ field_id }}" class="form-control-title">{{ tr(properties.title) }}</label>
-    <input type="text" id="{{ field_id }}" name="{{ field_id }}" value="{{ field_value|date(registry.get('flextype.settings.date_display_format')) }}" class="form-control js-datetimepicker {{ properties.class }}">
+    <input type="text" id="{{ field_id }}" name="{{ field_id }}" value="{{ field_value|date(flextype.registry.get('flextype.settings.date_display_format')) }}" class="form-control js-datetimepicker {{ properties.class }}">
     {% if properties.help %}
         <small>{{ tr(properties.help)}}</small>
     {% endif %}
 </div>
 
-{% if registry.get('flextype.settings.locale') == 'en_US' %}
+{% if flextype.registry.get('flextype.settings.locale') == 'en_US' %}
     {% set flatpickr_locale = 'en' %}
 {% else %}
-    {% set flatpickr_locale = registry.get('flextype.settings.locale')|lower|slice(0, 2) %}
+    {% set flatpickr_locale = flextype.registry.get('flextype.settings.locale')|lower|slice(0, 2) %}
 {% endif %}
 
-<input type="hidden" name="flatpickr-date-format" value="{{ registry.get('flextype.settings.date_format') }}">
+<input type="hidden" name="flatpickr-date-format" value="{{ flextype.registry.get('flextype.settings.date_format') }}">
 <input type="hidden" name="flatpickr-locale" value="{{ flatpickr_locale }}">

fieldsets/fields/html/field.html

@@ -6,10 +6,10 @@
     {% endif %}
 </div>
 
-{% if registry.get('flextype.settings.locale') == 'en_US' %}
+{% if flextype.registry.get('flextype.settings.locale') == 'en_US' %}
     {% set trumbowyg_locale = 'en' %}
 {% else %}
-    {% set trumbowyg_locale = registry.get('flextype.settings.locale')|lower|slice(0, 2) %}
+    {% set trumbowyg_locale = flextype.registry.get('flextype.settings.locale')|lower|slice(0, 2) %}
 {% endif %}
 
 <input type="hidden" name="trumbowyg-icons-path" value="{{ url() }}/project/plugins/form/assets/dist/fonts/trumbowyg/icons.svg">

fieldsets/fields/select_media/field.html

@@ -1,9 +1,9 @@
-{% set media_files = filesystem_list_contents(PATH_PROJECT ~ '/media/entries/' ~ query.id ~ '/') %}
+{% set media_files = filesystem().find().in(PATH_PROJECT ~ '/media/entries/' ~ query.id ~ '/').files() %}
 <div class="form-group {% if properties.size %}{{ sizes[properties.size] }}{% else %}{{ sizes[12] }}{% endif %}">
     <label for="{{ field_id }}" class="form-control-title">{{ tr(properties.title) }}</label>
     <select class="form-control {{ properties.class }} js-select-media" name="{{ field_name }}">
         {% for media_file in media_files %}
-            {% if media_file.extension in registry.get('plugins.admin.settings.entries.media.accept_file_types') %}
+            {% if media_file.extension in flextype.registry.get('plugins.admin.settings.entries.media.accept_file_types') %}
                 <option value="{{ media_file.filename }}" {% if media_file.basename == field_value %} selected="selected" {% endif %}>{{ media_file.filename }}</option>
             {% endif %}
         {% endfor %}

fieldsets/fields/select_template/field.html

@@ -1,4 +1,4 @@
-{% set templates = filesystem_list_contents(PATH_PROJECT ~ '/themes/' ~ registry.get('plugins.site.settings.theme') ~ '/templates/') %}
+{% set templates = filesystem().find().in(PATH_PROJECT ~ '/themes/' ~ flextype.registry.get('plugins.site.settings.theme') ~ '/templates/').files() %}
 <div class="form-group {% if properties.size %}{{ sizes[properties.size] }}{% else %}{{ sizes[12] }}{% endif %}">
     <label for="{{ field_id }}" class="form-control-title">{{ tr(properties.title) }}</label>
     <select class="form-control {{ properties.class }} js-select-template" name="{{ field_name }}">

fieldsets/multi-form.html

@@ -9,9 +9,9 @@
             <div class="form-row">
                 {% for element, properties in fieldset['form']['tabs'][key]['fields']  %}
 
-                    {% set field_name = form.getElementName(element) %}
-                    {% set field_id = form.getElementID(element) %}
-                    {% set field_value = form.getElementValue(element, values, properties) %}
+                    {% set field_name = flextype.form.getElementName(element) %}
+                    {% set field_id = flextype.form.getElementID(element) %}
+                    {% set field_value = flextype.form.getElementValue(element, values, properties) %}
 
                     {% include "plugins/form/fieldsets/fields/fields.html" %}
 

fieldsets/single-form.html

@@ -7,9 +7,9 @@
     <div class="form-row">
     {% for element, properties in fieldset.form.fields  %}
 
-        {% set field_name = form.getElementName(element) %}
-        {% set field_id = form.getElementID(element) %}
-        {% set field_value = form.getElementValue(element, values, properties) %}
+        {% set field_name = flextype.form.getElementName(element) %}
+        {% set field_id = flextype.form.getElementID(element) %}
+        {% set field_value = flextype.form.getElementValue(element, values, properties) %}
 
         {% include "plugins/form/fieldsets/fields/fields.html" %}
     {% endfor %}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Form",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Form Plugin to render user forms for Flextype.",
   "homepage": "https://flextype.org",
   "author": "Sergey Romanenko",

plugin.yaml

@@ -1,5 +1,5 @@
 name: Form
-version: 1.7.0
+version: 1.8.0
 description: Form Plugin to render user forms for Flextype.
 icon: fas fa-check-circle
 author:
@@ -14,6 +14,6 @@ keywords: form, fieldsets
 license: MIT
 
 dependencies:
-  flextype: 0.9.13
+  flextype: 0.9.14
   twig: '>=1.0.0'
   jquery: '>=1.0.0'

settings.yaml

@@ -2,8 +2,8 @@
 enabled: true
 
 # Form plugin priority
-priority: 2
+priority: 45
 
 # place to load
-load_on_site: true		
+load_on_site: true
 load_on_admin: true