Skip to content

Commit de0e40b

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: use application instead of app be keen to newcomers
2 parents 643cc25 + 6f76cc3 commit de0e40b

File tree

14 files changed

+30
-30
lines changed

14 files changed

+30
-30
lines changed

_build/redirection_map

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,3 +411,4 @@
411411
/security/entity_provider /security/user_provider
412412
/session/avoid_session_start /session
413413
/session/sessions_directory /session
414+
/frontend/encore/legacy-apps /frontend/encore/legacy-applications

best_practices/configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ paginated results.
100100
Use constants to define configuration options that rarely change.
101101

102102
The traditional approach for defining configuration options has caused many
103-
Symfony apps to include an option like the following, which would be used
104-
to control the number of posts to display on the blog homepage:
103+
Symfony applications to include an option like the following, which would be
104+
used to control the number of posts to display on the blog homepage:
105105

106106
.. code-block:: yaml
107107

best_practices/creating-the-project.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ Application Bundles
7676

7777
When Symfony 2.0 was released, most developers naturally adopted the symfony
7878
1.x way of dividing applications into logical modules. That's why many Symfony
79-
apps used bundles to divide their code into logical features: UserBundle,
79+
applications used bundles to divide their code into logical features: UserBundle,
8080
ProductBundle, InvoiceBundle, etc.
8181

8282
But a bundle is *meant* to be something that can be reused as a stand-alone
8383
piece of software. If UserBundle cannot be used *"as is"* in other Symfony
84-
apps, then it shouldn't be its own bundle. Moreover, if InvoiceBundle depends on
85-
ProductBundle, then there's no advantage to having two separate bundles.
84+
applications, then it shouldn't be its own bundle. Moreover, if InvoiceBundle
85+
depends on ProductBundle, then there's no advantage to having two separate bundles.
8686

8787
.. best-practice::
8888

best_practices/introduction.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ 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
23-
fit the philosophy of the framework as envisioned by its original creator
22+
web applications with the Symfony full-stack Framework**. These are best practices
23+
that fit the philosophy of the framework as envisioned by its original creator
2424
`Fabien Potencier`_.
2525

2626
.. note::
@@ -44,8 +44,8 @@ then **extend and fit to your specific needs**:
4444

4545
We know that old habits die hard and some of you will be shocked by some
4646
of these best practices. But by following these, you'll be able to develop
47-
apps faster, with less complexity and with the same or even higher quality.
48-
It's also a moving target that will continue to improve.
47+
applications faster, with less complexity and with the same or even higher
48+
quality. It's also a moving target that will continue to improve.
4949

5050
Keep in mind that these are **optional recommendations** that you and your
5151
team may or may not follow to develop Symfony applications. If you want to

contributing/community/releases.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ Symfony releases follow the `semantic versioning`_ strategy and they are
88
published through a *time-based model*:
99

1010
* A new **Symfony patch version** (e.g. 2.8.15, 4.1.7) comes out roughly every
11-
month. It only contains bug fixes, so you can safely upgrade your apps;
11+
month. It only contains bug fixes, so you can safely upgrade your applications;
1212
* A new **Symfony minor version** (e.g. 2.8, 3.2, 4.1) comes out every *six months*:
1313
one in *May* and one in *November*. It contains bug fixes and new features, but
14-
it doesn't include any breaking change, so you can safely upgrade your apps;
14+
it doesn't include any breaking change, so you can safely upgrade your applications;
1515
* A new **Symfony major version** (e.g. 3.0, 4.0) comes out every *two years*.
1616
It can contain breaking changes, so you may need to do some changes in your
17-
apps before upgrading.
17+
applications before upgrading.
1818

1919
.. tip::
2020

create_framework/http_kernel_httpkernelinterface.rst

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@ to cache a response for 10 seconds, use the ``Response::setTtl()`` method::
9090

9191
.. tip::
9292

93-
If, like me, you are running your framework from the command line by
94-
simulating requests (``Request::create('/is_leap_year/2012')``), you can
95-
debug Response instances by dumping their string representation
96-
(``echo $response;``) as it displays all headers as well as the response
97-
content.
93+
If you are running your framework from the command line by simulating
94+
requests (``Request::create('/is_leap_year/2012')``), you can debug Response
95+
instances by dumping their string representation (``echo $response;``) as it
96+
displays all headers as well as the response content.
9897

9998
To validate that it works correctly, add a random number to the response
10099
content and check that the number only changes every 10 seconds::
@@ -113,9 +112,9 @@ expiration and the validation models of the HTTP specification. If you are not
113112
comfortable with these concepts, read the `HTTP caching`_ chapter of the
114113
Symfony documentation.
115114

116-
The Response class contains methods that let you configure the
117-
HTTP cache. One of the most powerful is ``setCache()`` as it
118-
abstracts the most frequently used caching strategies into a single array::
115+
The Response class contains methods that let you configure the HTTP cache. One
116+
of the most powerful is ``setCache()`` as it abstracts the most frequently used
117+
caching strategies into a single array::
119118

120119
$date = date_create_from_format('Y-m-d H:i:s', '2005-10-15 10:00:00');
121120

@@ -135,8 +134,8 @@ abstracts the most frequently used caching strategies into a single array::
135134
$response->setSharedMaxAge(10);
136135

137136
When using the validation model, the ``isNotModified()`` method allows you to
138-
cut on the response time by short-circuiting the response generation as
139-
early as possible::
137+
cut on the response time by short-circuiting the response generation as early as
138+
possible::
140139

141140
$response->setETag('whatever_you_compute_as_an_etag');
142141

forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ That's it! The :ref:`form() function <reference-forms-twig-form>` renders all
166166
fields *and* the ``<form>`` start and end tags. By default, the form method is
167167
``POST`` and the target URL is the same that displayed the form.
168168

169-
As easy as this is, it's not very flexible. Usually, you'll need more control
169+
As short as this is, it's not very flexible. Usually, you'll need more control
170170
about how the entire form or some of its fields look. Symfony provides several
171171
ways of doing that:
172172

frontend.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Guides
6969

7070
* :doc:`Using Bootstrap CSS & JS </frontend/encore/bootstrap>`
7171
* :doc:`Creating Page-Specific CSS/JS </frontend/encore/page-specific-assets>`
72-
* :doc:`jQuery and Legacy Applications </frontend/encore/legacy-apps>`
72+
* :doc:`jQuery and Legacy Applications </frontend/encore/legacy-applications>`
7373
* :doc:`Passing Information from Twig to JavaScript </frontend/encore/server-data>`
7474
* :doc:`webpack-dev-server and Hot Module Replacement (HMR) </frontend/encore/dev-server>`
7575
* :doc:`Adding custom loaders & plugins </frontend/encore/custom-loaders-plugins>`

frontend/encore/faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ or ``jQuery`` to be a global variable. But, when you use Webpack and ``require('
9292
no global variables are set.
9393

9494
The fix depends on if the error is happening in your code or inside some third-party
95-
code that you're using. See :doc:`/frontend/encore/legacy-apps` for the fix.
95+
code that you're using. See :doc:`/frontend/encore/legacy-applications` for the fix.
9696

9797
Uncaught ReferenceError: webpackJsonp is not defined
9898
----------------------------------------------------

frontend/encore/simple-example.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ To import values, use ``import``:
212212
Page-Specific JavaScript or CSS (Multiple Entries)
213213
--------------------------------------------------
214214

215-
So far, you only have one final JavaScript file: ``app.js``. For simple apps or
216-
SPA's (Single Page Applications), that might be fine! However, as your app grows,
215+
So far, you only have one final JavaScript file: ``app.js``. For small applications
216+
or SPA's (Single Page Applications), that might be fine! However, as your app grows,
217217
you may want to have page-specific JavaScript or CSS (e.g. checkout, account,
218218
etc.). To handle this, create a new "entry" JavaScript file for each page:
219219

page_creation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ What's Next?
302302
------------
303303

304304
Congrats! You're already starting to master Symfony and learn a whole new
305-
way of building beautiful, functional, fast and maintainable apps.
305+
way of building beautiful, functional, fast and maintainable applications.
306306

307307
Ok, time to finish mastering the fundamentals by reading these articles:
308308

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2220,7 +2220,7 @@ A list of workflows to be created by the framework extension:
22202220
22212221
.. seealso::
22222222

2223-
See also the article about :doc:`using workflows in Symfony apps </workflow>`.
2223+
See also the article about :doc:`using workflows in Symfony applications </workflow>`.
22242224

22252225
.. _reference-workflows-enabled:
22262226

web_link.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ automatically trigger a push for the related file in the same HTTP/2 connection.
9797

9898
Popular proxy services and CDNs including `Cloudflare`_, `Fastly`_ and `Akamai`_
9999
also leverage this feature. It means that you can push resources to clients and
100-
improve performance of your apps in production right now.
100+
improve performance of your applications in production right now.
101101

102102
If you want to prevent the push but let the browser preload the resource by
103103
issuing an early separate HTTP request, use the ``nopush`` option:

0 commit comments

Comments
 (0)