Skip to content

use consistent placeholder comments in yaml, php and xml #11197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion create_framework/http_kernel_httpkernelinterface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ PHP; it implements ``HttpKernelInterface`` and wraps another

// example.com/web/front.php

// ..
// ...

$framework = new Simplex\Framework($dispatcher, $matcher, $controllerResolver, $argumentResolver);
$framework = new HttpKernel\HttpCache\HttpCache(
Expand Down
8 changes: 4 additions & 4 deletions deployment/fortrabbit.rst
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ Make sure this file is imported into the main config file:
- { resource: config.yml }
- { resource: config_prod_secrets.php }

# ..
# ...
framework:
session:
# set handler_id to null to use default session handler from php.ini (memcached)
handler_id: ~
# ..
# ...

.. code-block:: xml

Expand All @@ -148,9 +148,9 @@ Make sure this file is imported into the main config file:
<import resource="config_prod_secrets.php"/>
</imports>

<!-- .. -->
<!-- ... -->
<framework:config>
<!-- .. -->
<!-- ... -->
<framework:session handler-id="null"/>
</framework:config>
</container>
Expand Down
2 changes: 1 addition & 1 deletion routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ This happens when your controller method has an argument (e.g. ``$slug``)::

public function showAction($slug)
{
// ..
// ...
}

But your route path does *not* have a ``{slug}`` wildcard (e.g. it is ``/blog/show``).
Expand Down
2 changes: 1 addition & 1 deletion security/api_key_authentication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ configuration or set it to ``false``:

// app/config/security.php

// ..
// ...
$container->loadFromExtension('security', [
'firewalls' => [
'secured_area' => [
Expand Down
2 changes: 1 addition & 1 deletion security/guard_authentication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ Finally, configure your ``firewalls`` key in ``security.yml`` to use this authen

// app/config/security.php

// ..
// ...
use AppBundle\Security\TokenAuthenticator;

$container->loadFromExtension('security', [
Expand Down