Merge branch '2.7'

* 2.7:
  [#4805] Adding versionadded
  added documentation for the new absolute_url() and relative_path() Twig functions
  Remove 'acme'
  Update routing.rst
  [#4786] Adding a few versionadded's for the changed method name
  Replaced setDefaultOptions by the new configureOptions method
  Typo
  Update introduction.rst
  [Book][Translation] Added tip for routing params
  [varnish] be more precise about version differences
  Remove trailing whitespace
  [BestPractices] fix minor typo
  Remove horizontal scrollbar
  [Components][Debug] fix DebugClassLoader namespace
  Update override.rst
  Update override.rst
  [Book][Security] add back old anchors
  [Cookbook][Security] Hint about createToken can return null
  Add version added note for the debug:event-dispatcher command

Conflicts:
	reference/twig_reference.rst

Author: weaverryan

best_practices/forms.rst

@@ -21,7 +21,7 @@ form in its own PHP class::
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
-    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
     class PostType extends AbstractType
     {
@@ -36,7 +36,7 @@ form in its own PHP class::
             ;
         }
 
-        public function setDefaultOptions(OptionsResolverInterface $resolver)
+        public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
                 'data_class' => 'AppBundle\Entity\Post'

best_practices/security.rst

@@ -245,7 +245,7 @@ Security Voters
 
 If your security logic is complex and can't be centralized into a method
 like ``isAuthor()``, you should leverage custom voters. These are an order
-of magnitude easier than :doc:`ACL's </cookbook/security/acl>` and will give
+of magnitude easier than :doc:`ACLs </cookbook/security/acl>` and will give
 you the flexibility you need in almost all cases.
 
 First, create a voter class. The following example shows a voter that implements

book/forms.rst

@@ -470,13 +470,17 @@ you'll need to specify which validation group(s) your form should use::
         'validation_groups' => array('registration'),
     ))->add(...);
 
+.. versionadded:: 2.7
+    The ``configureOptions()`` method was introduced in Symfony 2.7. Previously,
+    the method was called ``setDefaultOptions()``.
+
 If you're creating :ref:`form classes <book-form-creating-form-classes>` (a
-good practice), then you'll need to add the following to the ``setDefaultOptions()``
+good practice), then you'll need to add the following to the ``configureOptions()``
 method::
 
-    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => array('registration'),
@@ -498,9 +502,9 @@ Disabling Validation
 Sometimes it is useful to suppress the validation of a form altogether. For
 these cases you can set the ``validation_groups`` option to ``false``::
 
-    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => false,
@@ -524,10 +528,10 @@ If you need some advanced logic to determine the validation groups (e.g.
 based on submitted data), you can set the ``validation_groups`` option
 to an array callback::
 
-    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
     // ...
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => array(
@@ -544,10 +548,10 @@ You can also define whole logic inline by using a ``Closure``::
 
     use Acme\AcmeBundle\Entity\Client;
     use Symfony\Component\Form\FormInterface;
-    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
     // ...
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => function(FormInterface $form) {
@@ -567,10 +571,10 @@ of the entity as well you have to adjust the option as follows::
 
     use Acme\AcmeBundle\Entity\Client;
     use Symfony\Component\Form\FormInterface;
-    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
     // ...
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => function(FormInterface $form) {
@@ -1090,9 +1094,9 @@ the choice is ultimately up to you.
     good idea to explicitly specify the ``data_class`` option by adding the
     following to your form type class::
 
-        use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+        use Symfony\Component\OptionsResolver\OptionsResolver;
 
-        public function setDefaultOptions(OptionsResolverInterface $resolver)
+        public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
                 'data_class' => 'AppBundle\Entity\Task',
@@ -1321,7 +1325,7 @@ create a form class so that a ``Category`` object can be modified by the user::
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
-    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
     class CategoryType extends AbstractType
     {
@@ -1330,7 +1334,7 @@ create a form class so that a ``Category`` object can be modified by the user::
             $builder->add('name');
         }
 
-        public function setDefaultOptions(OptionsResolverInterface $resolver)
+        public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
                 'data_class' => 'AppBundle\Entity\Category',
@@ -1756,13 +1760,13 @@ that all un-rendered fields are output.
 
 The CSRF token can be customized on a form-by-form basis. For example::
 
-    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
     class TaskType extends AbstractType
     {
         // ...
 
-        public function setDefaultOptions(OptionsResolverInterface $resolver)
+        public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
                 'data_class'      => 'AppBundle\Entity\Task',

book/from_flat_php_to_symfony2.rst

@@ -244,7 +244,7 @@ the layout:
 
     <?php include 'layout.php' ?>
 
-You now have a setup that will allow you to reuse the layout. 
+You now have a setup that will allow you to reuse the layout.
 Unfortunately, to accomplish this, you're forced to use a few ugly
 PHP functions (``ob_start()``, ``ob_get_clean()``) in the template. Symfony
 uses a Templating component that allows this to be accomplished cleanly

book/http_cache.rst

@@ -538,8 +538,8 @@ won't be asked to return the updated response until the cache finally becomes
 stale.
 
 The validation model addresses this issue. Under this model, the cache continues
-to store responses. The difference is that, for each request, the cache asks the 
-application if the cached response is still valid or if it needs to be regenerated. 
+to store responses. The difference is that, for each request, the cache asks the
+application if the cached response is still valid or if it needs to be regenerated.
 If the cache *is* still valid, your application should return a 304 status code
 and no content. This tells the cache that it's ok to return the cached response.
 

book/routing.rst

@@ -1021,8 +1021,8 @@ routing system can be:
             /**
              * @Route(
              *     "/articles/{_locale}/{year}/{title}.{_format}",
-             *     defaults: {"_format": "html"},
-             *     requirements: {
+             *     defaults={"_format": "html"},
+             *     requirements={
              *         "_locale": "en|fr",
              *         "_format": "html|rss",
              *         "year": "\d+"

book/security.rst

@@ -275,6 +275,7 @@ But who can you login as? Where do users come from?
     or :doc:`build your own </cookbook/security/custom_authentication_provider>`.
 
 .. _security-user-providers:
+.. _where-do-users-come-from-user-providers:
 
 B) Configuring how Users are Loaded
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -433,6 +434,7 @@ If you'd like to load your users via the Doctrine ORM, that's easy! See
 
 .. _book-security-encoding-user-password:
 .. _c-encoding-the-users-password:
+.. _encoding-the-user-s-password:
 
 C) Encoding the User's Password
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

book/service_container.rst

@@ -569,7 +569,7 @@ the service container gives you a much more appealing option:
         services:
             my_mailer:
                 # ...
-            
+
             newsletter_manager:
                 class:     Acme\HelloBundle\Newsletter\NewsletterManager
                 arguments: ["@my_mailer"]
@@ -762,7 +762,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
         services:
             my_mailer:
                 # ...
-            
+
             newsletter_manager:
                 class:     Acme\HelloBundle\Newsletter\NewsletterManager
                 calls:
@@ -797,7 +797,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
         use Symfony\Component\DependencyInjection\Reference;
 
         $container->setDefinition('my_mailer', ...);
-        
+
         $container->setDefinition('newsletter_manager', new Definition(
             'Acme\HelloBundle\Newsletter\NewsletterManager'
         ))->addMethodCall('setMailer', array(
@@ -938,7 +938,7 @@ it exists and do nothing if it doesn't:
                 <service id="my_mailer">
                 <!-- ... -->
                 </service>
-                
+
                 <service id="newsletter_manager" class="Acme\HelloBundle\Newsletter\NewsletterManager">
                     <argument type="service" id="my_mailer" on-invalid="ignore" />
                 </service>
@@ -953,7 +953,7 @@ it exists and do nothing if it doesn't:
         use Symfony\Component\DependencyInjection\ContainerInterface;
 
         $container->setDefinition('my_mailer', ...);
-        
+
         $container->setDefinition('newsletter_manager', new Definition(
             'Acme\HelloBundle\Newsletter\NewsletterManager',
             array(

book/translation.rst

@@ -428,7 +428,7 @@ via the ``request`` object::
 
 .. tip::
 
-    Read :doc:`/cookbook/session/locale_sticky_session` to learn, how to store
+    Read :doc:`/cookbook/session/locale_sticky_session` to learn how to store
     the user's locale in the session.
 
 .. index::
@@ -508,6 +508,11 @@ as the locale for the current request.
 You can now use the locale to create routes to other translated pages
 in your application.
 
+.. tip::
+
+    Read :doc:`/cookbook/routing/service_container_parameters` to learn how to
+    avoid hardcoding the ``_locale`` requirement in all your routes.
+
 Setting a default Locale
 ~~~~~~~~~~~~~~~~~~~~~~~~
 

components/class_loader/cache_class_loader.rst

@@ -4,7 +4,7 @@
     single: ClassLoader; Cache
     single: ClassLoader; XcacheClassLoader
     single: XCache; XcacheClassLoader
-    
+
 Cache a Class Loader
 ====================
 
@@ -30,16 +30,16 @@ ApcClassLoader
 ``findFile()`` method using `APC`_::
 
     require_once '/path/to/src/Symfony/Component/ClassLoader/ApcClassLoader.php';
-    
+
     // instance of a class that implements a findFile() method, like the ClassLoader
     $loader = ...;
-    
+
     // sha1(__FILE__) generates an APC namespace prefix
     $cachedLoader = new ApcClassLoader(sha1(__FILE__), $loader);
-    
+
     // register the cached class loader
     $cachedLoader->register();
-    
+
     // deactivate the original, non-cached loader if it was registered previously
     $loader->unregister();
 
@@ -50,16 +50,16 @@ XcacheClassLoader
 it is straightforward::
 
     require_once '/path/to/src/Symfony/Component/ClassLoader/XcacheClassLoader.php';
-    
+
     // instance of a class that implements a findFile() method, like the ClassLoader
     $loader = ...;
-    
+
     // sha1(__FILE__) generates an XCache namespace prefix
     $cachedLoader = new XcacheClassLoader(sha1(__FILE__), $loader);
-    
+
     // register the cached class loader
     $cachedLoader->register();
-    
+
     // deactivate the original, non-cached loader if it was registered previously
     $loader->unregister();
 

components/class_loader/map_class_loader.rst

@@ -1,6 +1,6 @@
 .. index::
     single: ClassLoader; MapClassLoader
-    
+
 MapClassLoader
 ==============
 
@@ -26,14 +26,14 @@ Using it is as easy as passing your mapping to its constructor when creating
 an instance of the ``MapClassLoader`` class::
 
     require_once '/path/to/src/Symfony/Component/ClassLoader/MapClassLoader';
-    
+
     $mapping = array(
         'Foo' => '/path/to/Foo',
         'Bar' => '/path/to/Bar',
     );
-    
+
     $loader = new MapClassLoader($mapping);
-    
+
     $loader->register();
 
 .. _PSR-0: http://www.php-fig.org/psr/psr-0/

components/console/introduction.rst

@@ -404,7 +404,6 @@ tools capable of helping you with different tasks:
 * :doc:`/components/console/helpers/formatterhelper`: customize the output colorization
 * :doc:`/components/console/helpers/progressbar`: shows a progress bar
 * :doc:`/components/console/helpers/table`: displays tabular data as a table
-* :doc:`/components/console/helpers/questionhelper`: interactively ask the user for information
 
 .. _component-console-testing-commands:
 

components/css_selector.rst

@@ -76,7 +76,7 @@ web-browser.
 
 * link-state selectors: ``:link``, ``:visited``, ``:target``
 * selectors based on user action: ``:hover``, ``:focus``, ``:active``
-* UI-state selectors: ``:invalid``, ``:indeterminate`` (however, ``:enabled``, 
+* UI-state selectors: ``:invalid``, ``:indeterminate`` (however, ``:enabled``,
   ``:disabled``, ``:checked`` and ``:unchecked`` are available)
 
 Pseudo-elements (``:before``, ``:after``, ``:first-line``,

components/debug/class_loader.rst

@@ -13,6 +13,6 @@ with a ``DebugClassLoader`` wrapper.
 Using the ``DebugClassLoader`` is as easy as calling its static
 :method:`Symfony\\Component\\Debug\\DebugClassLoader::enable` method::
 
-    use Symfony\Component\ClassLoader\DebugClassLoader;
+    use Symfony\Component\Debug\DebugClassLoader;
 
     DebugClassLoader::enable();

components/dependency_injection/advanced.rst

@@ -17,7 +17,7 @@ using the ``get()`` method::
 
 In some cases, a service *only* exists to be injected into another service
 and is *not* intended to be fetched directly from the container as shown
-above. 
+above.
 
 .. _inlined-private-services:
 

components/security/authentication.rst

@@ -263,7 +263,7 @@ in) is correct, you can use::
 
     // fetch the Acme\Entity\LegacyUser
     $user = ...;
-    
+
     // the submitted password, e.g. from the login form
     $plainPassword = ...;
 

components/templating/helpers/assetshelper.rst

@@ -99,7 +99,7 @@ Asset path generation is handled internally by packages. The component provides
 You can also use multiple packages::
 
     use Symfony\Component\Templating\Asset\PathPackage;
-    
+
     // ...
     $templateEngine->set(new AssetsHelper());
 

components/templating/introduction.rst

@@ -135,7 +135,7 @@ escaper using the
 Helpers
 -------
 
-The Templating component can be easily extended via helpers. Helpers are PHP objects that 
+The Templating component can be easily extended via helpers. Helpers are PHP objects that
 provide features useful in a template context. The component has
 2 built-in helpers: