Merge branch '3.3' into 3.4

* 3.3:
  [FrameworkBundle] fix DI extension tests

Author: chalasr

Tests/DependencyInjection/Fixtures/php/templating_no_assets.php

@@ -1,6 +1,9 @@
 <?php
 
 $container->loadFromExtension('framework', array(
+    'assets' => array(
+        'enabled' => true,
+    ),
     'templating' => array(
         'engines' => array('php', 'twig'),
     ),

Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml

@@ -6,6 +6,7 @@
         http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
     <framework:config>
+        <framework:assets enabled="true" />
         <framework:templating>
             <framework:engine>php</framework:engine>
             <framework:engine>twig</framework:engine>

Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml

@@ -1,3 +1,5 @@
 framework:
+    assets:
+        enabled: true
     templating:
         engines: [php, twig]