8000 Merge branch 'more_fixes' of github.com:bicpi/symfony-docs into bicpi… · symfony/symfony-docs@d889519 · GitHub
[go: up one dir, main page]
Skip to content

Commit d889519

Browse files
weaverryanweaverryan
committed
Merge branch 'more_fixes' of github.com:bicpi/symfony-docs into bicpi-more_fixes
Conflicts: cookbook/configuration/pdo_session_storage.rst
2 parents 5be1895 + 4c14bdb commit d889519

13 files changed

+27
-24
lines changed

‎cookbook/configuration/pdo_session_storage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ configuration format of your choice):
1616

1717
.. versionadded:: 2.1
1818
In Symfony 2.1 the class and namespace are slightly modified. You can now
19-
find the session storage classes in the `Session\\Storage` namespace:
19+
find the session storage classes in the ``Session\Storage`` namespace:
2020
``Symfony\Component\HttpFoundation\Session\Storage``. Also
2121
note that in Symfony 2.1 you should configure ``handler_id`` not ``storage_id`` like in Symfony 2.0.
2222
Below, you'll notice that ``%session.storage.options%`` is not used anymore.

‎cookbook/form/dynamic_form_modification.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ it with :ref:`dic-tags-form-type`.
348348
services:
349349
acme.form.friend_message:
350350
class: Acme\DemoBundle\Form\Type\FriendMessageFormType
351-
arguments: [@security.context]
351+
arguments: ["@security.context"]
352352
tags:
353353
-
354354
name: form.type

‎cookbook/profiler/matchers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Then, you need to configure the service:
101101
services:
102102
acme_demo.profiler.matcher.super_admin:
103103
class: "%acme_demo.profiler.matcher.super_admin.class%"
104-
arguments: [@security.context]
104+
arguments: ["@security.context"]
105105
106106
.. code-block:: xml
107107

‎cookbook/security/acl_advanced.rst

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ tables are ordered from least rows to most rows in a typical application:
5353

5454
- *acl_security_identities*: This table records all security identities (SID)
5555
which hold ACEs. The default implementation ships with two security
56-
identities: ``RoleSecurityIdentity``, and ``UserSecurityIdentity``
57-
- *acl_classes*: This table maps class names to a unique id which can be
56+
identities:
57+
:class:`Symfony\\Component\\Security\\Acl\\Domain\\RoleSecurityIdentity` and
58+
:class:`Symfony\\Component\\Security\\Acl\\Domain\\UserSecurityIdentity`.
59+
- *acl_classes*: This table maps class names to a unique ID which can be
5860
referenced from other tables.
5961
- *acl_object_identities*: Each row in this table represents a single domain
6062
object instance.
@@ -173,12 +175,13 @@ Process for Reaching Authorization Decisions
173175
The ACL class provides two methods for determining whether a security identity
174176
has the required bitmasks, ``isGranted`` and ``isFieldGranted``. When the ACL
175177
receives an authorization request through one of these methods, it delegates
176-
this request to an implementation of PermissionGrantingStrategy. This allows
177-
you to replace the way access decisions are reached without actually modifying
178-
the ACL class itself.
178+
this request to an implementation of
179+
:class:`Symfony\\Component\\Security\\Acl\\Domain\\PermissionGrantingStrategy`.
180+
This allows you to replace the way access decisions are reached without actually
181+
modifying the ACL class itself.
179182

180-
The PermissionGrantingStrategy first checks all your object-scope ACEs if none
181-
is applicable, the class-scope ACEs will be checked, if none is applicable,
183+
The ``PermissionGrantingStrategy`` first checks all your object-scope ACEs. If none
184+
is applicable, the class-scope ACEs will be checked. If none is applicable,
182185
then the process will be repeated with the ACEs of the parent ACL. If no
183186
parent ACL exists, an exception will be thrown.
184187

‎cookbook/security/custom_authentication_provider.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ The Factory
281281

282282
You have created a custom token, custom listener, and custom provider. Now
283283
you need to tie them all together. How do you make your provider available
284-
to your security configuration? The answer is by using a ``factory``. A factory
284+
to your security configuration? The answer is by using a *factory*. A factory
285285
is where you hook into the Security component, telling it the name of your
286286
provider and any configuration options available for it. First, you must
287287
create a class which implements
@@ -531,7 +531,7 @@ the ``addConfiguration`` method.
531531
}
532532
533533
Now, in the ``create`` method of the factory, the ``$config`` argument will
534-
contain a 'lifetime' key, set to 5 minutes (300 seconds) unless otherwise
534+
contain a ``lifetime`` key, set to 5 minutes (300 seconds) unless otherwise
535535
set in the configuration. Pass this argument to your authentication provider
536536
in order to put it to use.
537537

‎cookbook/security/custom_provider.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ users, e.g. by filling in a login form. You can do this by adding a line to the
280280
281281
The value here should correspond with however the passwords were originally
282282
encoded when creating your users (however those users were created). When
283-
a user submits her password, the password is appended to the salt value and
283+
a user submits her password, the salt value is appended to the password and
284284
then encoded using this algorithm before being compared to the hashed password
285285
returned by your ``getPassword()`` method. Additionally, depending on your
286286
options, the password may be encoded multiple times and encoded to base64.

‎cookbook/security/entity_provider.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ then be checked against your User entity records in the database:
258258
259259
role_hierarchy:
260260
ROLE_ADMIN: ROLE_USER
261-
ROLE_SUPER_ADMIN: [ ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH ]
261+
ROLE_SUPER_ADMIN: [ ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH ]
262262
263263
providers:
264264
administrators:

‎cookbook/security/target_path.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class and override the default method named ``setTargetPath()``.
1919

2020
First, override the ``security.exception_listener.class`` parameter in your
2121
configuration file. This can be done from your main configuration file (in
22-
`app/config`) or from a configuration file being imported from a bundle:
22+
``app/config``) or from a configuration file being imported from a bundle:
2323

2424
.. configuration-block::
2525

‎cookbook/security/voters.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Declaring the Voter as a Service
114114
--------------------------------
115115

116116
To inject the voter into the security layer, you must declare it as a service,
117-
and tag it as a "security.voter":
117+
and tag it as a ``security.voter``:
118118

119119
.. configuration-block::
120120

‎cookbook/session/locale_sticky_session.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ during a user's request. In this article, you'll learn how to make the locale
1010
of a user "sticky" so that once it's set, that same locale will be used for
1111
every subsequent request.
1212

13-
Creating LocaleListener
14-
-----------------------
13+
Creating a LocaleListener
14+
-------------------------
1515

1616
To simulate that the locale is stored in a session, you need to create and
1717
register a :doc:`new event listener </cookbook/service_container/event_listener>`.

‎cookbook/testing/http_authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ key in your firewall, along with the ``form_login`` key:
3333
security:
3434
firewalls:
3535
your_firewall_name:
36-
http_basic:
36+
http_basic: ~
3737
3838
.. code-block:: xml
3939

‎cookbook/testing/insulating_clients.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
How to test the Interaction of several Clients
55
==============================================
66

7-
If you need to simulate an interaction between different Clients (think of a
8-
chat for instance), create several Clients::
7+
If you need to simulate an interaction between different clients (think of a
8+
chat for instance), create several clients::
99

1010
$harry = static::createClient();
1111
$sally = static::createClient();

‎cookbook/testing/simulating_authentication.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ One of the solutions is to configure your firewall to use ``http_basic`` in
1212
the test environment as explained in
1313
:doc:`/cookbook/testing/http_authentication`.
1414
Another way would be to create a token yourself and store it in a session.
15-
While doing this, you have to make sure that appropriate cookie is sent
15+
While doing this, you have to make sure that an appropriate cookie is sent
1616
with a request. The following example demonstrates this technique::
1717

1818
// src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php
@@ -57,5 +57,5 @@ with a request. The following example demonstrates this technique::
5757

5858
.. note::
5959

60-
The technique described in :doc:`/cookbook/testing/http_authentication`.
61-
is cleaner and therefore preferred way.
60+
The technique described in :doc:`/cookbook/testing/http_authentication`
61+
is cleaner and therefore the preferred way.

0 commit comments

Comments
 (0)
0