Merge pull request #18 from dipcode-software/bugfix/bootstrap4-class-ignored

Fixed form field error class being lost

Author: srtab

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.3] - 2017-12-13
+### Added
+ - `setRequired` to `Field` class;
+ - Twig Filter `merge_str` to merge value into as array value through implode.
+
+### Fixed
+ - Form field error class being ignored in `Bootstrap4TemplatePack`.
+
 ## [2.0.2] - 2017-12-12
 ### Changed
  - `Twig` minimal version supported setted to `>=1.35`.

src/Config.php

@@ -7,7 +7,7 @@
 
 class Config extends Singleton
 {
-    const VERSION = "v2.0.0";
+    const VERSION = "v2.0.3";
 
     /**
      * @var array Template packs to be used. The templates will be loaded

src/Renderers/TwigRenderer.php

@@ -4,9 +4,10 @@
 */
 namespace PHPForm\Renderers;
 
-use Twig\Loader\FilesystemLoader;
-use Twig\Environment;
 use Twig\Loader\ChainLoader;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
+use Twig\TwigFilter;
 
 class TwigRenderer implements Renderer
 {
@@ -22,15 +23,34 @@ class TwigRenderer implements Renderer
      *
      * @param array $template_dirs
      */
-    public function __construct(array $templates_dirs)
+    public function __construct(array $templates_dirs, array $options = array())
     {
         $loaders = new ChainLoader();
 
         foreach ($templates_dirs as $template_dir) {
             $loaders->addLoader(new FilesystemLoader($template_dir));
         }
 
-        $this->twig = new Environment($loaders);
+        $this->twig = new Environment($loaders, $options);
+        $this->setFilters();
+    }
+
+    public function setFilters()
+    {
+        $filter_merge_str = new TwigFilter('merge_str', function ($attrs, array $options = array()) {
+            $key = $options[0];
+            $value = $options[1];
+
+            if (array_key_exists($key, $attrs)) {
+                $attrs[$key] = implode(' ', [$value, $attrs[$key]]);
+            } else {
+                $attrs[$key] = $value;
+            }
+
+            return $attrs;
+        }, array('is_variadic' => true));
+
+        $this->twig->addFilter($filter_merge_str);
     }
 
     /**

src/TemplatePacks/templates/bootstrap4/file.html

@@ -1,5 +1,5 @@
 <label class="custom-file">
-    {% set attrs = attrs|merge({'class': 'custom-file-input'}) %}
+    {% set attrs = attrs|merge_str("class", "custom-file-input") %}
     {% include 'input.html' %}
     <span class="custom-file-control"></span>
 </label>

src/TemplatePacks/templates/bootstrap4/multiple_input_option.html

@@ -1,5 +1,5 @@
 <label for="{{for|e}}" class="custom-control custom-{{ type|e }}">
-    {% set attrs = attrs|merge({'class': 'custom-control-input'}) %}
+    {% set attrs = attrs|merge_str("class", "custom-control-input") %}
     {% include 'input.html' %}
     <span class="custom-control-indicator"></span>
     <span class="custom-control-description">{{ label|e }}</span>

tests/unit/Renderers/TwigRendererTest.php

@@ -38,4 +38,24 @@ public function testRenderWithOnlyFallbackDefined()
 
         $this->assertEquals($expected, $result);
     }
+
+    public function testFilterRenderStr()
+    {
+        $renderer = new TwigRenderer([__DIR__ . "/templates/pack1"]);
+
+        $result = $renderer->render("merge_str_filter.html", array("attrs" => ["class" => "existent"]));
+        $expected = "class merged existent";
+
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testFilterRenderStrWithoutArg()
+    {
+        $renderer = new TwigRenderer([__DIR__ . "/templates/pack1"]);
+
+        $result = $renderer->render("merge_str_filter.html", array("attrs" => []));
+        $expected = "class merged";
+
+        $this->assertEquals($expected, $result);
+    }
 }

tests/unit/Renderers/templates/pack1/merge_str_filter.html

@@ -0,0 +1,2 @@
+{% set attrs = attrs|merge_str("class", "class merged") %}
+{{ attrs['class'] }}