Skip to content

Fixed some code indentation #4659

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.

Sign up for GitHub

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 1 commit into from
Dec 16, 2014
Merged

Fixed some code indentation #4659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cookbook/bundles/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ the library on the `Packagist.org`_ site.

Now that you know the package name, you can install it via Composer:

.. code-block:: bash
.. code-block:: bash

$ php composer.phar require friendsofsymfony/user-bundle
$ php composer.phar require friendsofsymfony/user-bundle

This will choose the best version for your project, add it to ``composer.json``
and download the library into the ``vendor/`` directory. If you need a specific
Expand Down
88 changes: 44 additions & 44 deletions reference/configuration/security.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,20 +419,20 @@ multiple firewalls, the "context" could actually be shared:

.. code-block:: xml

<!-- app/config/security.xml -->
<security:config>
<firewall name="somename" context="my_context">
<! ... ->
</firewall>
<firewall name="othername" context="my_context">
<! ... ->
</firewall>
</security:config>
<!-- app/config/security.xml -->
<security:config>
<firewall name="somename" context="my_context">
<! ... ->
</firewall>
<firewall name="othername" context="my_context">
<! ... ->
</firewall>
</security:config>

.. code-block:: php

// app/config/security.php
$container->loadFromExtension('security', array(
// app/config/security.php
$container->loadFromExtension('security', array(
'firewalls' => array(
'somename' => array(
// ...
Expand All @@ -443,7 +443,7 @@ multiple firewalls, the "context" could actually be shared:
'context' => 'my_context'
),
),
));
));

HTTP-Digest Authentication
--------------------------
Expand All @@ -452,38 +452,38 @@ To use HTTP-Digest authentication you need to provide a realm and a key:

.. configuration-block::

.. code-block:: yaml

# app/config/security.yml
security:
firewalls:
somename:
http_digest:
key: "a_random_string"
realm: "secure-api"

.. code-block:: xml

<!-- app/config/security.xml -->
<security:config>
<firewall name="somename">
<http-digest key="a_random_string" realm="secure-api" />
</firewall>
</security:config>

.. code-block:: php

// app/config/security.php
$container->loadFromExtension('security', array(
'firewalls' => array(
'somename' => array(
'http_digest' => array(
'key' => 'a_random_string',
'realm' => 'secure-api',
),
),
),
));
.. code-block:: yaml

# app/config/security.yml
security:
firewalls:
somename:
http_digest:
key: "a_random_string"
realm: "secure-api"

.. code-block:: xml

<!-- app/config/security.xml -->
<security:config>
<firewall name="somename">
<http-digest key="a_random_string" realm="secure-api" />
</firewall>
</security:config>

.. code-block:: php

// app/config/security.php
$container->loadFromExtension('security', array(
'firewalls' => array(
'somename' => array(
'http_digest' => array(
'key' => 'a_random_string',
'realm' => 'secure-api',
),
),
),
));

.. _`PBKDF2`: http://en.wikipedia.org/wiki/PBKDF2
.. _`ircmaxell/password-compat`: https://packagist.org/packages/ircmaxell/password-compat