removed deprecated cookie config options

Author: fabpot

cookbook/configuration/pdo_session_storage.rst

@@ -54,7 +54,7 @@ configuration format of your choice):
 
         <!-- app/config/config.xml -->
         <framework:config>
-            <framework:session handler-id="session.handler.pdo" lifetime="3600" auto-start="true"/>
+            <framework:session handler-id="session.handler.pdo" session-lifetime="3600" auto-start="true"/>
         </framework:config>
 
         <parameters>
@@ -196,16 +196,16 @@ For MSSQL, the statement might look like the following:
 .. code-block:: sql
 
     CREATE TABLE [dbo].[session](
-	    [session_id] [nvarchar](255) NOT NULL,
-	    [session_value] [ntext] NOT NULL,
+        [session_id] [nvarchar](255) NOT NULL,
+        [session_value] [ntext] NOT NULL,
         [session_time] [int] NOT NULL,
-		PRIMARY KEY CLUSTERED(
-			[session_id] ASC
-		) WITH (
-		    PAD_INDEX  = OFF,
-		    STATISTICS_NORECOMPUTE  = OFF,
-		    IGNORE_DUP_KEY = OFF,
-		    ALLOW_ROW_LOCKS  = ON,
-		    ALLOW_PAGE_LOCKS  = ON
-		) ON [PRIMARY]
+        PRIMARY KEY CLUSTERED(
+            [session_id] ASC
+        ) WITH (
+            PAD_INDEX  = OFF,
+            STATISTICS_NORECOMPUTE  = OFF,
+            IGNORE_DUP_KEY = OFF,
+            ALLOW_ROW_LOCKS  = ON,
+            ALLOW_PAGE_LOCKS  = ON
+        ) ON [PRIMARY]
     ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

reference/configuration/framework.rst

@@ -131,9 +131,6 @@ session
 cookie_lifetime
 ...............
 
-.. versionadded:: 2.1
-    This option was formerly known as ``lifetime``
-
 **type**: ``integer`` **default**: ``0``
 
 This determines the lifetime of the session - in seconds. By default it will use
@@ -142,19 +139,13 @@ This determines the lifetime of the session - in seconds. By default it will use
 cookie_path
 ...........
 
-.. versionadded:: 2.1
-    This option was formerly known as ``path``
-
 **type**: ``string`` **default**: ``/``
 
 This determines the path to set in the session cookie. By default it will use ``/``.
 
 cookie_domain
 .............
 
-.. versionadded:: 2.1
-    This option was formerly known as ``domain``
-
 **type**: ``string`` **default**: ``''``
 
 This determines the domain to set in the session cookie. By default it's blank,
@@ -164,19 +155,13 @@ to the cookie specification.
 cookie_secure
 .............
 
-.. versionadded:: 2.1
-    This option was formerly known as ``secure``
-
 **type**: ``Boolean`` **default**: ``false``
 
 This determines whether cookies should only be sent over secure connections.
 
 cookie_httponly
 ...............
 
-.. versionadded:: 2.1
-    This option was formerly known as ``httponly``
-
 **type**: ``Boolean`` **default**: ``false``
 
 This determines whether cookies should only accesible through the HTTP protocol.
@@ -429,21 +414,6 @@ Full Default Configuration
                 gc_maxlifetime:       ~
                 save_path:            %kernel.cache_dir%/sessions
 
-                # DEPRECATED! Please use: cookie_lifetime
-                lifetime:             ~
-
-                # DEPRECATED! Please use: cookie_path
-                path:                 ~
-
-                # DEPRECATED! Please use: cookie_domain
-                domain:               ~
-
-                # DEPRECATED! Please use: cookie_secure
-                secure:               ~
-
-                # DEPRECATED! Please use: cookie_httponly
-                httponly:             ~
-
             # templating configuration
             templating:
                 assets_version:       ~