10000 Merge branch '2.8' · symfony/symfony-docs@71d51f8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 71d51f8

Browse files
xabbuhxabbuh
committed
Merge branch '2.8'
2 parents b785d35 + f4ba8f1 commit 71d51f8

File tree

4 files changed

+26
-10
lines changed
  • cookbook
    • configuration
  • event_dispatcher
  • reference/constraints

    • 4 files changed

    +26
    -10
    lines changed

    ‎cookbook/configuration/web_server_configuration.rst

    Lines changed: 18 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -268,14 +268,30 @@ The **minimum configuration** to get your application running under Nginx is:
    268268
    fastcgi_pass unix:/var/run/php5-fpm.sock;
    269269
    fastcgi_split_path_info ^(.+\.php)(/.*)$;
    270270
    include fastcgi_params;
    271-
    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
    271+
    # When you are using symlinks to link the document root to the
    272+
    # current version of your application, you should pass the real
    273+
    # application path instead of the path to the symlink to PHP
    274+
    # FPM.
    275+
    # Otherwise, PHP's OPcache may not properly detect changes to
    276+
    # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
    277+
    # for more information).
    278+
    fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
    279+
    fastcgi_param DOCUMENT_ROOT $realpath_root;
    272280
    }
    273281
    # PROD
    274282
    location ~ ^/app\.php(/|$) {
    275283
    fastcgi_pass unix:/var/run/php5-fpm.sock;
    276284
    fastcgi_split_path_info ^(.+\.php)(/.*)$;
    277285
    include fastcgi_params;
    278-
    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
    286+
    # When you are using symlinks to link the document root to the
    287+
    # current version of your application, you should pass the real
    288+
    # application path instead of the path to the symlink to PHP
    289+
    # FPM.
    290+
    # Otherwise, PHP's OPcache may not properly detect changes to
    291+
    # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
    292+
    # for more information).
    293+
    fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
    294+
    fastcgi_param DOCUMENT_ROOT $realpath_root;
    279295
    # Prevents URIs that include the front controller. This will 404:
    280296
    # http://domain.tld/app.php/some-path
    281297
    # Remove the internal directive to allow URIs like this

    ‎cookbook/event_dispatcher/event_listener.rst

    Lines changed: 6 additions & 6 deletions
    Original file line numberDiff line numberDiff line change
    @@ -255,6 +255,12 @@ Listeners and subscribers can be used in the same application indistinctly. The
    255255
    decision to use either of them is usually a matter of personal taste. However,
    256256
    there are some minor advantages for each of them:
    257257

    258+
    * **Subscribers are easier to reuse** because the knowledge of the events is kept
    259+
    in the class rather than in the service definition. This is the reason why
    260+
    Symfony uses subscribers internally;
    261+
    * **Listeners are more flexible** because bundles can enable or disable each of
    262+
    them conditionally depending on some configuration value.
    263+
    258264
    Debugging Event Listeners
    259265
    -------------------------
    260266

    @@ -274,9 +280,3 @@ its name:
    274280
    .. code-block:: bash
    275281
    276282
    $ php app/console debug:event-dispatcher kernel.exception
    277-
    =======
    278-
    * **Subscribers are easier to reuse** because the knowledge of the events is kept
    279-
    in the class rather than in the service definition. This is the reason why
    280-
    Symfony uses subscribers internally;
    281-
    * **Listeners are more flexible** because bundles can enable or disable each of
    282-
    them conditionally depending on some configuration value.

    ‎reference/constraints/IsFalse.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,7 @@ Also see :doc:`IsTrue <IsTrue>`.
    1111
    | Applies to | :ref:`property or method <validation-property-target>` |
    1212
    +----------------+-----------------------------------------------------------------------+
    1313
    | Options | - `message`_ |
    14-
    | | - `payload`_ |
    14+
    | | - `payload`_ |
    1515
    +----------------+-----------------------------------------------------------------------+
    1616
    | Class | :class:`Symfony\\Component\\Validator\\Constraints\\IsFalse` |
    1717
    +----------------+-----------------------------------------------------------------------+

    ‎reference/constraints/IsNull.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,7 @@ Also see :doc:`NotNull <NotNull>`.
    1111
    | Applies to | :ref:`property or method <validation-property-target>` |
    1212
    +----------------+-----------------------------------------------------------------------+
    1313
    | Options | - `message`_ |
    14-
    | | - `payload`_ |
    14+
    | | - `payload`_ |
    1515
    +----------------+-----------------------------------------------------------------------+
    1616
    | Class | :class:`Symfony\\Component\\Validator\\Constraints\\IsNull` |
    1717
    +----------------+-----------------------------------------------------------------------+

    0 commit comments

    Comments
     (0)
    0