Merge branch '2.7' into 2.8

javiereguiluz · javiereguiluz · commit 84b1794a8728 · 2018-01-23T12:47:41.000+01:00
* 2.7:
  Added a mention to the createTable() method of the session handler
  Remove out-of-context rewrite rule tip
  Mention cachetool utility to clear OPcache cache from CLI
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -310,8 +310,6 @@ You are now able to serialize only attributes in the groups you want::
     );
     // $obj2 = MyObj(foo: 'foo', bar: 'bar')
 
-.. include:: /_includes/_rewrite_rule_tip.rst.inc
-
 .. _ignoring-attributes-when-serializing:
 
 Ignoring Attributes
diff --git a/doctrine/pdo_session_storage.rst b/doctrine/pdo_session_storage.rst
@@ -133,7 +133,7 @@ a second array argument to ``PdoSessionHandler``:
                 array('db_table' => 'sessions', 'db_username' => 'myuser', 'db_password' => 'mypassword'),
             ));
 
-These are parameters that you must configure:
+These are parameters that you can configure:
 
 ``db_table`` (default ``sessions``):
     The name of the session table in your database;
@@ -206,8 +206,18 @@ Preparing the Database to Store Sessions
 ----------------------------------------
 
 Before storing sessions in the database, you must create the table that stores
-the information. The following sections contain some examples of the SQL statements
-you may use for your specific database engine.
+the information. The session handler provides a method called
+:method:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler::createTable`
+to set up this table for you according to the database engine used::
+
+    try {
+        $sessionHandlerService->createTable();
+    } catch (\PDOException $e) {
+        // the table could not be created for some reason
+    }
+
+If you prefer to set up the table yourself, these are some examples of the SQL
+statements you may use according to your specific database engine.
 
 MySQL
 ~~~~~
diff --git a/performance.rst b/performance.rst
@@ -55,9 +55,13 @@ using APC and ``opcache_reset()`` when using OPcache).
 
     In PHP, the CLI and the web processes don't share the same OPcache. This
     means that you cannot clear the web server OPcache by executing some command
-    in your terminal. You either need to restart the web server or call the
-    ``apc_clear_cache()`` or ``opcache_reset()`` functions via the web server
-    (i.e. by having these in a script that you execute over the web).
+    in your terminal. These are some of the possible solutions:
+
+    #. Restart the web server;
+    #. Call the :phpfunction:`apc_clear_cache` or :phpfunction:`opcache_reset`
+       functions via the web server (i.e. by having these in a script that
+       you execute over the web);
+    #. Use the `cachetool`_ utility to control APC and OPcache from the CLI.
 
 Optimizing all the Files Used by Symfony
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -213,3 +217,4 @@ Learn more
 .. _`APCu PHP functions`: http://php.net/manual/en/ref.apcu.php
 .. _`autoload.php`: https://github.com/symfony/symfony-standard/blob/master/app/autoload.php
 .. _`bootstrap file`: https://github.com/sensiolabs/SensioDistributionBundle/blob/master/Composer/ScriptHandler.php
+.. _`cachetool`: https://github.com/gordalina/cachetool
