Skip to content

Commit 0494129

Browse files
committed
minor #4671 consistent spelling (xabbuh)
This PR was merged into the 2.3 branch. Discussion ---------- consistent spelling | Q | A | ------------- | --- | Doc fix? | no | New docs? | no | Applies to | all | Fixed tickets | #3237 - [x] stylesheet - Stylesheet - [x] front-end - frontend - front end - [x] Full-Stack - Full stack - [x] Symfony2 Framework - form framework - Form framework - [x] Save-handler - Save handler - [x] Dependeny Injection Tags - Dependeny Injection Container - dependeny injection container - [x] Event Dispatcher - event dispatcher - [x] Event Subscriber - event subscriber - [x] Symfony2 Standard Distribution - Symfony2 Standard Edition - [x] Console Command - console command - [x] email - Email - e-mail - [x] Boolean - boolean - [x] web debug toolbar - Web Debug Toolbar - [x] Exception - exception - [x] object-oriented - object oriented Commits ------- f182121 uppercase "dependency injection" 6b7d536 use "Symfony Framework" instead of "Symfony framework" 07bc4db use "Form component" instead of "form framework" bd5ca26 use "full-stack" instead of "full stack" 5b6895a unify exception usages b774651 unify event subscriber usages 95c842c use "console command" instead of "Console Command" 9c02eda unify EventDispatcher/event dispatcher usages fd52cd3 use boolean instead of Boolean f8db4b0 use "object-oriented" instead of "object oriented" 1bd33ca "web debug toolbar" instead of "Web Debug Toolbar" b2d802e use "stylesheet" instead of "Stylesheet" 7eb1847 unify "Symfony Standard Edition" usages 85fb0b1 consistency, replace "save-handler" with "save handler" 83238aa consisteny, use "front-end" instead of "frontend" or "front end" 5b8e84d consistency, replace "e-mail" with "email"
2 parents 2edc188 + f182121 commit 0494129

File tree

87 files changed

+207
-200
lines changed

Some content is hidden

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

87 files changed

+207
-200
lines changed

best_practices/introduction.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
The Symfony Framework Best Practices
55
====================================
66

7-
The Symfony framework is well-known for being *really* flexible and is used
7+
The Symfony Framework is well-known for being *really* flexible and is used
88
to build micro-sites, enterprise applications that handle billions of connections
99
and even as the basis for *other* frameworks. Since its release in July 2011,
1010
the community has learned a lot about what's possible and how to do things *best*.
@@ -19,7 +19,7 @@ What is this Guide About?
1919
-------------------------
2020

2121
This guide aims to fix that by describing the **best practices for developing
22-
web apps with the Symfony full-stack framework**. These are best practices that
22+
web apps with the Symfony full-stack Framework**. These are best practices that
2323
fit the philosophy of the framework as envisioned by its original creator
2424
`Fabien Potencier`_.
2525

@@ -32,7 +32,7 @@ fit the philosophy of the framework as envisioned by its original creator
3232

3333
This guide is **specially suited** for:
3434

35-
* Websites and web applications developed with the full-stack Symfony framework.
35+
* Websites and web applications developed with the full-stack Symfony Framework.
3636

3737
For other situations, this guide might be a good **starting point** that you can
3838
then **extend and fit to your specific needs**:
@@ -62,8 +62,8 @@ Symfony to follow everything. If you are totally new to Symfony, welcome!
6262
Start with :doc:`The Quick Tour </quick_tour/the_big_picture>` tutorial first.
6363

6464
We've deliberately kept this guide short. We won't repeat explanations that
65-
you can find in the vast Symfony documentation, like discussions about dependency
66-
injection or front controllers. We'll solely focus on explaining how to do
65+
you can find in the vast Symfony documentation, like discussions about Dependency
66+
Injection or front controllers. We'll solely focus on explaining how to do
6767
what you already know.
6868

6969
The Application

book/doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Databases and Doctrine
66

77
One of the most common and challenging tasks for any application
88
involves persisting and reading information to and from a database. Although
9-
the Symfony full-stack framework doesn't integrate any ORM by default,
9+
the Symfony full-stack Framework doesn't integrate any ORM by default,
1010
the Symfony Standard Edition, which is the most widely used distribution,
1111
comes integrated with `Doctrine`_, a library whose sole goal is to give
1212
you powerful tools to make this easy. In this chapter, you'll learn the

book/forms.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ it into a format that's suitable for being rendered in an HTML form.
198198
``task`` property via the ``getTask()`` and ``setTask()`` methods on the
199199
``Task`` class. Unless a property is public, it *must* have a "getter" and
200200
"setter" method so that the Form component can get and put data onto the
201-
property. For a Boolean property, you can use an "isser" or "hasser" method
201+
property. For a boolean property, you can use an "isser" or "hasser" method
202202
(e.g. ``isPublished()`` or ``hasReminder()``) instead of a getter (e.g.
203203
``getPublished()`` or ``getReminder()``).
204204

@@ -1526,7 +1526,7 @@ file, you can see every block needed to render a form and every default field
15261526
type.
15271527

15281528
In PHP, the fragments are individual template files. By default they are located in
1529-
the `Resources/views/Form` directory of the framework bundle (`view on GitHub`_).
1529+
the ``Resources/views/Form`` directory of the FrameworkBundle (`view on GitHub`_).
15301530

15311531
Each fragment name follows the same basic pattern and is broken up into two pieces,
15321532
separated by a single underscore character (``_``). A few examples are:
@@ -1867,7 +1867,7 @@ an array.
18671867

18681868
Be advised, however, that in most cases using the ``getData()`` method is
18691869
a better choice, since it returns the data (usually an object) after
1870-
it's been transformed by the form framework.
1870+
it's been transformed by the Form component.
18711871

18721872
Adding Validation
18731873
~~~~~~~~~~~~~~~~~

book/http_fundamentals.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ the user is connecting via a secured connection (i.e. HTTPS).
266266

267267
The Request class also has a public ``attributes`` property, which holds
268268
special data related to how the application works internally. For the
269-
Symfony framework, the ``attributes`` holds the values returned by the
269+
Symfony Framework, the ``attributes`` holds the values returned by the
270270
matched route, like ``_controller``, ``id`` (if you have an ``{id}``
271271
wildcard), and even the name of the matched route (``_route``). The
272272
``attributes`` property exists entirely to be a place where you can
@@ -500,7 +500,7 @@ emails, validating user input and handling security.
500500
The good news is that none of these problems is unique. Symfony provides
501501
a framework full of tools that allow you to build your application, not your
502502
tools. With Symfony, nothing is imposed on you: you're free to use the full
503-
Symfony framework, or just one piece of Symfony all by itself.
503+
Symfony Framework, or just one piece of Symfony all by itself.
504504

505505
.. index::
506506
single: Symfony Components
@@ -542,9 +542,9 @@ regardless of how your project is developed. To name a few:
542542
:doc:`Translation </components/translation/introduction>`
543543
A framework for translating strings in your application.
544544

545-
Each one of these components is decoupled and can be used in *any*
546-
PHP project, regardless of whether or not you use the Symfony framework.
547-
Every part is made to be used if needed and replaced when necessary.
545+
Each one of these components is decoupled and can be used in *any* PHP project,
546+
regardless of whether or not you use the Symfony Framework. Every part is
547+
made to be used if needed and replaced when necessary.
548548

549549
.. _the-full-solution-the-symfony2-framework:
550550

book/installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ you can create Symfony applications using the alternative installation method
126126
based on `Composer`_.
127127

128128
Composer is the dependency manager used by modern PHP applications and it can
129-
also be used to create new applications based on the Symfony framework. If you
129+
also be used to create new applications based on the Symfony Framework. If you
130130
don't have installed it globally, start by reading the next section.
131131

132132
Installing Composer Globally
@@ -321,7 +321,7 @@ applications:
321321
* The `Symfony CMF Standard Edition`_ is the best distribution to get started
322322
with the `Symfony CMF`_ project, which is a project that makes it easier for
323323
developers to add CMS functionality to applications built with the Symfony
324-
framework.
324+
Framework.
325325
* The `Symfony REST Edition`_ shows how to build an application that provides a
326326
RESTful API using the FOSRestBundle and several other related bundles.
327327

book/internals.rst

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ On top of HttpFoundation is the :namespace:`Symfony\\Component\\HttpKernel`
5555
component. HttpKernel handles the dynamic part of HTTP; it is a thin wrapper
5656
on top of the Request and Response classes to standardize the way requests are
5757
handled. It also provides extension points and tools that makes it the ideal
58-
starting point to create a Web framework without too much overhead.
58+
starting point to create a web framework without too much overhead.
5959

6060
It also optionally adds configurability and extensibility, thanks to the
6161
DependencyInjection component and a powerful plugin system (bundles).
@@ -177,12 +177,12 @@ Event):
177177
#. Listeners of the ``kernel.terminate`` event can perform tasks after the
178178
Response has been served.
179179

180-
If an Exception is thrown during processing, the ``kernel.exception`` is
181-
notified and listeners are given a chance to convert the Exception to a
180+
If an exception is thrown during processing, the ``kernel.exception`` is
181+
notified and listeners are given a chance to convert the exception into a
182182
Response. If that works, the ``kernel.response`` event is notified; if not, the
183183
Exception is re-thrown.
184184

185-
If you don't want Exceptions to be caught (for embedded requests for
185+
If you don't want exceptions to be caught (for embedded requests for
186186
instance), disable the ``kernel.exception`` event by passing ``false`` as the
187187
third argument to the ``handle()`` method.
188188

@@ -238,8 +238,8 @@ add the following code at the beginning of your listener method::
238238

239239
.. tip::
240240

241-
If you are not yet familiar with the Symfony EventDispatcher, read the
242-
:doc:`EventDispatcher component documentation </components/event_dispatcher/introduction>`
241+
If you are not yet familiar with the Symfony EventDispatcher component,
242+
read :doc:`its documentation </components/event_dispatcher/introduction>`
243243
section first.
244244

245245
.. index::
@@ -351,7 +351,7 @@ The FrameworkBundle registers several listeners:
351351
Collects data for the current request.
352352

353353
:class:`Symfony\\Bundle\\WebProfilerBundle\\EventListener\\WebDebugToolbarListener`
354-
Injects the Web Debug Toolbar.
354+
Injects the web debug toolbar.
355355

356356
:class:`Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener`
357357
Fixes the Response ``Content-Type`` based on the request format.
@@ -396,7 +396,7 @@ forwards the ``Request`` to a given Controller (the value of the
396396
``class::method`` notation).
397397

398398
A listener on this event can create and set a ``Response`` object, create
399-
and set a new ``Exception`` object, or do nothing::
399+
and set a new ``Exception`` object or do nothing::
400400

401401
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
402402
use Symfony\Component\HttpFoundation\Response;
@@ -433,8 +433,10 @@ and set a new ``Exception`` object, or do nothing::
433433
.. index::
434434
single: EventDispatcher
435435

436-
The EventDispatcher
437-
-------------------
436+
.. _the-eventdispatcher:
437+
438+
The EventDispatcher Component
439+
-----------------------------
438440

439441
The EventDispatcher is a standalone component that is responsible for much
440442
of the underlying logic and flow behind a Symfony request. For more information,
@@ -455,7 +457,7 @@ enhance performance; use it in the production environment to explore problems
455457
after the fact.
456458

457459
You rarely have to deal with the profiler directly as Symfony provides
458-
visualizer tools like the Web Debug Toolbar and the Web Profiler. If you use
460+
visualizer tools like the web debug toolbar and the web profiler. If you use
459461
the Symfony Standard Edition, the profiler, the web debug toolbar, and the
460462
web profiler are all already configured with sensible settings.
461463

@@ -481,7 +483,7 @@ bottom of all pages. It displays a good summary of the profiling data that
481483
gives you instant access to a lot of useful information when something does
482484
not work as expected.
483485

484-
If the summary provided by the Web Debug Toolbar is not enough, click on the
486+
If the summary provided by the web debug toolbar is not enough, click on the
485487
token link (a string made of 13 random characters) to access the Web Profiler.
486488

487489
.. note::

book/page_creation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ of the most common elements of a bundle:
763763
Contains the controllers of the bundle (e.g. ``RandomController.php``).
764764

765765
``DependencyInjection/``
766-
Holds certain dependency injection extension classes, which may import service
766+
Holds certain Dependency Injection Extension classes, which may import service
767767
configuration, register compiler passes or more (this directory is not
768768
necessary).
769769

@@ -1082,7 +1082,7 @@ in mind:
10821082
and ``vendor/`` (third-party code) (there's also a ``bin/`` directory that's
10831083
used to help updated vendor libraries);
10841084

1085-
* Each feature in Symfony (including the Symfony framework core) is organized
1085+
* Each feature in Symfony (including the Symfony Framework core) is organized
10861086
into a *bundle*, which is a structured set of files for that feature;
10871087

10881088
* The **configuration** for each bundle lives in the ``Resources/config``

book/performance.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ your ``php.ini`` configuration.
4646
Use Composer's Class Map Functionality
4747
--------------------------------------
4848

49-
By default, the Symfony standard edition uses Composer's autoloader
49+
By default, the Symfony Standard Edition uses Composer's autoloader
5050
in the `autoload.php`_ file. This autoloader is easy to use, as it will
5151
automatically find any new classes that you've placed in the registered
5252
directories.

book/propel.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ from cheapest to most expensive. From inside a controller, do the following::
288288
->orderByPrice()
289289
->find();
290290

291-
In one line, you get your products in a powerful oriented object way. No need
292-
to waste your time with SQL or whatever, Symfony offers fully object oriented
291+
In one line, you get your products in a powerful object-oriented way. No need
292+
to waste your time with SQL or whatever, Symfony offers fully object-oriented
293293
programming and Propel respects the same philosophy by providing an awesome
294294
abstraction layer.
295295

book/routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ In an upcoming section, you'll learn how to generate URLs from inside templates.
14191419

14201420
.. tip::
14211421

1422-
If the frontend of your application uses Ajax requests, you might want
1422+
If the front-end of your application uses Ajax requests, you might want
14231423
to be able to generate URLs in JavaScript based on your routing configuration.
14241424
By using the `FOSJsRoutingBundle`_, you can do exactly that:
14251425

book/service_container.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ In other words, a service container extension configures the services for
461461
a bundle on your behalf. And as you'll see in a moment, the extension provides
462462
a sensible, high-level interface for configuring the bundle.
463463

464-
Take the FrameworkBundle - the core Symfony framework bundle - as an
464+
Take the FrameworkBundle - the core Symfony Framework bundle - as an
465465
example. The presence of the following code in your application configuration
466466
invokes the service container extension inside the FrameworkBundle:
467467

@@ -516,7 +516,7 @@ can handle the ``framework`` configuration directive. The extension in question,
516516
which lives in the FrameworkBundle, is invoked and the service configuration
517517
for the FrameworkBundle is loaded. If you remove the ``framework`` key
518518
from your application configuration file entirely, the core Symfony services
519-
won't be loaded. The point is that you're in control: the Symfony framework
519+
won't be loaded. The point is that you're in control: the Symfony Framework
520520
doesn't contain any magic or perform any actions that you don't have control
521521
over.
522522

book/templating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ subdirectory.
13451345
Overriding Core Templates
13461346
~~~~~~~~~~~~~~~~~~~~~~~~~
13471347

1348-
Since the Symfony framework itself is just a bundle, core templates can be
1348+
Since the Symfony Framework itself is just a bundle, core templates can be
13491349
overridden in the same way. For example, the core TwigBundle contains
13501350
a number of different "exception" and "error" templates that can be overridden
13511351
by copying each from the ``Resources/views/Exception`` directory of the

book/testing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,8 @@ Accessing the Container
455455

456456
It's highly recommended that a functional test only tests the Response. But
457457
under certain very rare circumstances, you might want to access some internal
458-
objects to write assertions. In such cases, you can access the dependency
459-
injection container::
458+
objects to write assertions. In such cases, you can access the Dependency
459+
Injection Container::
460460

461461
$container = $client->getContainer();
462462

book/translation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ into the language of the user::
2727
*country* code (e.g. ``fr_FR`` for French/France) is recommended.
2828

2929
In this chapter, you'll learn how to use the Translation component in the
30-
Symfony framework. You can read the
30+
Symfony Framework. You can read the
3131
:doc:`Translation component documentation </components/translation/usage>`
3232
to learn even more. Overall, the process has several steps:
3333

@@ -573,7 +573,7 @@ the framework:
573573
Translating Constraint Messages
574574
-------------------------------
575575

576-
If you're using validation constraints with the form framework, then translating
576+
If you're using validation constraints with the Form component, then translating
577577
the error messages is easy: simply create a translation resource for the
578578
``validators`` :ref:`domain <using-message-domains>`.
579579

components/config/definition.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ node definition. Node types are available for:
9999

100100
* scalar (generic type that includes booleans, strings, integers, floats and ``null``)
101101
* boolean
102+
* scalar
103+
* boolean
102104
* integer (new in 2.2)
103105
* float (new in 2.2)
104106
* enum (new in 2.1) (similar to scalar, but it only allows a finite set of values)

components/console/helpers/dialoghelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ convenient for passwords::
9595
When you ask for a hidden response, Symfony will use either a binary, change
9696
stty mode or use another trick to hide the response. If none is available,
9797
it will fallback and allow the response to be visible unless you pass ``false``
98-
as the third argument like in the example above. In this case, a RuntimeException
98+
as the third argument like in the example above. In this case, a ``RuntimeException``
9999
would be thrown.
100100

101101
Validating the Answer

components/dependency_injection/compilation.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ The XML version of the config would then look like this:
207207
208208
.. note::
209209

210-
In the Symfony full stack framework there is a base Extension class which
210+
In the Symfony full-stack Framework there is a base Extension class which
211211
implements these methods as well as a shortcut method for processing the
212212
configuration. See :doc:`/cookbook/bundles/extension` for more details.
213213

@@ -347,9 +347,9 @@ will then be called when the container is compiled::
347347

348348
.. note::
349349

350-
Compiler passes are registered differently if you are using the full
351-
stack framework, see :doc:`/cookbook/service_container/compiler_passes`
352-
for more details.
350+
Compiler passes are registered differently if you are using the full-stack
351+
framework, see :doc:`/cookbook/service_container/compiler_passes` for
352+
more details.
353353

354354
Controlling the Pass Ordering
355355
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -510,5 +510,5 @@ to see if the files have changed, if they have the cache will be considered stal
510510

511511
.. note::
512512

513-
In the full stack framework the compilation and caching of the container
513+
In the full-stack framework the compilation and caching of the container
514514
is taken care of for you.

components/dependency_injection/tags.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ run when the container is compiled::
173173

174174
.. note::
175175

176-
Compiler passes are registered differently if you are using the full
177-
stack framework. See :doc:`/cookbook/service_container/compiler_passes`
178-
for more details.
176+
Compiler passes are registered differently if you are using the full-stack
177+
framework. See :doc:`/cookbook/service_container/compiler_passes` for
178+
more details.
179179

180180
Adding additional Attributes on Tags
181181
------------------------------------

components/dependency_injection/workflow.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ In the preceding pages of this section, there has been little to say about
88
where the various files and classes should be located. This is because this
99
depends on the application, library or framework in which you want to use
1010
the container. Looking at how the container is configured and built in the
11-
Symfony full stack framework will help you see how this all fits together,
12-
whether you are using the full stack framework or looking to use the service
11+
Symfony full-stack Framework will help you see how this all fits together,
12+
whether you are using the full-stack framework or looking to use the service
1313
container in another application.
1414

15-
The full stack framework uses the HttpKernel component to manage the loading
15+
The full-stack framework uses the HttpKernel component to manage the loading
1616
of the service container configuration from the application and bundles and
1717
also handles the compilation and caching. Even if you are not using HttpKernel,
1818
it should give you an idea of one way of organizing configuration in a modular

0 commit comments

Comments
 (0)