Merge branch '3.4' into 4.0

* 3.4:
  [Serializer] fix undefined class
  [FrameworkBundle] fix DI extension tests

Author: chalasr

src/Symfony/Bundle/FrameworkBundle/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'),
     ),

src/Symfony/Bundle/FrameworkBundle/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>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml

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

src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php

@@ -80,7 +80,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
         $timezone = $this->getTimezone($context);
 
         if ('' === $data || null === $data) {
-            throw new UnexpectedValueException('The data is either an empty string or null, you should pass a string that can be parsed with the passed format or a valid DateTime string.');
+            throw new NotNormalizableValueException('The data is either an empty string or null, you should pass a string that can be parsed with the passed format or a valid DateTime string.');
         }
 
         if (null !== $dateTimeFormat) {