Revert "Merge branch 'master' of https://github.com/solazs/symfony-docs…

… into patch-1" This reverts commit fdae4bc, reversing changes made to d5566b1.
symfony · solazs · Nov 5, 2014 · Oct 18, 2014 · Nov 8, 2014 · Nov 13, 2014
commit 30b4dfaf277bf999ccf8c2ce7e96c02c7455e04c
diff --git a/best_practices/forms.rst b/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\OptionsResolver;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
     class PostType extends AbstractType
     {
@@ -36,7 +36,7 @@ form in its own PHP class::
             ;
         }
 
-        public function configureOptions(OptionsResolver $resolver)
+        public function setDefaultOptions(OptionsResolverInterface $resolver)
         {
             $resolver->setDefaults(array(
                 'data_class' => 'AppBundle\Entity\Post'

diff --git a/book/controller.rst b/book/controller.rst
@@ -116,7 +116,7 @@ Controllers are also called *actions*.
 
 This controller is pretty straightforward:
 
-* *line 4*: Symfony takes advantage of PHP's namespace functionality to
+* *line 4*: Symfony takes advantage of PHP 5.3 namespace functionality to
   namespace the entire controller class. The ``use`` keyword imports the
   ``Response`` class, which the controller must return.
 

diff --git a/book/forms.rst b/book/forms.rst
@@ -470,17 +470,13 @@ 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 ``configureOptions()``
+good practice), then you'll need to add the following to the ``setDefaultOptions()``
 method::
 
-    use Symfony\Component\OptionsResolver\OptionsResolver;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => array('registration'),
@@ -502,9 +498,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\OptionsResolver;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => false,
@@ -528,10 +524,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\OptionsResolver;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
     // ...
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => array(
@@ -548,10 +544,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\OptionsResolver;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
     // ...
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => function(FormInterface $form) {
@@ -571,10 +567,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\OptionsResolver;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
     // ...
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'validation_groups' => function(FormInterface $form) {
@@ -1094,9 +1090,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\OptionsResolver;
+        use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-        public function configureOptions(OptionsResolver $resolver)
+        public function setDefaultOptions(OptionsResolverInterface $resolver)
         {
             $resolver->setDefaults(array(
                 'data_class' => 'AppBundle\Entity\Task',
@@ -1325,7 +1321,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\OptionsResolver;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
     class CategoryType extends AbstractType
     {
@@ -1334,7 +1330,7 @@ create a form class so that a ``Category`` object can be modified by the user::
             $builder->add('name');
         }
 
-        public function configureOptions(OptionsResolver $resolver)
+        public function setDefaultOptions(OptionsResolverInterface $resolver)
         {
             $resolver->setDefaults(array(
                 'data_class' => 'AppBundle\Entity\Category',
@@ -1760,13 +1756,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\OptionsResolver;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
     class TaskType extends AbstractType
     {
         // ...
 
-        public function configureOptions(OptionsResolver $resolver)
+        public function setDefaultOptions(OptionsResolverInterface $resolver)
         {
             $resolver->setDefaults(array(
                 'data_class'      => 'AppBundle\Entity\Task',

diff --git a/book/installation.rst b/book/installation.rst
@@ -16,6 +16,13 @@ Using the Symfony Installer is the only recommended way to create new Symfony
 applications. This installer is a PHP application that has to be installed
 only once and then it can create any number of Symfony applications.
 
+.. note::
+
+    The installer requires PHP 5.4 or higher. If you still use the legacy
+    PHP 5.3 version, you cannot use the Symfony Installer. Read the
+    :ref:`book-creating-applications-without-the-installer` section to learn how
+    to proceed.
+
 Depending on your operating system, the installer must be installed in different
 ways.
 
@@ -100,8 +107,9 @@ to use for your projects.
 Creating Symfony Applications without the Installer
 ---------------------------------------------------
 
-If you can't execute the installer for any reason, you can create Symfony
-applications using the alternative installation method based on `Composer`_.
+If you still use PHP 5.3, or if you can't execute the installer for any reason,
+you can create Symfony applications using the alternative installation method
+based on `Composer`_.
 
 Composer is the dependency manager used by modern PHP applications and it can
 also be used to create new applications based on the Symfony framework. If you
@@ -160,6 +168,12 @@ possible solutions depending on your operating system. All of them are
 explained in the :ref:`Setting up Permissions <book-installation-permissions>`
 section.
 
+.. note::
+
+    PHP's internal web server is available in PHP 5.4 or higher versions. If you
+    still use the legacy PHP 5.3 version, you'll have to configure a *virtual host*
+    in your web server.
+
 The ``server:run`` command is only suitable while developing the application. In
 order to run Symfony applications on production servers, you'll have to configure
 your `Apache`_ or `Nginx`_ web server as explained in

diff --git a/book/security.rst b/book/security.rst
@@ -499,6 +499,8 @@ else, you'll want to encode their passwords. The best algorithm to use is
             // ...
         ));
 
+.. include:: /cookbook/security/_ircmaxwell_password-compat.rst.inc
+
 Of course, your user's passwords now need to be encoded with this exact algorithm.
 For hardcoded users, you can use an `online tool`_, which will give you something
 like this:
@@ -822,6 +824,9 @@ You can easily deny access from inside a controller::
      The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
      to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
 
+.. versionadded:: 2.5
+    The ``createAccessDeniedException`` method was introduced in Symfony 2.5.
+
 The :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::createAccessDeniedException`
 method creates a special :class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
 object, which ultimately triggers a 403 HTTP response inside Symfony.
@@ -1312,6 +1317,11 @@ cookie will be ever created by Symfony):
 Checking for Known Security Vulnerabilities in Dependencies
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. versionadded:: 2.5
+    The ``security:check`` command was introduced in Symfony 2.5. This command is
+    included in ``SensioDistributionBundle``, which has to be registered in your
+    application in order to use this command.
+
 When using lots of dependencies in your Symfony projects, some of them may
 contain security vulnerabilities. That's why Symfony includes a command called
 ``security:check`` that checks your ``composer.lock`` file to find any known

diff --git a/book/templating.rst b/book/templating.rst
@@ -1021,6 +1021,9 @@ configuration option.
 
 .. _`book-templating-version-by-asset`:
 
+.. versionadded:: 2.5
+    Setting versioned URLs on an asset-by-asset basis was introduced in Symfony 2.5.
+
 If you need to set a version for a specific asset, you can set the fourth
 argument (or the ``version`` argument) to the desired version:
 
@@ -1043,6 +1046,9 @@ If you don't give a version or pass ``null``, the default package version
 (from :ref:`ref-framework-assets-version`) will be used. If you pass ``false``,
 versioned URL will be deactivated for this asset.
 
+.. versionadded:: 2.5
+    Absolute URLs for assets were introduced in Symfony 2.5.
+
 If you need absolute URLs for assets, you can set the third argument (or the
 ``absolute`` argument) to ``true``:
 

diff --git a/book/translation.rst b/book/translation.rst
@@ -408,8 +408,8 @@ checks translation resources for several locales:
 
 .. note::
 
-    When Symfony doesn't find a translation in the given locale, it will
-    add the missing translation to the log file. For details,
+    When Symfony doesn't find a translation in the given locale, it will 
+    add the missing translation to the log file. For details, 
     see :ref:`reference-framework-translator-logging`.
 
 .. _book-translation-user-locale:
@@ -696,12 +696,15 @@ Translating Database Content
 ----------------------------
 
 The translation of database content should be handled by Doctrine through
-the `Translatable Extension`_ or the `Translatable Behavior`_. For more information,
-see the documentation for these libraries.
+the `Translatable Extension`_ or the `Translatable Behavior`_ (PHP 5.4+).
+For more information, see the documentation for these libraries.
 
 Debugging Translations
 ----------------------
 
+.. versionadded:: 2.5
+    The ``debug:translation`` command was introduced in Symfony 2.5.
+
 .. versionadded:: 2.6
     Prior to Symfony 2.6, this command was called ``translation:debug``.
 

diff --git a/book/validation.rst b/book/validation.rst
@@ -586,6 +586,9 @@ allows you to add a constraint to any public method whose name starts with
 "get", "is" or "has". In this guide, these types of methods are referred to
 as "getters".
 
+.. versionadded:: 2.5
+    Support for methods starting with ``has`` was introduced in Symfony 2.5.
+
 The benefit of this technique is that it allows you to validate your object
 dynamically. For example, suppose you want to make sure that a password field
 doesn't match the first name of the user (for security reasons). You can

diff --git a/changelog.rst b/changelog.rst
@@ -23,19 +23,15 @@ New Documentation
 - `ad74169 <https://github.com/symfony/symfony-docs/commit/ad7416975bfca530b75bbebd29baa89eeeae5e51>`_ #4628 Varnish cookbook session cookie handling (dbu)
 - `50c5a9e <https://github.com/symfony/symfony-docs/commit/50c5a9e65de046fd8d719c7c7cc5233869f2643a>`_ #4895 Added configuration of the user provider (peterrehm)
 - `4226fc2 <https://github.com/symfony/symfony-docs/commit/4226fc27a06aeb975af1b1aae1e6207a07bbbb6f>`_ #4883 Global dump (nicolas-grekas)
-- `a57db5b <https://github.com/symfony/symfony-docs/commit/a57db5b1d240d5b6df1b5a8b077b280c17233420>`_ #4879 Documented true regex (WouterJ)
 - `3bb7b61 <https://github.com/symfony/symfony-docs/commit/3bb7b61dde079611180a2bc4e12e70eac8caef51>`_ #4645 Remove note that's no longer the case (thewilkybarkid)
-- `6c498d4 <https://github.com/symfony/symfony-docs/commit/6c498d4b0868b6dd940517d327c4f4a6893362fb>`_ #4805 added documentation for the new absolute_url() and relative_path() Twig functions (fabpot)
 - `3293286 <https://github.com/symfony/symfony-docs/commit/3293286ac82c6adb0cc4938fce33fef17f5f7108>`_ #4801 [Cookbook][cache][varnish] be more precise about version differences (dbu)
 - `572bf3b <https://github.com/symfony/symfony-docs/commit/572bf3b5da737731472f0760ee6105c72d76feb0>`_ #4800 [Cookbook][Security] Hint about createToken can return null (xelaris)
-- `74d2e30 <https://github.com/symfony/symfony-docs/commit/74d2e3063c23dadfcecd9c5d3715127da68da128>`_ #4786 Replaced setDefaultOptions by the new configureOptions method (peterrehm)
 - `528e8e1 <https://github.com/symfony/symfony-docs/commit/528e8e14aa690bf761d5ad4fa763593f856c6afb>`_ #4740 Use AppBundle whenever it's possible (javiereguiluz)
 - `08e5ac9 <https://github.com/symfony/symfony-docs/commit/08e5ac990a3d8e50a834bf5d7bfc420b39f9083a>`_ #4658 Debug formatter tweaks (weaverryan)
 - `cfad26c <https://github.com/symfony/symfony-docs/commit/cfad26c0b9227c3d43b4988b2c5e510625dd805c>`_ #4605 Adding a link to log things in the prod environment (weaverryan)
 - `3643ec2 <https://github.com/symfony/symfony-docs/commit/3643ec224921b3a0ce6163f807e4b208aa718d58>`_ #4723 [Cookbook][Security] document the new AuthenticationUtils (xabbuh)
 - `9742b92 <https://github.com/symfony/symfony-docs/commit/9742b9291e4b0f4ad4f1e8eff61261cc9598213f>`_ #4761 [Cookbook][Security] don't output message from AuthenticationException (xabbuh)
 - `a23e7d2 <https://github.com/symfony/symfony-docs/commit/a23e7d2ec1b28afe2c3452d1bf5488d7558a478a>`_ #4643 How to override vendor directory location (gajdaw)
-- `ca3b4c8 <https://github.com/symfony/symfony-docs/commit/ca3b4c8f34a30f8a396b5bf95fb801bf679fe20b>`_ #4753 bump Symfony requirements to PHP 5.5 (xabbuh)
 - `99aca45 <https://github.com/symfony/symfony-docs/commit/99aca4532681c1fbc5d85b2935145b3d4fe9934c>`_ #4749 [2.3][Book][Security] Add isPasswordValid doc as in 2.6 (xelaris)
 - `d9935a3 <https://github.com/symfony/symfony-docs/commit/d9935a3f918791a65488a0cd5ca721482c76f09e>`_ #4141 Notes about caching pages with a CSRF Form (ricardclau)
 - `207f2f0 <https://github.com/symfony/symfony-docs/commit/207f2f065e10a29172095c6b6f88a2d8fa071223>`_ #4711 [Reference] Add default_locale config description (xelaris)
@@ -61,7 +57,6 @@ Fixed Documentation
 - `5940d52 <https://github.com/symfony/symfony-docs/commit/5940d5252b82db7bc247c8723e7761c5cfc9c84b>`_ #4735 [BestPractices] remove @Security annotation for Symfony 2.3 (xabbuh)
 - `ce37b96 <https://github.com/symfony/symfony-docs/commit/ce37b96ba0565d0624a16c44c1447c248447158b>`_ #4771 [QuickTour] use the debug:router command name (xabbuh)
 - `ffe3425 <https://github.com/symfony/symfony-docs/commit/ffe3425f6a0ef97be45f29608c6be02db24e98f9>`_ #4765 [Book][Forms] avoid the request service where possible (xabbuh)
-- `92b10b1 <https://github.com/symfony/symfony-docs/commit/92b10b166cb7b0fb687f77804150d6c47aa9576f>`_ #4758 [Components][Yaml] don't describe removed usage of ``Yaml::parse()`` (xabbuh)
 - `36f2e1f <https://github.com/symfony/symfony-docs/commit/36f2e1f74b2d166b333cb07029b1fe6e929c2370>`_ #4757 [Components][ClassLoader] don't show deprecated usage of ``Yaml::parse()`` (xabbuh)
 - `d8e8d75 <https://github.com/symfony/symfony-docs/commit/d8e8d75961ea0a77c74634a56b6d3237d00ca8a4>`_ #4756 [Components][Config] don't show deprecated usage of ``Yaml::parse()`` (xabbuh)
 - `b143754 <https://github.com/symfony/symfony-docs/commit/b143754b22d1086ad58712147075bf1909836a55>`_ #4744 [Book][Security] Update code example to fit description (xelaris)
@@ -109,7 +104,6 @@ Minor Documentation Changes
 - `65b0822 <https://github.com/symfony/symfony-docs/commit/65b08224f3909fb97ab3e26483626c6663e26f4f>`_ #4798 Add version added note for the debug:event-dispatcher command (adamelso)
 - `bcf1508 <https://github.com/symfony/symfony-docs/commit/bcf150860c81459f3accce4dca3e57eafb213e4d>`_ #4785 [Book][Security] add back old anchors (xabbuh)
 - `4143076 <https://github.com/symfony/symfony-docs/commit/4143076e6b2f760b2df03dda6d5933fc54618b68>`_ #4872 [BestPractices] fix merge after removing @Security in 2.3 (xabbuh)
-- `dc25c65 <https://github.com/symfony/symfony-docs/commit/dc25c65d445185b5328febe0248e16a3d88d5e0a>`_ #4769 [2.7] Removed 2.5 versionadded as i
10000
ts deprecated (WouterJ)
 - `48835de <https://github.com/symfony/symfony-docs/commit/48835de6e61f7f72c7000423b23ec9379ab175f7>`_ #4767 [2.6] Removed 2.4 versionadded as version is deprecated (WouterJ)
 - `240a981 <https://github.com/symfony/symfony-docs/commit/240a9815f41c9c1f96d8757b33147e32e5e1b029>`_ #4764 [Reference][Forms] move cautions to make them visible (xabbuh)
 - `cf3d38a <https://github.com/symfony/symfony-docs/commit/cf3d38ad333f09fb324ed610c4f5452f4fda213b>`_ #4731 [Book][Testing] bump required PHPUnit version (xabbuh)

diff --git a/components/class_loader/psr4_class_loader.rst b/components/class_loader/psr4_class_loader.rst
@@ -4,6 +4,10 @@
 The PSR-4 Class Loader
 ======================
 
+.. versionadded:: 2.5
+    The :class:`Symfony\\Component\\ClassLoader\\Psr4ClassLoader` was
+    introduced in Symfony 2.5.
+
 Libraries that follow the `PSR-4`_ standard can be loaded with the ``Psr4ClassLoader``.
 
 .. note::

diff --git a/components/console/changing_default_command.rst b/components/console/changing_default_command.rst
@@ -4,6 +4,10 @@
 Changing the Default Command
 ============================
 
+.. versionadded:: 2.5
+    The :method:`Symfony\\Component\\Console\\Application::setDefaultCommand`
+    method was introduced in Symfony 2.5.
+
 The Console component will always run the ``ListCommand`` when no command name is
 passed. In order to change the default command you just need to pass the command
 name to the ``setDefaultCommand`` method::

diff --git a/components/console/helpers/progressbar.rst b/components/console/helpers/progressbar.rst
@@ -4,6 +4,10 @@
 Progress Bar
 ============
 
+.. versionadded:: 2.5
+    The Progress Bar feature was introduced in Symfony 2.5 as a replacement for
+    the :doc:`Progress Helper </components/console/helpers/progresshelper>`.
+
 When executing longer-running commands, it may be helpful to show progress
 information, which updates as your command runs:
 

diff --git a/components/console/helpers/questionhelper.rst b/components/console/helpers/questionhelper.rst
@@ -4,6 +4,9 @@
 Question Helper
 ===============
 
+.. versionadded:: 2.5
+    The Question Helper was introduced in Symfony 2.5.
+
 The :class:`Symfony\\Component\\Console\\Helper\\QuestionHelper` provides
 functions to ask the user for more information. It is included in the default
 helper set, which you can get by calling
@@ -41,24 +44,6 @@ The second argument to
 is the default value to return if the user doesn't enter any input. Any other
 input will ask the same question again.
 
-.. tip::
-
-    You can customize the regex used to check if the answer means "yes" in the
-    third argument of the constructor. For instance, to allow anything that
-    starts with either ``y`` or ``j``, you would set it to::
-
-        $question = new ConfirmationQuestion(
-            'Continue with this action?',
-            false,
-            '/^(y|j)/i'
-        );
-
-    The regex defaults to ``/^y/i``.
-
-    .. versionadded:: 2.7
-        The regex argument was introduced in Symfony 2.7. Before, only answers
-        starting with ``y`` were considered as "yes".
-
 Asking the User for Information
 -------------------------------