Merge branch '2.7'

* 2.7:
  [#4625] Removing link added for BC, because this is the top of the page anyways
  Added '-ing' title ending to unify titles look
  [OptionsResolver] Fix namespace
  [OptionsResolver] Fix Namespace link
  filesystem headlines match method names
  Change refering block name from content to body
  Update pdo_session_storage.rst
  When explaining how to install dependencies for running unit tests, there are references to "--dev" composer parameter that is the current default value.
  Fixing missing services key
  readd mistakenly removed label
  fix feature freeze dates

Author: weaverryan

components/console/console_arguments.rst

@@ -1,8 +1,8 @@
 .. index::
     single: Console; Console arguments
 
-Understand how Console Arguments are Handled
-============================================
+Understanding how Console Arguments Are Handled
+===============================================
 
 It can be difficult to understand the way arguments are handled by the console application.
 The Symfony Console application, like many other CLI utility tools, follows the behavior

components/filesystem/introduction.rst

@@ -52,7 +52,7 @@ endpoint for filesystem operations::
     string, an array or any object implementing :phpclass:`Traversable` as
     the target argument.
 
-Mkdir
+mkdir
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir` creates a directory.
@@ -66,7 +66,7 @@ On posix filesystems, directories are created with a default mode value
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Exists
+exists
 ~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::exists` checks for the
@@ -83,7 +83,7 @@ presence of all files or directories and returns ``false`` if a file is missing:
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Copy
+copy
 ~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::copy` is used to copy
@@ -97,7 +97,7 @@ the third boolean argument::
     // image.jpg will be overridden
     $fs->copy('image-ICC.jpg', 'image.jpg', true);
 
-Touch
+touch
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::touch` sets access and
@@ -116,7 +116,7 @@ your own with the second argument. The third argument is the access time::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Chown
+chown
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chown` is used to change
@@ -132,7 +132,7 @@ the owner of a file. The third argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Chgrp
+chgrp
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chgrp` is used to change
@@ -148,7 +148,7 @@ the group of a file. The third argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Chmod
+chmod
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chmod` is used to change
@@ -164,7 +164,7 @@ the mode of a file. The fourth argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Remove
+remove
 ~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::remove` is used to remove
@@ -177,7 +177,7 @@ files, symlinks, directories easily::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Rename
+rename
 ~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::rename` is used to rename

components/options_resolver.rst

@@ -427,7 +427,7 @@ Sometimes, option values need to be normalized before you can use them. For
 instance, assume that the ``host`` should always start with ``http://``. To do
 that, you can write normalizers. Normalizers are executed after validating an
 option. You can configure a normalizer by calling
-:method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setNormalizer`::
+:method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setNormalizer`::
 
     // ...
     class Mailer
@@ -449,9 +449,9 @@ option. You can configure a normalizer by calling
     }
 
 .. versionadded:: 2.6
-    The method :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setNormalizer`
+    The method :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setNormalizer`
     was introduced in Symfony 2.6. Before, you had to use
-    :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setNormalizers`.
+    :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setNormalizers`.
 
 The normalizer receives the actual ``$value`` and returns the normalized form.
 You see that the closure also takes an ``$options`` parameter. This is useful
@@ -588,9 +588,9 @@ comes from the default::
     }
 
 .. versionadded:: 2.6
-    The method :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setDefined`
+    The method :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setDefined`
     was introduced in Symfony 2.6. Before, you had to use
-    :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setOptional`.
+    :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setOptional`.
 
 You can use :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setDefined`
 to define an option without setting a default value. Then the option will only
@@ -644,8 +644,8 @@ options in one go::
     }
 
 .. versionadded:: 2.6
-    The method :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::isDefined`
-    and :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::getDefinedOptions`
+    The method :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::isDefined`
+    and :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::getDefinedOptions`
     were introduced in Symfony 2.6.
 
 The methods :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::isDefined`

contributing/code/tests.rst

@@ -41,7 +41,7 @@ Step 2: Install vendors
 
 .. code-block:: bash
 
-    $ php composer.phar --dev install
+    $ php composer.phar install
 
 .. note::
 
@@ -56,14 +56,14 @@ Step 2: Install vendors
     .. code-block:: bash
 
         $ php installer
-        $ php composer.phar --dev install
+        $ php composer.phar install
 
 After installation, you can update the vendors to their latest version with
 the follow command:
 
 .. code-block:: bash
 
-    $ php composer.phar --dev update
+    $ php composer.phar update
 
 Running
 -------

contributing/community/releases.rst

@@ -94,13 +94,13 @@ Version  Feature Freeze  Release  End of Maintenance        End of Life
 2.2      01/2013         03/2013  11/2013 (8 months)        05/2014
 **2.3**  03/2013         05/2013  05/2016 (36 months)       05/2017
 2.4      09/2013         11/2013  09/2014 (10 months [1]_)  01/2015
-2.5      02/2014         05/2014  01/2015 (8 months)        07/2015
+2.5      03/2014         05/2014  01/2015 (8 months)        07/2015
 2.6      09/2014         11/2014  07/2015 (8 months)        01/2016
-**2.7**  02/2015         05/2015  05/2018 (36 months [2]_)  05/2019
+**2.7**  03/2015         05/2015  05/2018 (36 months [2]_)  05/2019
 3.0      09/2015         11/2015  07/2016 (8 months)        01/2017
-3.1      02/2016         05/2016  01/2017 (8 months)        07/2017
+3.1      03/2016         05/2016  01/2017 (8 months)        07/2017
 3.2      09/2016         11/2016  07/2017 (8 months)        01/2018
-**3.3**  02/2017         05/2017  05/2020 (36 months)       05/2021
+**3.3**  03/2017         05/2017  05/2020 (36 months)       05/2021
 ...      ...             ...      ...                       ...
 =======  ==============  =======  ========================  ===========
 

cookbook/configuration/pdo_session_storage.rst

@@ -26,10 +26,11 @@ configuration format of your choice):
 
         parameters:
             pdo.db_options:
-                db_table:    session
-                db_id_col:   session_id
-                db_data_col: session_value
-                db_time_col: session_time
+                db_table:        session
+                db_id_col:       session_id
+                db_data_col:     session_data
+                db_time_col:     session_time
+                db_lifetime_col: session_lifetime
 
         services:
             pdo:
@@ -56,8 +57,9 @@ configuration format of your choice):
             <parameter key="pdo.db_options" type="collection">
                 <parameter key="db_table">session</parameter>
                 <parameter key="db_id_col">session_id</parameter>
-                <parameter key="db_data_col">session_value</parameter>
+                <parameter key="db_data_col">session_data</parameter>
                 <parameter key="db_time_col">session_time</parameter>
+                <parameter key="db_lifetime_col">session_lifetime</parameter>
             </parameter>
         </parameters>
 
@@ -93,10 +95,11 @@ configuration format of your choice):
         ));
 
         $container->setParameter('pdo.db_options', array(
-            'db_table'      => 'session',
-            'db_id_col'     => 'session_id',
-            'db_data_col'   => 'session_value',
-            'db_time_col'   => 'session_time',
+            'db_table'        => 'session',
+            'db_id_col'       => 'session_id',
+            'db_data_col'     => 'session_data',
+            'db_time_col'     => 'session_time',
+            'db_lifetime_col' => 'session_lifetime',
         ));
 
         $pdoDefinition = new Definition('PDO', array(
@@ -114,9 +117,10 @@ configuration format of your choice):
         $container->setDefinition('session.handler.pdo', $storageDefinition);
 
 * ``db_table``: The name of the session table in your database
-* ``db_id_col``: The name of the id column in your session table (VARCHAR(255) or larger)
-* ``db_data_col``: The name of the value column in your session table (TEXT or CLOB)
+* ``db_id_col``: The name of the id column in your session table (VARCHAR(128))
+* ``db_data_col``: The name of the value column in your session table (BLOB)
 * ``db_time_col``: The name of the time column in your session table (INTEGER)
+* ``db_lifetime_col``: The name of the lifetime column in your session table (INTEGER)
 
 Sharing your Database Connection Information
 --------------------------------------------
@@ -133,12 +137,13 @@ of your project's data, you can use the connection settings from the
 
     .. code-block:: yaml
 
-        pdo:
-            class: PDO
-            arguments:
-                - "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
-                - "%database_user%"
-                - "%database_password%"
+        services:
+            pdo:
+                class: PDO
+                arguments:
+                    - "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
+                    - "%database_user%"
+                    - "%database_password%"
 
     .. code-block:: xml
 
@@ -168,11 +173,11 @@ following (MySQL):
 .. code-block:: sql
 
     CREATE TABLE `session` (
-        `session_id` varchar(255) NOT NULL,
-        `session_value` text NOT NULL,
-        `session_time` int(11) NOT NULL,
-        PRIMARY KEY (`session_id`)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+        `session_id` VARBINARY(128) NOT NULL PRIMARY KEY,
+        `session_data` BLOB NOT NULL,
+        `session_time` INTEGER UNSIGNED NOT NULL,
+        `session_lifetime` MEDIUMINT NOT NULL
+    ) COLLATE utf8_bin, ENGINE = InnoDB;
 
 PostgreSQL
 ~~~~~~~~~~
@@ -182,10 +187,10 @@ For PostgreSQL, the statement should look like this:
 .. code-block:: sql
 
     CREATE TABLE session (
-        session_id character varying(255) NOT NULL,
-        session_value text NOT NULL,
-        session_time integer NOT NULL,
-        CONSTRAINT session_pkey PRIMARY KEY (session_id)
+        session_id VARCHAR(128) NOT NULL PRIMARY KEY,
+        session_data BYTEA NOT NULL,
+        session_time INTEGER NOT NULL,
+        session_lifetime INTEGER NOT NULL
     );
 
 Microsoft SQL Server
@@ -197,8 +202,9 @@ For MSSQL, the statement might look like the following:
 
     CREATE TABLE [dbo].[session](
         [session_id] [nvarchar](255) NOT NULL,
-        [session_value] [ntext] NOT NULL,
+        [session_data] [ntext] NOT NULL,
         [session_time] [int] NOT NULL,
+        [session_lifetime] [int] NOT NULL,
         PRIMARY KEY CLUSTERED(
             [session_id] ASC
         ) WITH (

quick_tour/the_view.rst

@@ -126,7 +126,7 @@ Open the ``app/Resources/views/base.html.twig`` file that corresponds to the
 
 The ``{% block %}`` tags tell the template engine that a child template may
 override those portions of the template. In this example, the ``index.html.twig``
-template overrides the ``content`` block, but not the ``title`` block, which will
+template overrides the ``body`` block, but not the ``title`` block, which will
 display the default content defined in the ``base.html.twig`` template.
 
 Using Tags, Filters, and Functions