Merge pull request #22 from ninsuo/add-strict-variables-support

added strict variables support, fixes #21
ninsuo · Dec 21, 2016 · 29eed95 · 29eed95
2 parents 35c6cee + 50ff07c
commit 29eed95
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 4 deletions.
diff --git a/cli/config/services/managers.yml b/cli/config/services/managers.yml
@@ -16,7 +16,6 @@ services:
     fiddle_agent:
         class: '%fiddle_agent.class%'
         arguments: ['@error_manager']
-        shared: false
 
     error_manager:
         class: '%error_manager.class%'

diff --git a/cli/src/Fuz/Process/TwigEngine/V1TwigEngine.php b/cli/src/Fuz/Process/TwigEngine/V1TwigEngine.php
@@ -32,8 +32,11 @@ public function load($sourceDirectory, $cacheDirectory, $executionDirectory)
         require $sourceDirectory.DIRECTORY_SEPARATOR.'/lib/Twig/Autoloader.php';
         \Twig_Autoloader::register();
 
-        $twigLoader = new \Twig_Loader_Filesystem($executionDirectory, $cacheDirectory);
-        $twigEnvironment = new \Twig_Environment($twigLoader, array('cache' => $cacheDirectory));
+        $twigLoader      = new \Twig_Loader_Filesystem($executionDirectory, $cacheDirectory);
+        $twigEnvironment = new \Twig_Environment($twigLoader, array(
+            'cache'            => $cacheDirectory,
+            'strict_variables' => $this->agent->getFiddle()->isWithStrictVariables(),
+        ));
 
         return $twigEnvironment;
     }

diff --git a/cli/src/Fuz/Process/TwigEngine/V2TwigEngine.php b/cli/src/Fuz/Process/TwigEngine/V2TwigEngine.php
@@ -47,7 +47,10 @@ public function load($sourceDirectory, $cacheDirectory, $executionDirectory)
         });
 
         $twigLoader = new \Twig_Loader_Filesystem($executionDirectory);
-        $twigEnvironment = new \Twig_Environment($twigLoader, array('cache' => $cacheDirectory));
+        $twigEnvironment = new \Twig_Environment($twigLoader, array(
+            'cache'            => $cacheDirectory,
+            'strict_variables' => $this->agent->getFiddle()->isWithStrictVariables(),
+        ));
 
         return $twigEnvironment;
     }

diff --git a/web/src/Fuz/AppBundle/Entity/Fiddle.php b/web/src/Fuz/AppBundle/Entity/Fiddle.php
@@ -122,6 +122,14 @@ class Fiddle implements TagContainerInterface
      */
     protected $withCExtension = false;
 
+    /**
+     * @var bool
+     *
+     * @ORM\Column(name="with_strict_variables", type="boolean")
+     * @Serializer\Type("boolean")
+     */
+    protected $withStrictVariables = false;
+
     /**
      * @ORM\Column(name="twig_extension", type="string", length=32, nullable=true)
      * @Serializer\Type("string")
@@ -402,6 +410,26 @@ public function isWithCExtension()
         return $this->withCExtension;
     }
 
+    /**
+     * @param bool $withStrictVariables
+     *
+     * @return Fiddle
+     */
+    public function setWithStrictVariables($withStrictVariables)
+    {
+        $this->withStrictVariables = $withStrictVariables;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isWithStrictVariables()
+    {
+        return $this->withStrictVariables;
+    }
+
     /**
      * @param string $twigExtension
      *

diff --git a/web/src/Fuz/AppBundle/Form/FiddleType.php b/web/src/Fuz/AppBundle/Form/FiddleType.php
@@ -91,6 +91,9 @@ public function buildFiddleOptions(FormBuilderInterface $builder, array $options
            ->add('withCExtension', Type\CheckboxType::class, array(
                'required' => false,
            ))
+           ->add('withStrictVariables', Type\CheckboxType::class, array(
+               'required' => false,
+           ))
            ->add('twigExtension', Type\ChoiceType::class, array(
                'required' => false,
                'choices' => array_combine($this->twigExtensions, $this->twigExtensions),

diff --git a/web/src/Fuz/AppBundle/Resources/views/Fiddle/options.html.twig b/web/src/Fuz/AppBundle/Resources/views/Fiddle/options.html.twig
@@ -47,6 +47,17 @@
                 </div>
             </div>
             <div class="error-container" id="errors-{{ form.withCExtension.vars.id }}">{{ form_errors(form.withCExtension) }}</div>
+
+            <div class="input-group full-width">
+                <div class="input-group-addon" style="width: 37px;">{{ form_widget(form.withStrictVariables) }}</div>
+                <div class="form-control">
+                    <label for="{{ form.withStrictVariables.vars.id }}">
+                        Enable Strict Variables mode
+                        (<a class="dark" href="http://twig.sensiolabs.org/doc/templates.html#variables" target="_blank">read more</a>)
+                    </label>
+                </div>
+            </div>
+            <div class="error-container" id="errors-{{ form.withStrictVariables.vars.id }}">{{ form_errors(form.withStrictVariables) }}</div>
         </div>
 
     </div>