Merge remote-tracking branch 'upstream/master'

Author: javiereguiluz

_build/redirection_map

@@ -332,3 +332,5 @@
 /deployment/tools /deployment
 /install/bundles /setup/bundles
 /form /forms
+/testing/simulating_authentication /testing/http_authentication
+/components/dependency_injection/autowiring /service_container/autowiring

_images/quick_tour/web_debug_toolbar.png

@@ -163,8 +163,9 @@ In this case you can specify that the ``coffee`` filter is applied to all
                     name="coffee"
                     bin="/usr/bin/coffee"
                     node="/usr/bin/node"
-                    apply_to="\.coffee$" />
-                    <assetic:node-paths>/usr/lib/node_modules/</assetic:node-path>
+                    apply-to="\.coffee$">
+                    <assetic:node-path>/usr/lib/node_modules/</assetic:node-path>
+                </assetic:filter>
             </assetic:config>
         </container>
 
@@ -174,10 +175,10 @@ In this case you can specify that the ``coffee`` filter is applied to all
         $container->loadFromExtension('assetic', array(
             'filters' => array(
                 'coffee' => array(
-                    'bin'      => '/usr/bin/coffee',
-                    'node'     => '/usr/bin/node',
+                    'bin'        => '/usr/bin/coffee',
+                    'node'       => '/usr/bin/node',
                     'node_paths' => array('/usr/lib/node_modules/'),
-                    'apply_to' => '\.coffee$',
+                    'apply_to'   => '\.coffee$',
                 ),
             ),
         ));

_images/security/anonymous_wdt.png

@@ -411,7 +411,7 @@ configuration under the ``assetic`` section. Read more in the
                     ),
                 ),
             ),
-        );
+        ));
 
 After you have defined the named assets, you can reference them in your templates
 with the ``@named_asset`` notation:

_images/security/symfony_loggedin_wdt.png

@@ -113,7 +113,7 @@ to ``true``:
                 <assetic:filter
                     name="jpegoptim"
                     bin="path/to/jpegoptim"
-                    strip_all="true" />
+                    strip-all="true" />
             </assetic:config>
         </container>
 
@@ -217,7 +217,7 @@ following configuration:
                     name="jpegoptim"
                     bin="path/to/jpegoptim" />
                 <assetic:twig>
-                    <assetic:twig_function
+                    <assetic:function
                         name="jpegoptim" />
                 </assetic:twig>
             </assetic:config>
@@ -234,7 +234,6 @@ following configuration:
             ),
             'twig' => array(
                 'functions' => array('jpegoptim'),
-                ),
             ),
         ));
 
@@ -277,7 +276,7 @@ file:
                     name="jpegoptim"
                     bin="path/to/jpegoptim" />
                 <assetic:twig>
-                    <assetic:twig_function
+                    <assetic:function
                         name="jpegoptim"
                         output="images/*.jpg" />
                 </assetic:twig>
@@ -296,7 +295,7 @@ file:
             'twig' => array(
                 'functions' => array(
                     'jpegoptim' => array(
-                        output => 'images/*.jpg'
+                        'output' => 'images/*.jpg',
                     ),
                 ),
             ),

assetic/apply_to_option.rst

@@ -99,7 +99,7 @@ First, configure a new ``scssphp`` Assetic filter:
                 http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
 
             <assetic:config>
-                <filter name="scssphp" formatter="Leafo\ScssPhp\Formatter\Compressed" />
+                <assetic:filter name="scssphp" formatter="Leafo\ScssPhp\Formatter\Compressed" />
                 <!-- ... -->
             </assetic:config>
         </container>
@@ -172,7 +172,7 @@ First, configure a new ``jsqueeze`` Assetic filter as follows:
                 http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
 
             <assetic:config>
-                <filter name="jsqueeze" />
+                <assetic:filter name="jsqueeze" />
                 <!-- ... -->
             </assetic:config>
         </container>

assetic/asset_management.rst

@@ -170,11 +170,11 @@ can configure its location using the ``node`` key:
 
         // app/config/config.php
         $container->loadFromExtension('assetic', array(
-            'node' => '/usr/bin/nodejs',
+            'node'      => '/usr/bin/nodejs',
             'uglifyjs2' => array(
-                    // the path to the uglifyjs executable
-                    'bin' => '/usr/local/bin/uglifyjs',
-                ),
+                // the path to the uglifyjs executable
+                'bin' => '/usr/local/bin/uglifyjs',
+            ),
         ));
 
 Minify your Assets

assetic/jpeg_optimize.rst

@@ -335,7 +335,7 @@ To enable the security voter in the application, define a new service:
     # app/config/services.yml
     services:
         # ...
-        post_voter:
+        app.post_voter:
             class:      AppBundle\Security\PostVoter
             arguments: ['@security.access.decision_manager']
             public:     false