Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e7246b6

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '2.3' into 2.7
* 2.3: (24 commits) [#6365] Removing extra : Added minor clarification [#6360] Minor changes [#6349][#6351][#6352] Editing the Doctrine section to improve readability. Minor corrections Fixed typo Fix escaping of backtick inside double back-quotes Removed server:stop code block for 2.3 Removed the PR table example (this is now included by GitHub template) Updated link to Translatable Extension [reference] [constraints] added missing colon character for Image constraint documentation in YAML format. Editing the Doctrine section to improve readability. Removed info about reducing visibility for private Updated link to Translatable Extension Editing the Doctrine section to improve readability. typo controller ch review, part 3 typo controller ch review, part 2 ...
2 parents 11e80c9 + 8c99ac9 commit e7246b6
Copy full SHA for e7246b6

File tree

Expand file treeCollapse file tree

12 files changed

+378
-405
lines changed
Filter options
Expand file treeCollapse file tree

12 files changed

+378
-405
lines changed

‎book/controller.rst

Copy file name to clipboardExpand all lines: book/controller.rst
+237-221Lines changed: 237 additions & 221 deletions
Large diffs are not rendered by default.

‎book/doctrine.rst

Copy file name to clipboardExpand all lines: book/doctrine.rst
+113-112Lines changed: 113 additions & 112 deletions
Large diffs are not rendered by default.

‎book/installation.rst

Copy file name to clipboardExpand all lines: book/installation.rst
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,7 @@ your `Apache`_ or `Nginx`_ web server as explained in
195195
:doc:`/cookbook/configuration/web_server_configuration`.
196196

197197
When you are finished working on your Symfony application, you can stop the
198-
server with the ``server:stop`` command:
199-
200-
.. code-block:: bash
201-
202-
$ php app/console server:stop
198+
server by pressing `Ctrl+C` from terminal.
203199

204200
Checking Symfony Application Configuration and Setup
205201
----------------------------------------------------

‎book/templating.rst

Copy file name to clipboardExpand all lines: book/templating.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ Template Naming and Locations
382382
By default, templates can live in two different locations:
383383

384384
``app/Resources/views/``
385-
The applications ``views`` directory can contain application-wide base templates
385+
The application's ``views`` directory can contain application-wide base templates
386386
(i.e. your application's layouts and templates of the application bundle) as
387387
well as templates that override third party bundle templates
388388
(see :ref:`overriding-bundle-templates`).
@@ -620,7 +620,7 @@ articles::
620620
}
621621
}
622622

623-
The ``recentList`` template is perfectly straightforward:
623+
The ``recent_list`` template is perfectly straightforward:
624624

625625
.. configuration-block::
626626

@@ -979,7 +979,7 @@ route:
979979
980980
In this case, you need to specify both the route name (``article_show``) and
981981
a value for the ``{slug}`` parameter. Using this route, revisit the
982-
``recentList`` template from the previous section and link to the articles
982+
``recent_list`` template from the previous section and link to the articles
983983
correctly:
984984

985985
.. configuration-block::
@@ -1063,7 +1063,7 @@ being used and generating the correct paths accordingly.
10631063

10641064
Additionally, if you use the ``asset`` function, Symfony can automatically
10651065
append a query string to your asset, in order to guarantee that updated static
1066-
assets won't be cached when deployed. For example, ``/images/logo.png`` might
1066+
assets won't be loaded from cache after being deployed. For example, ``/images/logo.png`` might
10671067
look like ``/images/logo.png?v2``. For more information, see the :ref:`reference-framework-assets-version`
10681068
configuration option.
10691069

‎book/translation.rst

Copy file name to clipboardExpand all lines: book/translation.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,5 +888,5 @@ steps:
888888
.. _`i18n`: https://en.wikipedia.org/wiki/Internationalization_and_localization
889889
.. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
890890
.. _`ISO 639-1`: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
891-
.. _`Translatable Extension`: https://github.com/l3pp4rd/DoctrineExtensions
891+
.. _`Translatable Extension`: http://atlantic18.github.io/DoctrineExtensions/doc/translatable.html
892892
.. _`Translatable Behavior`: https://github.com/KnpLabs/DoctrineBehaviors

‎components/http_foundation/introduction.rst

Copy file name to clipboardExpand all lines: components/http_foundation/introduction.rst
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,8 @@ if it should::
507507

508508
BinaryFileResponse::trustXSendfileTypeHeader();
509509

510-
You can still set the ``Content-Type`` of the sent file, or change its ``Content-Disposition``::
510+
With the ``BinaryFileResponse``, you can still set the ``Content-Type`` of the sent file,
511+
or change its ``Content-Disposition``::
511512

512513
$response->headers->set('Content-Type', 'text/plain');
513514
$response->setContentDisposition(

‎components/yaml/yaml_format.rst

Copy file name to clipboardExpand all lines: components/yaml/yaml_format.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ can use double quotes, for these characters it is more convenient to use single
5050
quotes, which avoids having to escape any backslash ``\``:
5151

5252
* ``:``, ``{``, ``}``, ``[``, ``]``, ``,``, ``&``, ``*``, ``#``, ``?``, ``|``,
53-
``-``, ``<``, ``>``, ``=``, ``!``, ``%``, ``@``, ``\```
53+
``-``, ``<``, ``>``, ``=``, ``!``, ``%``, ``@``, `````
5454

5555
The double-quoted style provides a way to express arbitrary strings, by
5656
using ``\`` to escape characters and sequences. For instance, it is very useful

‎contributing/code/bc.rst

Copy file name to clipboardExpand all lines: contributing/code/bc.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ Change return type No
236236
Add private method Yes
237237
Remove private method Yes
238238
Change name Yes
239-
Reduce visibility Yes
240239
Add argument without a default value Yes
241240
Add argument with a default value Yes
242241
Remove argument Yes

‎contributing/code/patches.rst

Copy file name to clipboardExpand all lines: contributing/code/patches.rst
+4-43Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -272,49 +272,10 @@ pull request message, like in:
272272
[Yaml] fixed something
273273
[Form] [Validator] [FrameworkBundle] added something
274274
275-
The pull request description must include the following checklist at the top
276-
to ensure that contributions may be reviewed without needless feedback
277-
loops and that your contributions can be included into Symfony as quickly as
278-
possible:
279-
280-
.. code-block:: text
281-
282-
| Q | A
283-
| ------------- | ---
284-
| Bug fix? | [yes|no]
285-
| New feature? | [yes|no]
286-
| BC breaks? | [yes|no]
287-
| Deprecations? | [yes|no]
288-
| Tests pass? | [yes|no]
289-
| Fixed tickets | [comma separated list of tickets fixed by the PR]
290-
| License | MIT
291-
| Doc PR | [The reference to the documentation PR if any]
292-
293-
An example submission could now look as follows:
294-
295-
.. code-block:: text
296-
297-
| Q | A
298-
| ------------- | ---
299-
| Bug fix? | no
300-
| New feature? | no
301-
| BC breaks? | no
302-
| Deprecations? | no
303-
| Tests pass? | yes
304-
| Fixed tickets | #12, #43
305-
| License | MIT
306-
| Doc PR | symfony/symfony-docs#123
307-
308-
The whole table must be included (do **not** remove lines that you think are
309-
not relevant). For simple typos, minor changes in the PHPDocs, or changes in
310-
translation files, use the shorter version of the check-list:
311-
312-
.. code-block:: text
313-
314-
| Q | A
315-
| ------------- | ---
316-
| Fixed tickets | [comma separated list of tickets fixed by the PR]
317-
| License | MIT
275+
The default pull request description contains a table which you must fill in
276+
with the appropriate answers. This ensures that contributions may be reviewed
277+
without needless feedback loops and that your contributions can be included into
278+
Symfony as quickly as possible.
318279

319280
Some answers to the questions trigger some more requirements:
320281

‎contributing/community/releases.rst

Copy file name to clipboardExpand all lines: contributing/community/releases.rst
+13-14Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,19 @@ Below is the schedule for the first few versions that use this release model:
9191
* **Blue** represents the Stabilization phase
9292
* **Green** represents the Maintenance period
9393

94-
This results in very predictable dates and maintenance periods:
94+
.. tip::
95+
96+
If you want to learn more about the timeline of any given Symfony version,
97+
use the online `timeline calculator`_.
98+
99+
.. tip::
100+
101+
Whenever an important event related to Symfony versions happens (a version
102+
reaches end of maintenance or a new patch version is released for
103+
instance), you can automatically receive an email notification if you
104+
subscribed on the `roadmap notification`_ page.
105+
106+
.. _version-history:
95107

96108
======= ============== ======= ======================== ===========
97109
Version Feature Freeze Release End of Maintenance End of Life
@@ -123,19 +135,6 @@ Version Feature Freeze Release End of Maintenance End of Life
123135
.. [2] Symfony 2.8 is the last version of the Symfony 2.x branch.
124136
.. [3] Symfony 3.0 is the first version to use the new release process based on five minor releases.
125137
126-
.. tip::
127-
128-
If you want to learn more about the timeline of any given Symfony version,
129-
use the online `timeline calculator`_. You can also get all data as a JSON
130-
string via a URL like `https://symfony.com/roadmap.json?version=2.x`.
131-
132-
.. tip::
133-
134-
Whenever an important event related to Symfony versions happens (a version
135-
reaches end of maintenance or a new patch version is released for
136-
instance), you can automatically receive an email notification if you
137-
subscribed on the `roadmap notification`_ page.
138-
139138
Backwards Compatibility
140139
-----------------------
141140

‎cookbook/assetic/php.rst

Copy file name to clipboardExpand all lines: cookbook/assetic/php.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Organizing your Web Asset Files
4040
-------------------------------
4141

4242
This example will include a setup using the Bootstrap CSS framework, jQuery, FontAwesome
43-
and some regular CSS and and JavaScript application files (called ``main.css`` and
43+
and some regular CSS and JavaScript application files (called ``main.css`` and
4444
``main.js``). The recommended directory structure for this set-up looks like this:
4545

4646
.. code-block:: text

‎reference/constraints/Image.rst

Copy file name to clipboardExpand all lines: reference/constraints/Image.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ that it is between a certain size, add the following:
9999
.. code-block:: yaml
100100
101101
# src/AppBundle/Resources/config/validation.yml
102-
AppBundle\Entity\Author
102+
AppBundle\Entity\Author:
103103
properties:
104104
headshot:
105105
- Image:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.