minor #5002 Revert very bad merge (WouterJ)

This PR was merged into the 2.7 branch.

Discussion
----------

Revert very bad merge

This reverts commit ed80100, reversing
changes made to 70902f5.

Commits
-------

c4225f4 Removed bad comma
e747392 Revert "minor #4977 Unnecessary comma (edsonmedina)"

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.
 

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

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:

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:
@@ -675,8 +675,8 @@ 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
 ----------------------

changelog.rst

@@ -25,7 +25,6 @@ New Documentation
 - `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)
@@ -35,7 +34,6 @@ New Documentation
 - `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 +59,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)

components/http_foundation/session_configuration.rst

@@ -218,6 +218,23 @@ particular cookie by reading the ``getLifetime()`` method::
 The expiry time of the cookie can be determined by adding the created
 timestamp and the lifetime.
 
+PHP 5.4 Compatibility
+~~~~~~~~~~~~~~~~~~~~~
+
+Since PHP 5.4.0, :phpclass:`SessionHandler` and :phpclass:`SessionHandlerInterface`
+are available. Symfony provides forward compatibility for the :phpclass:`SessionHandlerInterface`
+so it can be used under PHP 5.3. This greatly improves interoperability with other
+libraries.
+
+:phpclass:`SessionHandler` is a special PHP internal class which exposes native save
+handlers to PHP user-space.
+
+In order to provide a solution for those using PHP 5.4, Symfony has a special
+class called :class:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeSessionHandler`
+which under PHP 5.4, extends from ``\SessionHandler`` and under PHP 5.3 is just a
+empty base class. This provides some interesting opportunities to leverage
+PHP 5.4 functionality if it is available.
+
 Save Handler Proxy
 ~~~~~~~~~~~~~~~~~~
 

components/yaml/introduction.rst

@@ -138,6 +138,12 @@ string or a file containing YAML. Internally, it calls the
 :method:`Symfony\\Component\\Yaml\\Parser::parse` method, but enhances the
 error if something goes wrong by adding the filename to the message.
 
+.. caution::
+
+    Because it is currently possible to pass a filename to this method, you
+    must validate the input first. Passing a filename is deprecated in
+    Symfony 2.2, and will be removed in Symfony 3.0.
+
 .. _components-yaml-dump:
 
 Writing YAML Files

contributing/code/patches.rst

@@ -14,7 +14,7 @@ Before working on Symfony, setup a friendly environment with the following
 software:
 
 * Git;
-* PHP version 5.5.9 or above;
+* PHP version 5.3.3 or above;
 * `PHPUnit`_ 4.2 or above.
 
 Configure Git

cookbook/bundles/best_practices.rst

@@ -29,9 +29,10 @@ Bundle Name
 -----------
 
 A bundle is also a PHP namespace. The namespace must follow the technical
-interoperability `standards`_ for PHP namespaces and class names: it starts
-with a vendor segment, followed by zero or more category segments, and it
-ends with the namespace short name, which must end with a ``Bundle`` suffix.
+interoperability `standards`_ for PHP 5.3 namespaces and class names: it
+starts with a vendor segment, followed by zero or more category segments, and
+it ends with the namespace short name, which must end with a ``Bundle``
+suffix.
 
 A namespace becomes a bundle as soon as you add a bundle class to it. The
 bundle class name must follow these simple rules:
@@ -346,7 +347,7 @@ there are 3 modes, which the user can configure in their project:
 * 2.4: the original 2.4 and earlier validation API;
 * 2.5: the new 2.5 and later validation API;
 * 2.5-BC: the new 2.5 API with a backwards-compatible layer so that the
-  2.4 API still works.
+  2.4 API still works. This is only available in PHP 5.3.9+.
 
 As a bundle author, you'll want to support *both* API's, since some users
 may still be using the 2.4 API. Specifically, if your bundle adds a violation

cookbook/deployment/azure-website.rst

@@ -96,8 +96,9 @@ and how to properly configure PHP for a production environment.
 Configuring the latest PHP Runtime
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Even though Symfony only requires PHP 5.5.9 to run, it's always recommended
-to use the most recent PHP version whenever possible.
+Even though Symfony only requires PHP 5.3.3 to run, it's always recommended
+to use the most recent PHP version whenever possible. PHP 5.3 is no longer
+supported by the PHP core team, but you can update it easily in Azure.
 
 To update your PHP version on Azure, go to the **Configure** tab of the control
 panel and select the version you want.

cookbook/logging/monolog.rst

@@ -4,8 +4,8 @@
 How to Use Monolog to Write Logs
 ================================
 
-Monolog_ is a logging library for PHP used by Symfony. It is inspired by the
-Python LogBook library.
+Monolog_ is a logging library for PHP 5.3 used by Symfony. It is
+inspired by the Python LogBook library.
 
 Usage
 -----

cookbook/security/_ircmaxwell_password-compat.rst.inc

@@ -0,0 +1,13 @@
+.. caution::
+
+    If you're using PHP 5.4 or lower, you'll need to install the ``ircmaxell/password-compat``
+    library via Composer in order to be able to use the ``bcrypt`` encoder:
+
+    .. code-block:: json
+
+        {
+            "require": {
+                ...
+                "ircmaxell/password-compat": "~1.0.3"
+            }
+        }

cookbook/security/entity_provider.rst

@@ -355,6 +355,8 @@ the database to be encoded using this encoder. For details on how to create
 a new User object with a properly encoded password, see the
 :ref:`book-security-encoding-user-password` section of the security chapter.
 
+.. include:: /cookbook/security/_ircmaxwell_password-compat.rst.inc
+
 The ``providers`` section defines an ``administrators`` user provider. A
 user provider is a "source" of where users are loaded during authentication.
 In this case, the ``entity`` keyword means that Symfony will use the Doctrine

cookbook/web_server/built_in.rst

@@ -8,10 +8,11 @@ How to Use PHP's built-in Web Server
     The ability to run the server as a background process was introduced
     in Symfony 2.6.
 
-The CLI SAPI comes with a `built-in web server`_. It can be used to run your
-PHP applications locally during development, for testing or for application
-demonstrations. This way, you don't have to bother configuring a full-featured
-web server such as :doc:`Apache or Nginx </cookbook/configuration/web_server_configuration>`.
+Since PHP 5.4 the CLI SAPI comes with a `built-in web server`_. It can be used
+to run your PHP applications locally during development, for testing or for
+application demonstrations. This way, you don't have to bother configuring
+a full-featured web server such as
+:doc:`Apache or Nginx </cookbook/configuration/web_server_configuration>`.
 
 .. caution::
 

quick_tour/the_big_picture.rst

@@ -8,9 +8,9 @@ by showing you a simple project in action.
 If you've used a web framework before, you should feel right at home with
 Symfony. If not, welcome to a whole new way of developing web applications.
 
-The only technical requisite to follow this tutorial is to have **PHP 5.5.9 or higher
+The only technical requisite to follow this tutorial is to have **PHP 5.4 or higher
 installed on your computer**. If you use a packaged PHP solution such as WAMP,
-XAMP or MAMP, check out that they are using PHP 5.5.9 or a more recent version.
+XAMP or MAMP, check out that they are using PHP 5.4 or a more recent version.
 You can also execute the following command in your terminal or command console
 to display the installed PHP version:
 

reference/configuration/framework.rst

@@ -641,7 +641,8 @@ API. The ``api`` option is used to switch between the different implementations:
 ``2.5-bc`` or ``auto``
     If you omit a value or set the ``api`` option to ``2.5-bc`` or ``auto``,
     Symfony will use an API implementation that is compatible with both the
-    legacy implementation and the ``2.5`` implementation.
+    legacy implementation and the ``2.5`` implementation. You have to use
+    PHP 5.3.9 or higher to be able to use this implementation.
 
 To capture these logs in the ``prod`` environment, configure a
 :doc:`channel handler </cookbook/logging/channels_handlers>` in ``config_prod.yml`` for

reference/requirements.rst

@@ -21,11 +21,17 @@ Below is the list of required and optional requirements.
 Required
 --------
 
-* PHP needs to be a minimum version of PHP 5.5.9
+* PHP needs to be a minimum version of PHP 5.3.3
 * JSON needs to be enabled
 * ctype needs to be enabled
 * Your ``php.ini`` needs to have the ``date.timezone`` setting
 
+.. caution::
+
+    Be aware that Symfony has some known limitations when using a PHP version
+    less than 5.3.8 or equal to 5.3.16. For more information see the
+    `Requirements section of the README`_.
+
 Optional
 --------
 
@@ -50,3 +56,5 @@ Doctrine
 If you want to use Doctrine, you will need to have PDO installed. Additionally,
 you need to have the PDO driver installed for the database server you want
 to use.
+
+.. _`Requirements section of the README`: https://github.com/symfony/symfony#requirements