Skip to content

[Forms] fix displaying empty_data option for hidden field #13479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7,419 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7419 commits
Select commit Hold shift + click to select a range
5b0590e
[Testing] Documented the changes in MailerAssertionsTrait
javiereguiluz Feb 4, 2020
19ef1b6
minor #13050 [Testing] Documented the changes in MailerAssertionsTrai…
javiereguiluz Mar 12, 2020
1985be6
Update Associations with fix code-block example
Dec 13, 2019
5311238
minor #12812 Update Associations with fix code-block example (TheGari…
javiereguiluz Mar 12, 2020
6cf75dd
Merge branch '4.4' into 5.0
javiereguiluz Mar 12, 2020
75ca707
Merge branch '5.0'
javiereguiluz Mar 12, 2020
d2b37f9
minor #12881 [Testing] Fix broken link (MrYamous)
javiereguiluz Mar 12, 2020
675bf47
Merge branch '5.0'
javiereguiluz Mar 12, 2020
da331a5
Merge branch '3.4' into 4.4
javiereguiluz Mar 12, 2020
bba98b5
Merge branch '4.4' into 5.0
javiereguiluz Mar 12, 2020
e119c4a
Merge branch '5.0'
javiereguiluz Mar 12, 2020
2334f73
Merge branch '3.4' into 4.4
javiereguiluz Mar 13, 2020
5f823b9
Merge branch '4.4' into 5.0
javiereguiluz Mar 13, 2020
a66683b
Merge branch '5.0'
javiereguiluz Mar 13, 2020
14cad70
[Cache] fixed a bad merge
javiereguiluz Mar 13, 2020
e6f5acb
Merge branch '4.4' into 5.0
javiereguiluz Mar 13, 2020
d5bf25f
Merge branch '5.0'
javiereguiluz Mar 13, 2020
717547b
Remove caution section about bind scalar controller arguments
Mar 13, 2020
986cdd0
minor #13340 Remove caution section about bind scalar controller argu…
javiereguiluz Mar 14, 2020
6f2b879
Merge branch '4.4' into 5.0
javiereguiluz Mar 14, 2020
83d6d53
Merge branch '5.0'
javiereguiluz Mar 14, 2020
7a74bb3
[Form] Add description of label_html option
przemyslaw-bogusz Mar 8, 2020
e0d1516
minor #13316 [Form] Add description of label_html option (przemyslaw-…
javiereguiluz Mar 14, 2020
889cfe5
Added the missing versionadded directive
javiereguiluz Mar 14, 2020
d4a2013
bug #13262 fix Mercure PublisherStub should be implement PublisherInt…
wouterj Mar 15, 2020
ea5b5d9
Merge branch '4.4' into 5.0
wouterj Mar 15, 2020
b12d0ba
Merge branch '5.0'
wouterj Mar 15, 2020
efc5c2e
Merge branch '3.4' into 4.4
javiereguiluz Mar 16, 2020
36eac11
Merge branch '4.4' into 5.0
javiereguiluz Mar 16, 2020
44dd7c2
Merge branch '5.0'
javiereguiluz Mar 16, 2020
513f4f7
[PhpUnitBridge] Deprecate the expectedDeprecation annotation
javiereguiluz Mar 16, 2020
80ed80b
Remove redundant "by default" in autowiring.rst
patrickmaynard Mar 16, 2020
f2190aa
minor #13357 Remove redundant "by default" in autowiring.rst (patrick…
javiereguiluz Mar 16, 2020
7ecdba0
Merge branch '4.4' into 5.0
javiereguiluz Mar 16, 2020
155bc6e
Merge branch '5.0'
javiereguiluz Mar 16, 2020
efc8f70
minor #13138 Add doc for rounding_mode (VincentLanglet)
javiereguiluz Mar 16, 2020
a3d70aa
Minor tweaks
javiereguiluz Mar 16, 2020
a0ffdb4
consider "allowEmptyString" option in example
W0rma Mar 16, 2020
c651749
[Routing] added missing "version-added" for i18n routes
HeahDude Mar 17, 2020
7d70a14
minor #13366 [Routing] added missing "version-added" for i18n routes …
javiereguiluz Mar 17, 2020
676df76
Merge branch '4.4' into 5.0
javiereguiluz Mar 17, 2020
0c786b5
Fixed the previous merge
javiereguiluz Mar 17, 2020
8a4bed6
Merge branch '4.4' into 5.0
javiereguiluz Mar 17, 2020
723ab43
Removed the versionadded directive
javiereguiluz Mar 17, 2020
56ce785
Merge branch '5.0'
javiereguiluz Mar 17, 2020
40ad752
Update calls.rst
Dominic-Mayers Mar 17, 2020
531a2db
minor #13365 Update calls.rst (MaharishiCanada)
javiereguiluz Mar 17, 2020
934600b
Merge branch '4.4' into 5.0
javiereguiluz Mar 17, 2020
063b6eb
Merge branch '5.0'
javiereguiluz Mar 17, 2020
26228a1
minor #13358 Consider option "allowEmptyString" in examples (W0rma)
javiereguiluz Mar 17, 2020
3525dd7
Merge branch '4.4' into 5.0
javiereguiluz Mar 17, 2020
75ae01a
Merge branch '5.0'
javiereguiluz Mar 17, 2020
1d61aaa
Merge branch '3.4' into 4.4
javiereguiluz Mar 17, 2020
90ffbee
Merge branch '4.4' into 5.0
javiereguiluz Mar 17, 2020
71bf6e8
Merge branch '5.0'
javiereguiluz Mar 17, 2020
41d017a
Make it more obvious what the $handler is (refers to the next item in…
jpjoao Mar 15, 2020
2309998
minor #13349 Make it more obvious what the $handler is on Messenger d…
javiereguiluz Mar 17, 2020
65a24b9
Merge branch '4.4' into 5.0
javiereguiluz Mar 17, 2020
17617ce
Merge branch '5.0'
javiereguiluz Mar 17, 2020
5b0a583
Update form_login_setup.rst
JakubSzczesniak Mar 16, 2020
8eb21f4
minor #13363 Move login route to const (JakubSzczesniak)
javiereguiluz Mar 17, 2020
197ade3
Made the constant private
javiereguiluz Mar 17, 2020
29c8a74
Merge branch '4.4' into 5.0
javiereguiluz Mar 17, 2020
eca529c
Merge branch '5.0'
javiereguiluz Mar 17, 2020
ab66936
minor #13356 [PhpUnitBridge] Deprecate the expectedDeprecation annota…
javiereguiluz Mar 17, 2020
2b64654
Update configuration.rst
ThomasLandauer Mar 18, 2020
fffdbaa
Merge branch '3.4' into 4.4
javiereguiluz Mar 18, 2020
78f4f62
minor #13372 Update configuration.rst (ThomasLandauer)
javiereguiluz Mar 18, 2020
4ec5d85
Minor tweak
javiereguiluz Mar 18, 2020
fc27761
Merge branch '4.4' into 5.0
javiereguiluz Mar 18, 2020
4cf2cdf
Merge branch '5.0'
javiereguiluz Mar 18, 2020
f6fae3a
[Form] Document the new collection_entry_* blocks
javiereguiluz Mar 18, 2020
f140ba2
[String] Added the containsAny() method
javiereguiluz Mar 18, 2020
4d4c4b5
feature #13373 [String] Added the containsAny() method (javiereguiluz)
OskarStark Mar 18, 2020
935c677
feature #13374 [Form] Document the new collection_entry_* blocks (jav…
OskarStark Mar 18, 2020
6702c1e
Use trigger_deprecation instead of @trigger_error
l-vo Mar 19, 2020
d589089
reword yaml-lint description
xabbuh Mar 20, 2020
088da02
Update messenger.rst
94noni Mar 20, 2020
3f17554
minor #13381 reword yaml-lint description (xabbuh)
OskarStark Mar 20, 2020
8281616
minor #13382 [Messenger] Update messenger in memory config (94noni)
OskarStark Mar 20, 2020
b237771
Merge branch '4.4' into 5.0
OskarStark Mar 20, 2020
66bb9e8
Merge branch '5.0'
OskarStark Mar 20, 2020
c6509a3
[DI] Auto alias compiler pass is now enabled by default
javiereguiluz Mar 20, 2020
f574acb
use NotNull instead of NotBlank
xabbuh Mar 21, 2020
c494084
feature #13379 Use trigger_deprecation instead of @trigger_error (l-vo)
wouterj Mar 21, 2020
a2846b9
[#13379] Some small cleanups
wouterj Mar 21, 2020
2c6d6d4
Documented KernelBrowser::loginUser()
wouterj Mar 16, 2020
c0ad246
Update security.rst
ThomasLandauer Mar 21, 2020
d58070a
Update guard_authentication.rst
ThomasLandauer Mar 21, 2020
b64279a
Update security.rst
ThomasLandauer Mar 21, 2020
23eea33
Update security.rst
ThomasLandauer Mar 21, 2020
4b5f199
Typehint of parameter for MicrokernelTrait::configureRoutes() should …
jpjoao Mar 22, 2020
81e4dbf
Update class names as amqp messenger was moved to another package
jpjoao Mar 22, 2020
379026d
Update notifier.rst
l-vo Mar 22, 2020
135340b
minor #13396 Update notifier.rst (l-vo)
javiereguiluz Mar 23, 2020
8eb503a
Merge branch '5.0'
javiereguiluz Mar 23, 2020
e237579
Update guard_authentication.rst
ThomasLandauer Mar 23, 2020
fed5d8c
Merge branch '3.4' into 4.4
javiereguiluz Mar 23, 2020
d76fc61
Merge branch '4.4' into 5.0
javiereguiluz Mar 23, 2020
41ba8c2
Merge branch '5.0'
javiereguiluz Mar 23, 2020
64004cc
minor #13400 Update guard_authentication.rst (ThomasLandauer)
javiereguiluz Mar 23, 2020
7be1e0e
Merge branch '4.4' into 5.0
javiereguiluz Mar 23, 2020
f8a0b17
Merge branch '5.0'
javiereguiluz Mar 23, 2020
cfeb0b3
minor #13389 Update guard_authentication.rst (ThomasLandauer)
javiereguiluz Mar 23, 2020
a905610
Merge branch '4.4' into 5.0
javiereguiluz Mar 23, 2020
5d68e7b
Merge branch '5.0'
javiereguiluz Mar 23, 2020
f4f6ef6
minor #13394 Fix typehint of parameter for MicrokernelTrait::configur…
javiereguiluz Mar 23, 2020
54f774f
minor #13395 Update class names as amqp messenger was moved to anothe…
javiereguiluz Mar 23, 2020
33a3a91
minor #13384 [DI] Auto alias compiler pass is now enabled by default …
javiereguiluz Mar 23, 2020
2de486a
minor #13388 Update security.rst (ThomasLandauer)
javiereguiluz Mar 23, 2020
fabcc60
Merge branch '4.4' into 5.0
javiereguiluz Mar 23, 2020
8b2f522
Merge branch '5.0'
javiereguiluz Mar 23, 2020
a891aa2
minor #13386 use NotNull instead of NotBlank (xabbuh)
javiereguiluz Mar 23, 2020
8649d07
minor #13362 [Security][Testing] Documented KernelBrowser::loginUser(…
javiereguiluz Mar 23, 2020
a9f63e3
Tweaks
javiereguiluz Mar 23, 2020
8d04a27
[UID] Added the docs for the component
javiereguiluz Mar 13, 2020
459e09f
minor #13338 [UID] Added the docs for the component (javiereguiluz)
javiereguiluz Mar 23, 2020
14fc86c
Merge branch '3.4' into 4.4
javiereguiluz Mar 23, 2020
d52691a
Merge branch '4.4' into 5.0
javiereguiluz Mar 23, 2020
6a94a32
Merge branch '5.0'
javiereguiluz Mar 23, 2020
7299acc
minor #13264 Document RenderView method (Midwain)
javiereguiluz Mar 23, 2020
1003548
Reword
javiereguiluz Mar 23, 2020
fcbd5a0
Merge branch '4.4' into 5.0
javiereguiluz Mar 23, 2020
8899d34
Merge branch '5.0'
javiereguiluz Mar 23, 2020
e85ffe0
Updatd all security examples to use the new config XSD
javiereguiluz Mar 23, 2020
b25a9a4
using slugger for file uploading, instead of long transliterator code
weaverryan Mar 23, 2020
f8c3968
document the reference_date option
xabbuh Mar 24, 2020
f31423d
minor #13408 using slugger for file uploading, instead of long transl…
javiereguiluz Mar 24, 2020
6d0230b
Merge branch '5.0'
javiereguiluz Mar 24, 2020
6c4dcf4
minor #13410 [Form] document the reference_date option (xabbuh)
javiereguiluz Mar 24, 2020
47f3d57
Added the versionadded directive
javiereguiluz Mar 24, 2020
43445da
Merge branch '4.4' into 5.0
javiereguiluz Mar 24, 2020
76acbc5
Removed the versionadded directive
javiereguiluz Mar 24, 2020
5ec126a
Merge branch '5.0'
javiereguiluz Mar 24, 2020
edeba30
minor #13405 Updated all security examples to use the new config XSD …
javiereguiluz Mar 24, 2020
2cd8afa
derive view_timezone from model_timezone
xabbuh Mar 24, 2020
5ba5224
[Validator] Add description for AtLeastOne constraint
przemyslaw-bogusz Mar 23, 2020
e2a8552
minor #13409 [Validator] Add description for AtLeastOne constraint (p…
javiereguiluz Mar 24, 2020
d7e87f6
Minor tweaks
javiereguiluz Mar 24, 2020
1493ced
minor #13412 [Form] derive view_timezone from model_timezone (xabbuh)
javiereguiluz Mar 24, 2020
cbe6270
Replace ExceptionListener uses with ErrorListener
APachecoDiSanti Mar 21, 2020
d0de558
minor #13391 Replace ExceptionListener uses with ErrorListener (APach…
javiereguiluz Mar 24, 2020
d4bb765
Replace ExceptionListener uses with ErrorListener
APachecoDiSanti Mar 21, 2020
dc69db9
Merge branch '4.4' into 5.0
javiereguiluz Mar 24, 2020
af164cc
Merge branch '5.0'
javiereguiluz Mar 24, 2020
9fc18e7
[Form] added the new `ChoiceList` class to configure `ChoiceType` opt…
HeahDude Feb 18, 2020
4fad298
minor #13182 [Form] added the new `ChoiceList` class to configure `Ch…
javiereguiluz Mar 24, 2020
82cdf17
Tweak
javiereguiluz Mar 24, 2020
1a3ae2e
Minor grammar fix
javiereguiluz Mar 24, 2020
6bcc093
[Form] Improved the explanation of choice_self_translation
javiereguiluz Mar 26, 2020
ea6470d
Fix $slugger call
nlemoine Mar 26, 2020
9b59ce2
minor #13420 [Form] Improved the explanation of choice_self_translati…
javiereguiluz Mar 27, 2020
969459f
minor #13421 Fix $slugger call (nlemoine)
javiereguiluz Mar 27, 2020
35e67aa
Merge branch '5.0'
javiereguiluz Mar 27, 2020
fbf2589
Typo sent instead of send
zspine Mar 27, 2020
3179948
minor #13426 Typo sent instead of send (zspine)
javiereguiluz Mar 27, 2020
cc5ca02
Merge branch '5.0'
javiereguiluz Mar 27, 2020
7bbf35e
Merge branch '3.4' into 4.4
javiereguiluz Mar 27, 2020
f20e934
Merge branch '4.4' into 5.0
javiereguiluz Mar 27, 2020
1f2cb0b
Merge branch '5.0'
javiereguiluz Mar 27, 2020
864be0a
Merge branch '3.4' into 4.4
javiereguiluz Mar 27, 2020
86a526a
Merge branch '4.4' into 5.0
javiereguiluz Mar 27, 2020
659e443
Merge branch '5.0'
javiereguiluz Mar 27, 2020
a534123
Adding `anonymous`
ThomasLandauer Mar 24, 2020
2617d5f
minor #13414 Adding `anonymous` (ThomasLandauer)
javiereguiluz Mar 27, 2020
efce60b
Minor tweak
javiereguiluz Mar 27, 2020
a75020b
Merge branch '4.4' into 5.0
javiereguiluz Mar 27, 2020
a189b78
Merge branch '5.0'
javiereguiluz Mar 27, 2020
9fe3193
[Translation] Documented the debug:translation exit codes
javiereguiluz Mar 20, 2020
43f08c0
minor #13383 [Translation] Documented the debug:translation exit code…
javiereguiluz Mar 27, 2020
4cfcd93
Add clear description of `resolve` env processor
wtorsi Mar 25, 2020
667efde
minor #13417 Add clear description of `resolve` env processor (wtorsi)
javiereguiluz Mar 27, 2020
772f342
Reword
javiereguiluz Mar 27, 2020
9e329be
Merge branch '4.4' into 5.0
javiereguiluz Mar 27, 2020
7e73d5e
Merge branch '5.0'
javiereguiluz Mar 27, 2020
ae7c0a3
Routing - remove extra space in XML inline example
guilliamxavier Mar 30, 2020
ba9bee5
Merge branch '3.4' into 4.4
javiereguiluz Mar 30, 2020
9821b98
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
8285579
Merge branch '5.0'
javiereguiluz Mar 30, 2020
d37e7d7
Update multiple_buses.rst
Braxilior Mar 27, 2020
9ffa973
minor #13429 Update multiple_buses.rst (Braxilior)
javiereguiluz Mar 30, 2020
f09586c
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
6085ba4
Merge branch '5.0'
javiereguiluz Mar 30, 2020
393c044
minor #13436 [Routing] remove extra space in XML inline example (guil…
javiereguiluz Mar 30, 2020
290f598
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
f00c851
Merge branch '5.0'
javiereguiluz Mar 30, 2020
ed07eef
Merge branch '3.4' into 4.4
javiereguiluz Mar 30, 2020
9f481b6
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
157900b
Merge branch '5.0'
javiereguiluz Mar 30, 2020
348a8bb
Merge branch '3.4' into 4.4
javiereguiluz Mar 30, 2020
d9cd652
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
210a127
Merge branch '5.0'
javiereguiluz Mar 30, 2020
0aed669
Merge branch '3.4' into 4.4
javiereguiluz Mar 30, 2020
3ab89db
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
36bc866
Merge branch '5.0'
javiereguiluz Mar 30, 2020
e2f28b1
Update error_pages.rst
abdounikarim Mar 27, 2020
f8119c1
minor #13428 Update error_pages.rst (abdounikarim)
javiereguiluz Mar 30, 2020
17bac3e
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
8c99c83
Merge branch '5.0'
javiereguiluz Mar 30, 2020
f0bce9e
Merge branch '3.4' into 4.4
javiereguiluz Mar 30, 2020
2ad5d8e
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
a3295fa
Merge branch '5.0'
javiereguiluz Mar 30, 2020
e17aaec
Merge branch '3.4' into 4.4
javiereguiluz Mar 30, 2020
b0b0a4b
Merge branch '4.4' into 5.0
javiereguiluz Mar 30, 2020
f12077b
Merge branch '5.0'
javiereguiluz Mar 30, 2020
a6da873
Typo and namespace import reference fixed
zspine Mar 30, 2020
ff026e2
Merge branch '3.4' into 4.4
javiereguiluz Mar 31, 2020
4be4e1b
Merge branch '4.4' into 5.0
javiereguiluz Mar 31, 2020
c8f3fcf
Merge branch '5.0'
javiereguiluz Mar 31, 2020
877d031
Namespace import reference missing
zspine Mar 30, 2020
accb09e
minor #13455 Namespace import reference missing (zspine)
javiereguiluz Mar 31, 2020
2e201f1
minor #13456 Typo and namespace import reference fixed (zspine)
javiereguiluz Mar 31, 2020
46c973a
Merge branch '5.0'
javiereguiluz Mar 31, 2020
74b9cf5
Merge branch '3.4' into 4.4
javiereguiluz Mar 31, 2020
8e14ac2
Merge branch '4.4' into 5.0
javiereguiluz Mar 31, 2020
30d5ec2
Merge branch '5.0'
javiereguiluz Mar 31, 2020
a620fdf
Merge branch '3.4' into 4.4
javiereguiluz Mar 31, 2020
5170450
Merge branch '4.4' into 5.0
javiereguiluz Mar 31, 2020
7340ceb
Merge branch '5.0'
javiereguiluz Mar 31, 2020
816b9f2
Merge branch '3.4' into 4.4
javiereguiluz Mar 31, 2020
c5ffd2c
Merge branch '4.4' into 5.0
javiereguiluz Mar 31, 2020
dc7cfeb
Merge branch '5.0'
javiereguiluz Mar 31, 2020
2e157f3
Update setup.rst - Friendlier phrasing for people choosing not to use…
bobdenotter Mar 31, 2020
a406ddc
minor #13461 [setup] Friendlier phrasing for people choosing not to u…
javiereguiluz Mar 31, 2020
54bf8d0
Merge branch '4.4' into 5.0
javiereguiluz Mar 31, 2020
c02bef0
Merge branch '5.0'
javiereguiluz Mar 31, 2020
dfe0cf8
No longer list the Symfony binary as a requirement
wouterj Mar 31, 2020
5f1a224
minor #13462 No longer list the Symfony binary as a requirement (wout…
javiereguiluz Apr 1, 2020
84e7606
Tweak
javiereguiluz Apr 1, 2020
8671540
Merge branch '4.4' into 5.0
javiereguiluz Apr 1, 2020
eebf3ea
Merge branch '5.0'
javiereguiluz Apr 1, 2020
44d77e5
Merge branch '3.4' into 4.4
javiereguiluz Apr 1, 2020
b0a4345
Merge branch '4.4' into 5.0
javiereguiluz Apr 1, 2020
755cf85
Merge branch '5.0'
javiereguiluz Apr 1, 2020
90bde03
Removed an unused link
javiereguiluz Apr 1, 2020
ddc70e5
Merge branch '4.4' into 5.0
javiereguiluz Apr 1, 2020
002b543
Merge branch '5.0'
javiereguiluz Apr 1, 2020
5577f7b
Tag name updated
silverbackdan Apr 1, 2020
342ef4d
minor #13473 Tag name updated (silverbackdan)
javiereguiluz Apr 1, 2020
bda5d02
Merge branch '4.4' into 5.0
javiereguiluz Apr 1, 2020
8002191
Merge branch '5.0'
javiereguiluz Apr 1, 2020
2f2cf6b
Missing closing tag for endblock.
shambhu384 Apr 1, 2020
c0d7f8c
minor #13476 Missing closing tag for endblock. (shambhu384)
javiereguiluz Apr 2, 2020
4befbb3
Merge branch '4.4' into 5.0
javiereguiluz Apr 2, 2020
c533327
Merge branch '5.0'
javiereguiluz Apr 2, 2020
13a92be
Fixes wrong tag for RouteLoaderInterface registration without autocon…
pounard Apr 2, 2020
4cc5294
minor #13478 Fixes wrong tag for RouteLoaderInterface registration wi…
javiereguiluz Apr 2, 2020
4c8a390
Merge branch '4.4' into 5.0
javiereguiluz Apr 2, 2020
4af7cd1
Merge branch '5.0'
javiereguiluz Apr 2, 2020
30c9f4b
fix displaying `empty_data` option for hidden field
osavchenko Apr 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 18 additions & 3 deletions .doctor-rst.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,22 @@ rules:
valid_inline_highlighted_namespaces: ~
indention: ~
unused_links: ~
yaml_instead_of_yml_suffix: ~
extend_abstract_controller: ~
# no_app_bundle: ~

# 3.4
# master
versionadded_directive_major_version:
major_version: 3
major_version: 5

versionadded_directive_min_version:
min_version: '3.0'
min_version: '5.0'

deprecated_directive_major_version:
major_version: 5

deprecated_directive_min_version:
min_version: '5.0'

# do not report as violation
whitelist:
Expand All @@ -67,8 +76,14 @@ whitelist:
- '.. versionadded:: 1.11' # MakerBundle
- '.. versionadded:: 1.3' # MakerBundle
- '.. versionadded:: 1.8' # MakerBundle
- '.. versionadded:: 1.6' # Flex in setup/upgrade_minor.rst
- '0 => 123' # assertion for var_dumper - components/var_dumper.rst
- '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
- '123,' # assertion for var_dumper - components/var_dumper.rst
- '"foo",' # assertion for var_dumper - components/var_dumper.rst
- '$var .= "Because of this `\xE9` octet (\\xE9),\n";'
- "`Deploying Symfony 4 Apps on Heroku`_."
- ".. _`Deploying Symfony 4 Apps on Heroku`: https://devcenter.heroku.com/articles/deploying-symfony4"
- "// 224, 165, 141, 224, 164, 164, 224, 165, 135])"
- '.. versionadded:: 0.2' # MercureBundle
- 'provides a ``loginUser()`` method to simulate logging in in your functional'
54 changes: 27 additions & 27 deletions _build/maintainer_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ original contributor.
$ cd symfony-docs/

# make sure that your local branch is updated
$ git checkout 3.4
$ git checkout 4.4
$ git fetch upstream
$ git merge upstream/3.4
$ git merge upstream/4.4

# merge any PR passing its GitHub number as argument
$ gh merge 11159
Expand All @@ -153,20 +153,20 @@ the ``-s`` option:

.. code-block:: terminal

# e.g. this PR was sent against 'master', but it's merged in '3.4'
$ gh merge 11160 -s 3.4
# e.g. this PR was sent against 'master', but it's merged in '4.4'
$ gh merge 11160 -s 4.4

Sometimes, when changing the branch, you may face rebase issues, but they are
usually simple to fix:

.. code-block:: terminal

$ gh merge 11160 -s 3.4
$ gh merge 11160 -s 4.4

...

Unable to rebase the patch for <comment>pull/11183</comment>
The command "'git' 'rebase' '--onto' '3.4' '4.4' 'pull/11160'" failed.
The command "'git' 'rebase' '--onto' '4.4' '5.0' 'pull/11160'" failed.
Exit Code: 128(Invalid exit argument)

[...]
Expand All @@ -183,7 +183,7 @@ usually simple to fix:

# Lastly, re-run the exact same original command that resulted in a conflict
# There's no need to change the branch or do anything else.
$ gh merge 11160 -s 3.4
$ gh merge 11160 -s 4.4

The previous run had some conflicts. Do you want to resume the merge? (Y/n)

Expand All @@ -195,29 +195,29 @@ Step 3: Merge it into the other branches

If a PR has not been merged in ``master``, you must merge it up into all the
maintained branches until ``master``. Imagine that you are merging a PR against
``3.4`` and the maintained branches are ``3.4``, ``4.4`` and ``master``:
``4.4`` and the maintained branches are ``4.4``, ``5.0`` and ``master``:

.. code-block:: terminal

$ git fetch upstream

$ git checkout 3.4
$ git merge upstream/3.4
$ git checkout 4.4
$ git merge upstream/4.4

$ gh merge 11159
$ git push origin
$ git push upstream

$ git checkout 4.4
$ git merge upstream/4.4
$ git merge --log 3.4
$ git checkout 5.0
$ git merge upstream/5.0
$ git merge --log 4.4
# here you can face several errors explained later
$ git push origin
$ git push upstream

$ git checkout master
$ git merge upstream/master
$ git merge --log 4.4
$ git merge --log 5.0
$ git push origin
$ git push upstream

Expand Down Expand Up @@ -247,26 +247,26 @@ When updating your local branches before merging:
.. code-block:: terminal

$ git fetch upstream
$ git checkout 3.4
$ git merge upstream/3.4
$ git checkout 4.4
$ git merge upstream/4.4

It's possible that you merge a wrong upstream branch unawarely. It's usually
easy to spot because you'll see lots of conflicts:

.. code-block:: terminal

# DON'T DO THIS! It's a wrong branch merge
$ git checkout 3.4
$ git merge upstream/4.4
$ git checkout 4.4
$ git merge upstream/5.0

As long as you don't push this wrong merge, there's no problem. Delete your
local branch and check it out again:

.. code-block:: terminal

$ git checkout master
$ git branch -D 3.4
$ git checkout 3.4 upstream/3.4
$ git branch -D 4.4
$ git checkout 4.4 upstream/4.4

If you did push the wrong branch merge, ask for help in the documentation
mergers chat and we'll help solve the problem.
Expand All @@ -278,9 +278,9 @@ When merging things to upper branches, most of the times you'll see conflicts:

.. code-block:: terminal

$ git checkout 4.4
$ git merge upstream/4.4
$ git merge --log 3.4
$ git checkout 5.0
$ git merge upstream/5.0
$ git merge --log 4.4

Auto-merging security/entity_provider.rst
Auto-merging logging/monolog_console.rst
Expand Down Expand Up @@ -314,13 +314,13 @@ were modified by the PR but no longer exist in newer branches:

.. code-block:: terminal

$ git checkout 4.4
$ git merge upstream/4.4
$ git merge --log 3.4
$ git checkout 5.0
$ git merge upstream/5.0
$ git merge --log 4.4

Auto-merging translation/debug.rst
CONFLICT (modify/delete): service_container/scopes.rst deleted in HEAD and
modified in 3.4. Version 3.4 of service_container/scopes.rst left in tree.
modified in 4.4. Version 4.4 of service_container/scopes.rst left in tree.
Auto-merging service_container.rst

If the contents of the deleted file were moved to a different file in newer
Expand Down
Loading