Merge branch '2.7' into 2.8

symfony · Oct 15, 2015 · f4ba8f1 · f4ba8f1
2 parents 676c75f + 61efc58
commit f4ba8f1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst
@@ -268,14 +268,30 @@ The **minimum configuration** to get your application running under Nginx is:
             fastcgi_pass unix:/var/run/php5-fpm.sock;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
             include fastcgi_params;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
         }
         # PROD
         location ~ ^/app\.php(/|$) {
             fastcgi_pass unix:/var/run/php5-fpm.sock;
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
             include fastcgi_params;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
             # Prevents URIs that include the front controller. This will 404:
             # http://domain.tld/app.php/some-path
             # Remove the internal directive to allow URIs like this

diff --git a/cookbook/event_dispatcher/event_listener.rst b/cookbook/event_dispatcher/event_listener.rst
@@ -255,6 +255,12 @@ Listeners and subscribers can be used in the same application indistinctly. The
 decision to use either of them is usually a matter of personal taste. However,
 there are some minor advantages for each of them:
 
+* **Subscribers are easier to reuse** because the knowledge of the events is kept
+  in the class rather than in the service definition. This is the reason why
+  Symfony uses subscribers internally;
+* **Listeners are more flexible** because bundles can enable or disable each of
+  them conditionally depending on some configuration value.
+
 Debugging Event Listeners
 -------------------------
 
@@ -274,9 +280,3 @@ its name:
 .. code-block:: bash
 
     $ php app/console debug:event-dispatcher kernel.exception
-=======
-* **Subscribers are easier to reuse** because the knowledge of the events is kept
-  in the class rather than in the service definition. This is the reason why
-  Symfony uses subscribers internally;
-* **Listeners are more flexible** because bundles can enable or disable each of
-  them conditionally depending on some configuration value.
diff --git a/reference/constraints/IsFalse.rst b/reference/constraints/IsFalse.rst
@@ -11,7 +11,7 @@ Also see :doc:`IsTrue <IsTrue>`.
 | Applies to     | :ref:`property or method <validation-property-target>`                |
 +----------------+-----------------------------------------------------------------------+
 | Options        | - `message`_                                                          |
-|                | - `payload`_                                                        |
+|                | - `payload`_                                                          |
 +----------------+-----------------------------------------------------------------------+
 | Class          | :class:`Symfony\\Component\\Validator\\Constraints\\IsFalse`          |
 +----------------+-----------------------------------------------------------------------+

diff --git a/reference/constraints/IsNull.rst b/reference/constraints/IsNull.rst
@@ -11,7 +11,7 @@ Also see :doc:`NotNull <NotNull>`.
 | Applies to     | :ref:`property or method <validation-property-target>`                |
 +----------------+-----------------------------------------------------------------------+
 | Options        | - `message`_                                                          |
-|                | - `payload`_                                                        |
+|                | - `payload`_                                                          |
 +----------------+-----------------------------------------------------------------------+
 | Class          | :class:`Symfony\\Component\\Validator\\Constraints\\IsNull`           |
 +----------------+-----------------------------------------------------------------------+