8000 Merge branch '2.7' into 2.8 · symfony/symfony-docs@e70927f · GitHub
[go: up one dir, main page]
Skip to content

Commit e70927f

Browse files
wouterjwouterj
committed
Merge branch '2.7' into 2.8
2 parents 15a5718 + 3b433e9 commit e70927f

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
lines changed

‎bundles/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bundle configuration would look like:
8888
http://symfony.com/schema/dic/services/services-1.0.xsd">
8989
9090
<acme-social:config>
91-
<twitter client-id="123" client-secret="your_secret" />
91+
<acme-social:twitter client-id="123" client-secret="your_secret" />
9292
</acme-social:config>
9393
9494
<!-- ... -->

‎components/console/helpers/formatterhelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Formatter Helper
55
================
66

7-
The Formatter helpers provides functions to format the output with colors.
7+
The Formatter helper provides functions to format the output with colors.
88
You can do more advanced things with this helper than you can in
99
:doc:`/console/coloring`.
1010

‎components/event_dispatcher.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ the ``Event`` object as the single argument::
182182
}
183183
}
184184

185-
The ``$event`` argument is the event class that was passed when dispatching the
185+
The ``$event`` argument is the event object that was passed when dispatching the
186186
event. In many cases, a special event subclass is passed with extra
187187
information. You can check the documentation or implementation of each event to
188188
determine which instance is passed.

‎components/phpunit_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You can install the component in 2 different ways:
3939
Usage
4040
-----
4141

42-
Once the component installed, it automatically registers a
42+
Once the component is installed, it automatically registers a
4343
`PHPUnit event listener`_ which in turn registers a `PHP error handler`_
4444
called :class:`Symfony\\Bridge\\PhpUnit\\DeprecationErrorHandler`. After
4545
running your PHPUnit tests, you will get a report similar to this one:

‎components/security/authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ password was valid::
140140
)
141141
);
142142

143-
// for some extra checks: is account enabled, locked, expired, etc.?
143+
// for some extra checks: is account enabled, locked, expired, etc.
144144
$userChecker = new UserChecker();
145145

146146
// an array of password encoders (see below)

‎configuration/environments.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ behavior:
235235
# 'test' environment and debug disabled
236236
$ php app/console command_name --env=test --no-debug
237237
238-
In addition to the ``--env`` and ``--debug`` options, the behavior of Symfony
238+
In addition to the ``--env`` and ``--no-debug`` options, the behavior of Symfony
239239
commands can also be controlled with environment variables. The Symfony console
240240
application checks the existence and value of these environment vari 8000 ables before
241241
executing any command:

‎event_dispatcher/before_after_filters.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Creating an Event Listener
101101
~~~~~~~~~~~~~~~~~~~~~~~~~~
102102

103103
Next, you'll need to create an event listener, which will hold the logic
104-
that you want executed before your controllers. If you're not familiar with
104+
that you want to be executed before your controllers. If you're not familiar with
105105
event listeners, you can learn more about them at :doc:`/event_dispatcher`::
106106

107107
// src/AppBundle/EventListener/TokenListener.php

‎form/dynamic_form_modification.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ and fill in the listener logic::
303303

304304
$formOptions = array(
305305
'class' => User::class,
306-
'property' => 'fullName',
306+
'choice_label' => 'fullName',
307307
'query_builder' => function (EntityRepository $er) use ($user) {
308308
// build a custom query
309309
// return $er->createQueryBuilder('u')->addOrderBy('fullName', 'DESC');

0 commit comments

Comments
 (0)
0