Skip to content

Commit cdb1c3c

Browse files
committed
minor #11568 Removed more belittling words and expressions (javiereguiluz)
This PR was squashed before being merged into the 3.4 branch (closes #11568). Discussion ---------- Removed more belittling words and expressions Commits ------- cc9d8ec Removed more belittling words and expressions
2 parents c2247ed + cc9d8ec commit cdb1c3c

File tree

83 files changed

+186
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+186
-194
lines changed

_build/maintainer_guide.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ Step 2: Merge the pull request
120120
Never use GitHub's web interface (or desktop clients) to merge PRs or to solve
121121
merge conflicts. Always use the ``gh`` tool for anything related to merges.
122122

123-
We require 2 approval votes from team members before merging a PR, except if
124-
it's a typo, a small change or an obvious error.
123+
We require two approval votes from team members before merging a PR, except if
124+
it's a typo, a small change or clearly an error.
125125

126126
If a PR contains lots of commits, there's no need to ask the contributor to
127127
squash them. The ``gh`` tool does that automatically. The only exceptions are

best_practices/business-logic.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ distributed among developers, with a slight preference towards YAML.
148148
Both formats have the same performance, so this is ultimately a matter of
149149
personal taste.
150150

151-
We recommend YAML because it's friendly to newcomers and concise. You can
152-
of course use whatever format you like.
151+
We recommend YAML because it's friendly to newcomers and concise, but you can
152+
use whatever format you like.
153153

154154
Service: No Class Parameter
155155
---------------------------
@@ -218,8 +218,7 @@ The three entities defined by our sample blog application are a good example:
218218
219219
.. tip::
220220

221-
If you're more advanced, you can of course store them under your own
222-
namespace in ``src/``.
221+
If you're more advanced, you can store them under your own namespace in ``src/``.
223222

224223
Doctrine Mapping Information
225224
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

best_practices/configuration.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ Constants can be used for example in your Twig templates thanks to the
132132
Displaying the {{ constant('NUMBER_OF_ITEMS', post) }} most recent results.
133133
</p>
134134

135-
And Doctrine entities and repositories can now easily access these values,
136-
whereas they cannot access the container parameters::
135+
And Doctrine entities and repositories can access these values too, whereas they
136+
cannot access the container parameters::
137137

138138
namespace AppBundle\Repository;
139139

@@ -149,7 +149,7 @@ whereas they cannot access the container parameters::
149149
}
150150

151151
The only notable disadvantage of using constants for this kind of configuration
152-
values is that you cannot redefine them easily in your tests.
152+
values is that it's complicated to redefine their values in your tests.
153153

154154
Parameter Naming
155155
----------------

best_practices/controllers.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ The ``@Template`` annotation is useful, but also involves some magic. We
8080
don't think its benefit is worth the magic, and so recommend against using
8181
it.
8282

83-
Most of the time, ``@Template`` is used without any parameters, which makes
84-
it more difficult to know which template is being rendered. It also makes
85-
it less obvious to beginners that a controller should always return a Response
86-
object (unless you're using a view layer).
83+
Most of the time, ``@Template`` is used without any parameters, which makes it
84+
more difficult to know which template is being rendered. It also hides the fact
85+
that a controller should always return a Response object (unless you're using a
86+
view layer).
8787

8888
What does the Controller look like
8989
----------------------------------

best_practices/introduction.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@ of these best practices. But by following these, you'll be able to develop
4747
applications faster, with less complexity and with the same or even higher
4848
quality. It's also a moving target that will continue to improve.
4949

50-
Keep in mind that these are **optional recommendations** that you and your
51-
team may or may not follow to develop Symfony applications. If you want to
52-
continue using your own best practices and methodologies, you can of course
53-
do it. Symfony is flexible enough to adapt to your needs. That will never
54-
change.
50+
Keep in mind that these are **optional recommendations** that you and your team
51+
may or may not follow to develop Symfony applications. If you want to continue
52+
using your own best practices and methodologies, you can do it. Symfony is
53+
flexible enough to adapt to your needs. That will never change.
5554

5655
Who this Book Is for (Hint: It's not a Tutorial)
5756
------------------------------------------------

best_practices/security.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ primarily under the ``firewalls`` key.
1919
API only), we recommend having only *one* firewall entry with the ``anonymous``
2020
key enabled.
2121

22-
Most applications only have one authentication system and one set of users.
23-
For this reason, you only need *one* firewall entry. There are exceptions
24-
of course, especially if you have separated web and API sections on your
25-
site. But the point is to keep things simple.
22+
Most applications only have one authentication system and one set of users. For
23+
this reason, you only need *one* firewall entry. If you have separated web and
24+
API sections on your site, you will need more firewall entries. But the point is
25+
to keep things simple.
2626

2727
Additionally, you should use the ``anonymous`` key under your firewall. If
2828
you need to require users to be logged in for different sections of your

best_practices/tests.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ The built-in functional testing client is great, but it can't be used to
104104
test any JavaScript behavior on your pages. If you need to test this, consider
105105
using the `Mink`_ library from within PHPUnit.
106106

107-
Of course, if you have a heavy JavaScript frontend, you should consider using
108-
pure JavaScript-based testing tools.
107+
If you have a heavy JavaScript frontend, you should consider using pure
108+
JavaScript-based testing tools.
109109

110110
Learn More about Functional Tests
111111
---------------------------------

components/console/single_command_tool.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The method :method:`Symfony\\Component\\Console\\Application::setDefaultCommand`
3333
accepts a boolean as second parameter. If true, the command ``echo`` will then
3434
always be used, without having to pass its name.
3535

36-
Of course, you can still register a command as usual::
36+
You can still register a command as usual::
3737

3838
#!/usr/bin/env php
3939
<?php

components/dom_crawler.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The :class:`Symfony\\Component\\DomCrawler\\Crawler` class provides methods
3434
to query and manipulate HTML and XML documents.
3535

3636
An instance of the Crawler represents a set of :phpclass:`DOMElement` objects,
37-
which are basically nodes that you can traverse easily::
37+
which are nodes that can be traversed as follows::
3838

3939
use Symfony\Component\DomCrawler\Crawler;
4040

components/expression_language/extending.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ or by using the second argument of the constructor::
131131
{
132132
public function __construct(ParserCacheInterface $parser = null, array $providers = [])
133133
{
134-
// prepends the default provider to let users override it easily
134+
// prepends the default provider to let users override it
135135
array_unshift($providers, new StringExpressionLanguageProvider());
136136

137137
parent::__construct($parser, $providers);

0 commit comments

Comments
 (0)