Skip to content

Commit 98e65bf

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: Update custom_provider.rst [#6892] The provider is called `memory` Fix typos Update templating.rst Update templating.rst Adds bin folder creation instruction service_container : fix php Definition instance [Routing] Fix a route path in a routing example Minor unrelated spacing fixes Update doctrine.rst
2 parents d63a2f2 + 563bab8 commit 98e65bf

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

Diff for: doctrine/associations.rst

+11-5
Original file line numberDiff line numberDiff line change
@@ -168,20 +168,25 @@ own a collection of its related ``Product`` objects.
168168

169169
.. note::
170170

171-
The code in the constructor is important. Rather than being instantiated
171+
The code in the constructor is important. Rather than being instantiated
172172
as a traditional ``array``, the ``$products`` property must be of a type
173173
that implements Doctrine's ``Collection`` interface. In this case, an
174174
``ArrayCollection`` object is used. This object looks and acts almost
175175
*exactly* like an array, but has some added flexibility. If this makes
176176
you uncomfortable, don't worry. Just imagine that it's an ``array``
177177
and you'll be in good shape.
178178

179+
.. seealso::
180+
181+
To understand ``inversedBy`` and ``mappedBy`` usage, see Doctrine's
182+
`Association Updates` documentation.
183+
179184
.. tip::
180185

181-
The targetEntity value in the metadata used above can reference any entity
182-
with a valid namespace, not just entities defined in the same namespace. To
183-
relate to an entity defined in a different class or bundle, enter a full
184-
namespace as the targetEntity.
186+
The targetEntity value in the metadata used above can reference any entity
187+
with a valid namespace, not just entities defined in the same namespace. To
188+
relate to an entity defined in a different class or bundle, enter a full
189+
namespace as the targetEntity.
185190

186191
Now that you've added new properties to both the ``Product`` and ``Category``
187192
classes, tell Doctrine to generate the missing getter and setter methods for you:
@@ -407,3 +412,4 @@ Doctrine's `Association Mapping Documentation`_.
407412
statement, which *imports* the ``ORM`` annotations prefix.
408413

409414
.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/association-mapping.html
415+
.. _`Association Updates`: http://docs.doctrine-project.org/en/latest/reference/unitofwork-associations.html

Diff for: routing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ By adding a *default* value:
333333
334334
return $collection;
335335
336-
Now, when the user goes to ``/page``, the ``blog_list`` route will match and ``$page``
336+
Now, when the user goes to ``/blog``, the ``blog_list`` route will match and ``$page``
337337
will default to a value of ``1``.
338338

339339
.. index::

Diff for: security/custom_provider.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ When a user submits a username and password, the authentication layer asks
99
the configured user provider to return a user object for a given username.
1010
Symfony then checks whether the password of this user is correct and generates
1111
a security token so the user stays authenticated during the current session.
12-
Out of the box, Symfony has four user providers: ``in_memory``, ``entity``,
12+
Out of the box, Symfony has four user providers: ``memory``, ``entity``,
1313
``ldap`` and ``chain``. In this entry you'll see how you can create your
1414
own user provider, which could be useful if your users are accessed via a
1515
custom database, a file, or - as shown in this example - a web service.

Diff for: service_container/factories.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ configure the service container to use the
8888
8989
$container->register('app.newsletter_manager_factory', 'AppBundle\Email\NewsletterManagerFactory');
9090
91-
$newsletterManager = new Definition();
91+
$newsletterManager = new Definition('AppBundle\Email\NewsletterManager');
9292
9393
// call a method on the specified service
9494
$newsletterManager->setFactory(array(

Diff for: setup.rst

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ executable that needs to be installed on your system only once:
2222
.. code-block:: bash
2323
2424
# Linux and macOS systems
25+
$ sudo mkdir -p /usr/local/bin
2526
$ sudo curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony
2627
$ sudo chmod a+x /usr/local/bin/symfony
2728

Diff for: templating.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ with alternating ``odd``, ``even`` classes:
108108

109109
.. code-block:: html+twig
110110

111-
{% for i in 0..10 %}
111+
{% for i in 1..10 %}
112112
<div class="{{ cycle(['odd', 'even'], i) }}">
113113
<!-- some HTML here -->
114114
</div>

0 commit comments

Comments
 (0)