Add code previously excluded due to a filesystem issue

Author: vitorbrandao

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+    - 5.3.3
     - 5.3
     - 5.4
 

DependencyInjection/Configuration.php

@@ -169,7 +169,39 @@ protected function addSmartyOptions(ArrayNodeDefinition $rootNode)
                     ->children()
                         ->scalarNode('allow_php_templates')->end()
                         ->scalarNode('auto_literal')->end()
-                        ->scalarNode('autoload_filters')->end()
+                        ->arrayNode('autoload_filters')
+                            ->info('filters that you wish to load on every template invocation')
+                            ->canBeUnset()
+                            ->children()
+                                ->arrayNode('pre')
+                                    ->example(array('trim', 'stamp'))
+                                    ->canBeUnset()
+                                    ->beforeNormalization()
+                                        ->ifTrue(function($v){ return !is_array($v); })
+                                        ->then(function($v){ return array($v); })
+                                    ->end()
+                                    ->prototype('scalar')->end()
+                                ->end()
+                                ->arrayNode('post')
+                                    ->example(array('add_header_comment'))
+                                    ->canBeUnset()
+                                    ->beforeNormalization()
+                                        ->ifTrue(function($v){ return !is_array($v); })
+                                        ->then(function($v){ return array($v); })
+                                    ->end()
+                                    ->prototype('scalar')->end()
+                                ->end()
+                                ->arrayNode('output')
+                                    ->example(array('convert'))
+                                    ->canBeUnset()
+                                    ->beforeNormalization()
+                                        ->ifTrue(function($v){ return !is_array($v); })
+                                        ->then(function($v){ return array($v); })
+                                    ->end()
+                                    ->prototype('scalar')->end()
+                                ->end()
+                            ->end()
+                        ->end()
                         ->scalarNode('cache_dir')->defaultValue('%kernel.cache_dir%/smarty/cache')->cannotBeEmpty()->end()
                         ->scalarNode('cache_id')->end()
                         ->scalarNode('cache_lifetime')->end()
@@ -205,7 +237,6 @@ protected function addSmartyOptions(ArrayNodeDefinition $rootNode)
                         ->scalarNode('plugins_dir')->end()
                         ->scalarNode('smarty_debug_id')->end()
                         ->scalarNode('template_dir')->defaultValue('%kernel.root_dir%/Resources/views')->cannotBeEmpty()->end()
-                        ->booleanNode('trim_whitespace')->defaultFalse()->end()
                         ->scalarNode('trusted_dir')->end()
                         ->scalarNode('use_include_path')->defaultFalse()->end()
                         ->scalarNode('use_sub_dirs')->defaultTrue()->end()

Resources/doc/assetic.rst

@@ -1,3 +1,6 @@
+.. index::
+    single: Assetic
+
 .. _ch_assetic:
 
 *******

Resources/doc/bootstrap.rst

@@ -1,3 +1,6 @@
+.. index::
+    single: Twitter Bootstrap
+
 .. _ch_bootstrap:
 
 *****************************

Resources/doc/cookbook.rst

@@ -7,4 +7,47 @@
 Cookbook
 ********
 
-Some text
+Injecting variables into all templates (i.e. Global Variables)
+==============================================================
+
+.. index::
+    single: Global Variables
+
+As exemplified in the `Symfony Cookbook <http://symfony.com/doc/current/cookbook/templating/global_variables.html>`_ it is possible to make a variable to be accessible to all the templates you use by configuring your `app/config/config.yml` file:
+
+.. code-block:: yaml
+
+    # app/config/config.yml
+    smarty:
+        # ...
+        globals:
+            ga_tracking: UA-xxxxx-x
+
+Now, the variable ga_tracking is available in all Smarty templates:
+
+.. code-block:: html+smarty
+
+    <p>Our google tracking code is: {$ga_tracking} </p>
+
+Trim unnecessary whitespace from HTML markup
+===================================================
+
+.. index::
+    single: Trimwhitespace
+
+This technique can speed up your website by eliminating extra whitespace characters and thus reducing page size. It removes HTML comments (except ConditionalComments) and reduces multiple whitespace to a single space everywhere but ``<script>``, ``<pre>``, ``<textarea>`` [#]_.
+
+To enable this feature add the ``trimwhitespace`` output filter in ``app/config/config.yml``:
+
+.. code-block:: yaml
+    :emphasize-lines: 7
+
+    # app/config/config.yml
+    
+    # Smarty configuration
+    smarty:
+        options:
+            autoload_filters:
+                output: [trimwhitespace]
+
+.. [#] http://stackoverflow.com/a/9207456/545442                

Resources/doc/index.rst

@@ -3,7 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
- 
+
 ############
 SmartyBundle
 ############
@@ -19,7 +19,7 @@ SmartyBundle
     .. image:: _static/images/smarty-50.png
         :target: http://smarty.net
         :height: 50px
-   
+
 .. toctree::
     :maxdepth: 3
     :numbered:
@@ -28,6 +28,7 @@ SmartyBundle
     intro
     installation
     usage
+    cookbook
     extensions
     assetic
     forms
@@ -53,13 +54,14 @@ Installation
 
 .. toctree::
 
-Simple usage
-============
+Basic Usage / Tips & Tricks
+============================
 
 .. toctree::
     :maxdepth: 3
 
     usage
+    cookbook
 
 SmartyBundle Extensions
 =======================

Resources/doc/usage.rst

@@ -90,23 +90,4 @@ Please see `Symfony2 - Template Naming and Locations <http://symfony.com/doc/2.0
 .. note::
 
     The `.html.smarty` extension can simply be replaced by `.smarty`. We are prefixing with `.html` to stick with the Symfony convention of defining the format (`.html`) and engine (`.smarty`) for each template.
-
-Injecting variables into all templates (i.e. Global Variables)
-==============================================================
-
-As exemplified in the `Symfony Cookbook <http://symfony.com/doc/current/cookbook/templating/global_variables.html>`_ it is possible to make a variable to be accessible to all the templates you use by configuring your `app/config/config.yml` file:
-    
-.. code-block:: yaml    
-
-    # app/config/config.yml
-    smarty:
-        # ...
-        globals:
-            ga_tracking: UA-xxxxx-x
-
-Now, the variable ga_tracking is available in all Smarty templates:
-    
-.. code-block:: html+smarty    
-
-    <p>Our google tracking code is: {$ga_tracking} </p>
-    
+   

SmartyEngine.php

@@ -84,11 +84,12 @@ public function __construct(\Smarty $smarty, ContainerInterface $container,
         // There are no default extensions.
         $this->extensions = array();
 
-        // trim whitespace
-        if (true === $options['trim_whitespace']) {
-            $this->smarty->loadFilter('output','trimwhitespace');
+        foreach (array('autoload_filters') as $property) {
+            if (isset($options[$property])) {
+                $this->smarty->$property = $options[$property];
+                unset($options[$property]);
+            }
         }
-        unset($options['trim_whitespace']);
 
         /**
          * @warning If you added template dirs to the Smarty instance prior to

composer.json

@@ -26,6 +26,7 @@
         "smarty/smarty": "3.1.*@stable"
     },
     "require-dev": {
+        "symfony/security": "2.1.*",
         "symfony/yaml": "2.1.*",
         "symfony/assetic-bundle": ">=2.0"
     },