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 2aea99d

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '2.3' into 2.4
2 parents 575a75a + d882cc0 commit 2aea99d
Copy full SHA for 2aea99d

File tree

Expand file treeCollapse file tree

6 files changed

+73
-37
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+73
-37
lines changed

‎book/templating.rst

Copy file name to clipboardExpand all lines: book/templating.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,9 +1497,9 @@ In many cases, you may want to allow a single controller to render multiple
14971497
different formats based on the "request format". For that reason, a common
14981498
pattern is to do the following::
14991499

1500-
public function indexAction()
1500+
public function indexAction(Request $request)
15011501
{
1502-
$format = $this->getRequest()->getRequestFormat();
1502+
$format = $request->getRequestFormat();
15031503

15041504
return $this->render('AcmeBlogBundle:Blog:index.'.$format.'.twig');
15051505
}

‎contributing/documentation/standards.rst

Copy file name to clipboardExpand all lines: contributing/documentation/standards.rst
+19-19Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,6 @@ Configuration examples should show all supported formats using
8181
* **Validation**: YAML, Annotations, XML, PHP
8282
* **Doctrine Mapping**: Annotations, YAML, XML, PHP
8383

84-
Files and Directories
85-
~~~~~~~~~~~~~~~~~~~~~
86-
87-
* When referencing directories, always add a trailing slash to avoid confusions
88-
with regular files (e.g. *"execute the ``console`` script located at the ``app/``
89-
directory"*).
90-
* When referencing file extensions explicitly, you should include a leading dot
91-
for every extension (e.g. "*XML files use the ``.xml`` extension*").
92-
* When you list a Symfony file/directory hierarchy, use ``your-project/`` as the
93-
top level directory. E.g.
94-
95-
.. code-block:: text
96-
97-
your-project/
98-
├─ app/
99-
├─ src/
100-
├─ vendor/
101-
└─ ...
102-
10384
Example
10485
~~~~~~~
10586

@@ -133,6 +114,25 @@ Example
133114
In YAML you should put a space after ``{`` and before ``}`` (e.g. ``{ _controller: ... }``),
134115
but this should not be done in Twig (e.g. ``{'hello' : 'value'}``).
135116

117+
Files and Directories
118+
---------------------
119+
120+
* When referencing directories, always add a trailing slash to avoid confusions
121+
with regular files (e.g. "execute the ``console`` script located at the ``app/``
122+
directory").
123+
* When referencing file extensions explicitly, you should include a leading dot
124+
for every extension (e.g. "XML files use the ``.xml`` extension").
125+
* When you list a Symfony file/directory hierarchy, use ``your-project/`` as the
126+
top level directory. E.g.
127+
128+
.. code-block:: text
129+
130+
your-project/
131+
├─ app/
132+
├─ src/
133+
├─ vendor/
134+
└─ ...
135+
136136
Language Standards
137137
------------------
138138

‎cookbook/configuration/override_dir_structure.rst

Copy file name to clipboardExpand all lines: cookbook/configuration/override_dir_structure.rst
+14-13Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ directory structure is:
1010

1111
.. code-block:: text
1212
13-
app/
14-
cache/
15-
config/
16-
logs/
17-
...
18-
src/
19-
...
20-
vendor/
21-
...
22-
web/
23-
app.php
24-
...
13+
your-project/
14+
├─ app/
15+
│ ├─ cache/
16+
│ ├─ config/
17+
│ ├─ logs/
18+
│ └─ ...
19+
├─ src/
20+
│ └─ ...
21+
├─ vendor/
22+
│ └─ ...
23+
└─ web/
24+
├─ app.php
25+
└─ ...
2526
2627
.. _override-cache-dir:
2728

@@ -94,7 +95,7 @@ may need to modify the paths inside these files::
9495
You also need to change the ``extra.symfony-web-dir`` option in the ``composer.json``
9596
file:
9697

97-
.. code-block:: json
98+
.. code-block:: javascript
9899
99100
{
100101
...

‎reference/configuration/doctrine.rst

Copy file name to clipboardExpand all lines: reference/configuration/doctrine.rst
+35Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,3 +411,38 @@ Each connection is also accessible via the ``doctrine.dbal.[name]_connection``
411411
service where ``[name]`` is the name of the connection.
412412

413413
.. _DBAL documentation: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html
414+
415+
Shortened Configuration Syntax
416+
------------------------------
417+
418+
When you are only using one entity manager, all config options available
419+
can be placed directly under ``doctrine.orm`` config level.
420+
421+
.. code-block:: yaml
422+
423+
doctrine:
424+
orm:
425+
# ...
426+
query_cache_driver:
427+
# ...
428+
metadata_cache_driver:
429+
# ...
430+
result_cache_driver:
431+
# ...
432+
connection: ~
433+
class_metadata_factory_name: Doctrine\ORM\Mapping\ClassMetadataFactory
434+
default_repository_class: Doctrine\ORM\EntityRepository
435+
auto_mapping: false
436+
hydrators:
437+
# ...
438+
mappings:
439+
# ...
440+
dql:
441+
# ...
442+
filters:
443+
# ...
444+
445+
This shortened version is commonly used in other documentation sections.
446+
Keep in mind that you can't use both syntaxes at the same time.
447+
448+
.. _`DQL User Defined Functions`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/cookbook/dql-user-defined-functions.html

‎reference/forms/types/options/pattern.rst.inc

Copy file name to clipboardExpand all lines: reference/forms/types/options/pattern.rst.inc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ pattern
66
This adds an HTML5 ``pattern`` attribute to restrict the field input by a
77
given regular expression.
88

9-
.. caution:
9+
.. caution::
1010

1111
The ``pattern`` attribute provides client-side validation for convenience
1212
purposes only and must not be used as a replacement for reliable
1313
server-side validation.
1414

15-
.. note:
15+
.. note::
1616

1717
When using validation constraints, this option is set automatically
1818
for some constraints to match the server-side validation.

‎reference/forms/types/options/post_max_size_message.rst.inc

Copy file name to clipboardExpand all lines: reference/forms/types/options/post_max_size_message.rst.inc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ This is the validation error message that's used if submitted POST form data
77
exceeds ``php.ini``'s ``post_max_size`` directive. The ``{{ max }}``
88
placeholder can be used to display the allowed size.
99

10-
.. note:
10+
.. note::
1111

1212
Validating the ``post_max_size`` only happens on the root form.

0 commit comments

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