Merge branch '3.4' into 4.0

* 3.4:
  Fix merge
  [HttpKernel] Fix resetting DumpDataCollector::$isCollected
  [Framework][Workflow] Added support for interfaces

Author: Robin Chalas

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -280,8 +280,8 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                         ->prototype('scalar')
                                             ->cannotBeEmpty()
                                             ->validate()
-                                                ->ifTrue(function ($v) { return !class_exists($v); })
-                                                ->thenInvalid('The supported class %s does not exist.')
+                                                ->ifTrue(function ($v) { return !class_exists($v) && !interface_exists($v); })
+                                                ->thenInvalid('The supported class or interface "%s" does not exist.')
                                             ->end()
                                         ->end()
                                     ->end()

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php

@@ -80,7 +80,6 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.guard'));
         $listener->replaceArgument(2, $id);
         $listener->replaceArgument(3, $authenticators);
-        $listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
 
         // determine the entryPointId to use
         $entryPointId = $this->determineEntryPoint($defaultEntryPoint, $config);

src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

@@ -171,7 +171,7 @@ public function reset()
         }
         $this->data = array();
         $this->dataCount = 0;
-        $this->isCollected = false;
+        $this->isCollected = true;
         $this->clonesCount = 0;
         $this->clonesIndex = 0;
     }