Merge branch '3.4'

* 3.4:
  [travis] fix minor php7.0 version
  [travis] add ldap.so for php70
  [HttpFoundation] Fix logic when JsonSerializable is missing
  [travis] update to trusty
  Add help description to debug:form command
  Don't use return on Assert::markTestSkipped.
  [TwigBridge] Show Twig's loader paths on debug:twig command
  [FrameworkBundle] Fix Di config to allow for more private services
  Create directories recursively in the PHPUnit bridge
  [Dotenv] Add a BC break note
  [Cache] Use options from Memcached DSN
  Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args
  be able to enable workflow support explicitly
  [Yaml] add inline parser context initializer
  [ExpressionLanguage] throws an exception on calling uncallable method

Author: nicolas-grekas

Command/DebugCommand.php

@@ -51,6 +51,16 @@ protected function configure()
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt or json)', 'txt'),
             ))
             ->setDescription('Displays form type information')
+            ->setHelp(<<<'EOF'
+The <info>%command.name%</info> command displays information about a form type.
+
+Either the fully-qualified class name or the short class name can be used:
+
+  <info>php %command.full_name% Symfony\Component\Form\Extension\Core\Type\ChoiceType</info>
+  <info>php %command.full_name% ChoiceType</info>
+
+EOF
+            )
         ;
     }
 

FormRendererInterface.php

@@ -76,7 +76,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
      * Check the token in your action using the same token ID.
      *
      * <code>
-     * $csrfProvider = $this->get('security.csrf.token_generator');
+     * // $csrfProvider being an instance of Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface
      * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
      *     throw new \RuntimeException('CSRF attack detected.');
      * }