Merge branch '6.4' into 7.0

* 6.4:
  [OptionsResolver] Fix indentation

Author: javiereguiluz

components/options_resolver.rst

@@ -960,8 +960,8 @@ Getting More Insights
 Use the ``OptionsResolverIntrospector`` to inspect the options definitions
 inside an ``OptionsResolver`` instance::
 
-   use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
-   use Symfony\Component\OptionsResolver\OptionsResolver;
+    use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
     $resolver = new OptionsResolver();
     $resolver->setDefaults([