Merge branches #5816
8000
Merged
Merge branches #5816
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR was squashed before being merged into the 2.6 branch (closes symfony#5572). Discussion ---------- 4668 document isCsrfTokenValid | Q | A | ------------- | --- | Doc fix? | yes | New docs? | yes | Applies to | 2.6 | Fixed tickets | symfony#4668 See original PR symfony#5325 for comments. Commits ------- 11383f8 4668 document isCsrfTokenValid
…icolas-grekas) This PR was merged into the 2.6 branch. Discussion ---------- Fix missing note about debug.dump_destination | Q | A | ------------- | --- | Doc fix? | yes | New docs? | yes | Applies to | all | Fixed tickets | symfony#5275 Commits ------- dae2811 Fix missing note about debug.dump_destination
Conflicts: components/var_dumper/introduction.rst
|
Seems like "Fix missing ntoe about debug.dump_destination" isn't included in the diff |
|
Thanks Christian - I'm not too concerned about the specific commits - the diff looks good, so 👍 |
weaverryan
added a commit
that referenced
this pull request
Nov 5, 2015
This PR was merged into the 2.7 branch. Discussion ---------- Merge branches | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | 2.7+ | Fixed tickets | Merges some commits that have been done in the `2.6` branch after we stopped support for that version. Commits ------- ab19cfb fix code block syntax 0ed7d99 Merge remote-tracking branch 'upstream/2.6' into merge-branches 149576e feature #5310 Fix missing note about debug.dump_destination (nicolas-grekas) f67c353 [#5572] Fix syntax 85dc294 feature #5572 4668 document isCsrfTokenValid (snoek09) 11383f8 4668 document isCsrfTokenValid dae2811 Fix missing note about debug.dump_destination
wouterj
added a commit
that referenced
this pull request
Apr 18, 2016
This PR was submitted for the 3.0 branch but it was merged into the 2.3 branch instead (closes #6479).
Discussion
----------
Update php.rst
The latest version of Assetic is compatible with Jsqueeze 2.x, so we do not need the version constraint any more
Commits
-------
3ae6616 Update php.rst
a9c9865 Merge branch '2.8' into 3.0
5726c9b minor #6471 fix broken merge (xabbuh)
5ba5224 fix broken merge
ffb40b9 Merge branch '2.8' into 3.0
164db85 Merge branch '2.7' into 2.8
351f796 Merge branch '2.3' into 2.7
b7c70e6 Merge branch '2.8' into 3.0
cba307c Merge branch '2.7' into 2.8
0d71b6c Fixing bad conflict fix
28e6be5 [#6449] Removing choices_as_values on merge
84dbdca Merge branch '2.8' into 3.0
cf17c2c Merge branch '2.7' into 2.8
fb09632 Merge branch '2.8' into 3.0
9b0ec35 Merge branch '2.3' into 2.8
07e8f68 Merge branch '2.3' into 2.7
7b036f8 minor #6449 [Form] fixed ChoiceType example in CollectionType (HeahDude)
60ca906 bug #6439 Fix form/validation directory path (nemo-)
3d26303 Fix form/validation directory path
069bffb minor #6423 Added a caution note about REMOTE_USER and user impersonation (javiereguiluz)
fd7b6b1 minor #6457 Fixed an array notation in comment (serializer.rst) (iltar)
78ddfef Fixed an array notation in comment (serializer.rst)
e4650a5 Added March changelog
d380d37 Merge branch '2.8' into 3.0
501c208 Added March changelog
63ee83e Merge branch '2.7' into 2.8
f69cdb8 Added March changelog
f947c8c Merge branch '2.3' into 2.7
80c26c1 [Form] fixed ChoiceType example in CollectionType
fe40a49 minor #6432 fixed yaml config error (RickieL)
6c42309 fixed yaml config error
fbcfbb4 Fixed a path
d0c9ad9 Added a caution note about REMOTE_USER and user impersonation
5928110 minor #6409 Update 'date' to DateType::class in form.rst (iltar)
31c49b8 Merge branch '2.8' into 3.0
6fb77fb Merge branch '2.7' into 2.8
88f0238 Merge branch '2.3' into 2.7
23abecc Update 'date' to DateType::class in form.rst
d2b6569 Merge branch '2.8' into 3.0
a064e17 Merge branch '2.7' into 2.8
cedeaa5 Merge branch '2.3' into 2.7
66051f7 minor #6399 Fixed wrong code examples for Isbn constraint (AAstakhov)
503c07c Fixed wrong code examples for Isbn constraint
8666655 minor #6390 Reworded the example about $deep param (Oliboy50, javiereguiluz)
c9b54db minor #6381 [Form] [Cookbook] Correctly setup unit tests with dependencies (corphi)
fba2da2 Calling the parent implementation is mandatory.
09bc39e Reworded the example about $deep param
b20e1ca bug #6377 Update "bootstrap.php.cache" to "autoload.php" (guilliamxavier)
c0a441e bug #6368 [cookbook] Made list of form types more consistent (AAstakhov)
e7246b6 Merge branch '2.3' into 2.7
11e80c9 bug #6347 Add a note about enabling DebugBundle to use VarDumper inside Symfony (martijn80, javiereguiluz)
00bc64c Add a note about enabling DebugBundle to use VarDumper inside Symfony
2c79c08 Update introduction.rst
01b2cd9 bug #6320 Fixed typo in path (timhovius)
ff32bd8 Changed folder name to lowercase (best practises)
a66c49a Fixed typo in path
24c2404 feature #6274 Update Doctrine UTF8 docs (mcfedr)
aa6fb92 Update "bootstrap.php.cache" to "autoload.php"
993fc45 Made list of types more consistent
f24b8f8 Merge branch '2.8' into 3.0
e87e9ee Merge branch '2.7' into 2.8
82ba7db Merge branch '2.3' into 2.7
2e03a7e minor #6350 Fix reference to app folder (kainjow)
68650b8 Fix reference to app folder
a84b2c5 minor #6331 Rename DunglasApiBundle to ApiPlatform (sroze)
a297099 Merge branch '2.8' into 3.0
01133fd Merge branch '2.7' into 2.8
60cd462 Merge branch '2.3' into 2.7
a99cc60 minor #6330 [Form] reorder EntityType options (HeahDude)
dcd1126 Update Doctrine UTF8 docs
230b4f6 Merge branch '2.8' into 3.0
d85f13a Merge branch '2.7' into 2.8
79e0d0d Merge branch '2.3' into 2.7
2f9866c [#6282] Removing PropertyPath as type and clarifying last sentence
9d00f0b feature #6282 [Form] fix `choice_label` values (HeahDude)
f82b32e [HttpFoundation] ParameterBag::get() $deep param
896b8a6 Rename DunglasApiBundle to ApiPlatform
30a1495 [Form] reorder EntityType options
73f1935 [Form] fix `choice_label` values
ab4bfe5 Merge branch '2.8' into 3.0
8e59931 Merge branch '2.7' into 2.8
0e56ff9 [#6273] Proofread of the new PHPUnit Bridge docs
4decfa9 feature #6273 [PHPUnit bridge] Add documentation for the component (theofidry)
6a1d886 [PHPUnit bridge] Add documentation for the component
41393d9 Added February changelog
9b0dccf Merge branch '2.8' into 3.0
778a7f9 Fix faulty merge
11eb093 Added February changelog
8e08e35 Merge branch '2.7' into 2.8
29567b1 Added February changelog
c39afa3 Merge branch '2.3' into 2.7
0f32eef bug #6322 [DependencyInjection] fix autowiring docs (eXtreme)
28082dc minor #6323 [DependencyInjection] Add Autowiring keyword (theofidry)
2fe8c61 minor #6325 Minor error (ThomasLandauer)
276e38d Minor error
2881fb6 Merge branch '2.3' into 2.7
88052f7 minor #6311 Improved TwigExtension to show default values and optional arguments (javiereguiluz)
7874bd0 minor #6286 [HttpFoundation] Fix typo for ParameterBag getters - 3.0 (rendler-denis)
e29233c bug #6324 Fixed UserCheckerInterface importing (VIs-a-vis)
25b3aed Update user_checkers.rst
fb4c526 bug #6326 Missing svn:ignore (f-plante)
1a6e4c5 Missing svn:ignore
bfc7976 Add Auto-wiring keyword
bcba4f4 Remove "paamayim nekudotayim" breaking configuration blocks in DI autowiring docs
00abe12 Improved TwigExtension to show default values and optional arguments
581f46c minor #6299 Removed True and False constraints from reference (edefimov)
dcb5a54 Removed True and False constraints from reference
a499d12 minor #6298 Update dependency_injection.rst because it has an error. (joserprieto)
06eee41 Update dependency_injection.rst because it has an error.
8222639 bug #6292 Fix setting permission for var subdirectories (voda)
657ba99 Merge branch '2.8' into 3.0
3d3bac0 [#6263] Javier's comments
11e4532 minor #6263 [Cookbook][Debugging] reflect behavior changes in cache generation (xabbuh)
60a10e8 feature #6172 move assets options from templating to assets section and add base_path documentation (snoek09)
2a905d8 small fixes for xml configuration examples
5d06eb5 document base_path option
cc12d7f change order of assets configuration options
dbee0df Fix setting permission for var subdirectories
479ac7b Merge branch '2.3' into 2.7
c440050 [HttpFoundation] Fix typo for ParameterBag getters
80cfcff minor #6280 Fix syntax of Company class example (cakper)
7e621a8 Fix syntax of Company class example
61403e7 remove unused reference
5969b80 move packages and base_urls to assets section remove templating config from examples put anchor back
8fe4609 minor #6277 remove dot in front of colon (xabbuh)
61ef5bb remove dot in front of colon
46156f4 put anchor back
6be4c20 minor #6260 add missing options `choice_value`, `choice_name` and `choice_attr` to `EntityType` (HeahDude)
bc70d00 minor #6262 [Form] reorder options in choice types references (HeahDude)
6ef2099 reflect behavior changes in cache generation
3eda649 reorder options in choice types references
9785f08 add missing options `choice_value`, `choice_name` and `choice_attr` to `EntityType`
4924513 minor #6257 [Components][Form] remove outdated caution (xabbuh)
aa33bfa [Components][Form] remove outdated caution
0103364 [#6032] fix link to ROT13 description
6b3f5f4 Merge branch '2.8' into 3.0
c00626c Merge branch '2.7' into 2.8
ebe0724 Merge branch '2.3' into 2.7
d1e3024 [#6032] some tweaks for the autowiring feature
fb7f15e feature #6032 [DependencyInjection] Autowiring doc (dunglas)
995bd4f [DependencyInjection] Autowiring doc
bef2b66 feature #6233 Document translation_domain for choice fields (merorafael, WouterJ)
be7efd6 minor #6253 [Security] Include guard firewall configuration sample. (calinpristavu)
63c57dd [Security] Include guard firewall configuration sample.
f0c0fac feature #5886 [2.8] Add "How to Use Multiple Guard Authenticators" cookbook documentation (mheki)
121196d [2.8] Add "How to Use Multiple Guard Authenticators" cookbook documentation
0cbea24 minor #6249 [Cookbook][Serializer] fix wording (xabbuh)
cf9ce3d Merge branch '2.8' into 3.0
a447862 Merge branch '2.7' into 2.8
7cfbb2f Merge branch '2.3' into 2.7
5dcca79 [Cookbook][Serializer] fix wording
b986eb1 minor #6242 Removed all 2.x versionadded directives (WouterJ)
f8b560d Removed all 2.x versionadded directives
11f1564 minor #6245 [Cookbook][Console] change API doc class name (xabbuh)
c2a0f39 [Cookbook][Console] change API doc class name
3d7838b Merge branch '2.3' into 2.7
d9f6264 Merge branch '2.8' into 3.0
7ede792 Merge branch '2.7' into 2.8
5331783 [#6243] Add versionadded directive
2e2c245 feature #6243 Add missing getBoolean() method (bocharsky-bw)
cb8f241 Add missing getBoolean() method
811671d Merge branch '2.8' into 3.0
52f14f8 Merge branch '2.7' into 2.8
319998d Merge branch '2.3' into 2.7
266f7bf Fix syntax
fe1dfc7 Merge branch '2.8' into 3.0
1d1ec81 Merge branch '2.7' into 2.8
b3f3d9f Fix syntax
fc3c9f3 Merge branch '2.7' into 2.8
79995ee Merge branch '2.3' into 2.7
026d9ed Added January changelog
f91bcef Merge branch '2.8' into 3.0
9fcd140 Added January changelog
2651431 Merge branch '2.7' into 2.8
03e3259 Added January changelog
ff748f6 Merge branch '2.3' into 2.7
4ffe998 Added December changelog
cdb8b24 Merge branch '2.8' into 3.0
eb1c1ae Added December changelog
f1ba10e Merge branch '2.7' into 2.8
a5055a5 Added December changelog
6544665 Merge branch '2.3' into 2.7
35a520d [#6090] some small tweaks
bcc1cc4 minor #6090 Reworded the article about profiler storage (xavierleune, javiereguiluz)
3165c70 minor #6241 [ExpressionLanguage] Add caution about backslash handling (zerustech, WouterJ)
99c8abe minor #6235 #6232 update forms as services section (backbone87)
be54971 #6232 update forms as services section
31d74e5 Add a caution about backslash escaping
07f8e40 [components][expression_language] Add doc for backslashes
dd8585d [#5330] some tweaks
47f6b3b feature #5530 [Cookbook, Security] Added user_checkers.rst (iltar)
89b20a8 [Cookbook, Security] Added user_checkers.rst
2c9b1ec Merge branch '2.8' into 3.0
fe2e8e7 Merge branch '2.7' into 2.8
309d29f Merge branch '2.3' into 2.7
47704a7 minor #6237 use literals for external class names (xabbuh)
0baa317 use literals for external class names
a1d0353 minor #6206 add separate placeholder examples for birthday, datetime and time type (snoek09)
70852c8 add separate placeholder examples for birthday, datetime and time type
16cc4bc Merge branch '2.8' into 3.0
b56880b Merge branch '2.7' into 2.8
d1e109e Merge branch '2.3' into 2.7
4b92e88 Document translation_domain setting for choice fields
92998d8 translation_domain doc fix
2fa2386 choice_translation_domain doc fix
3ad5111 Travis fix
5957927 Update entity.rst
075a81d feature #5920 Document automatic registration of extension compiler passes (WouterJ)
353df25 Document automatic registration of extension compiler passes
383401d [#6077] Fix code to not use deprecated classes
fc041c5 feature #6077 fixes #5971 (vincentaubert)
e901fbc bug #6081 [cookbook New project] Fix symfony version and initial add (bigs21)
41d43dd feature #5483 [FrameworkBundle] Name converter of Serializer (dunglas)
7a4d9fc [FrameworkBundle] Name converter of Serializer
e821b97 feature #6058 Update Testing Form Types article for 2.8 refactorings (WouterJ)
906d55a Update Testing Form Types article for 2.8 refactorings
53febf0 minor #6044 Added note about the hash_equals polyfill (WouterJ)
946c5c2 Added note about the hash_equals polyfill
a31dcc0 feature #5642 Documented label_format option (WouterJ)
f42057a Merge branch '2.8' into 3.0
0d92394 Merge branch '2.7' into 2.8
129d853 Merge branch '2.3' into 2.7
8e8144f minor #6213 Update form_collections.rst (insekticid)
bb96dc6 Update form_collections.rst
26d8f84 minor #6220 [book] fixes typo about redirect status codes in the controller chapter. (hhamon)
f7adcfa minor #6228 removed unnecessary exception from repository (gondo)
0e288a2 removed unnecesary exception form repository
ab57eed minor #6170 change translation getMessages() to getCatalogue() (snoek09)
06ca405 change translation getMessages() to getCatalogue()
06c76aa minor #6211 Remove 2.3.* from composer snippets in the form component doc (Nicofuma)
97ef850 Remove 2.3.* from composer snippets in the form component doc
41e4f30 minor #6225 [Reference][Forms] add versionadded directive for range type (xabbuh)
211f3a6 add versionadded directive for range type
ce45b71 [book] fixes typo about redirect status codes in the controller chapter.
03c6605 Merge branch '2.8' into 3.0
cf0a650 fixes #5971
bce32e2 minor #6199 fix types (garak)
fcdb82b fix types
372704b Revert "revert form login CSRF changes on wrong branch"
3d1e8a7 Merge branch '2.7' into 2.8
f1c30e4 minor #6207 revert form login CSRF changes on wrong branch (xabbuh)
3a2a714 revert form login CSRF changes on wrong branch
beb0d3a Merge branch '2.8' into 3.0
53726dd Merge branch '2.7' into 2.8
c0d1ed1 Merge branch '2.3' into 2.7
4cf2d0b [#6174] tweak the event description
282fd8a feature #6174 Missing reference docs for kernel.finish_request event (acrobat)
50c3fb2 [#6204] fix CS
50286bc minor #6204 Expected: semicolon (cn007b)
ab2f9aa Expected: semicolon
aad2b89 Missing reference docs for kernel.finish_request event
52cd29b minor #6147 Update templating.rst - Asset absolute url fix (gbalcewicz)
bf5de47 Update templating.rst
b385935 minor #6182 Latest demo has no bin folder (Jace25)
8b31d63 Merge branch '2.8' into 3.0
15003d8 Merge branch '2.7' into 2.8
21b8d85 Merge branch '2.3' into 2.7
9944eca Latest demo has no bin folder
ac0fdbc Documented label_format option
cd0efed [WIP] moving assets version and version_format options under assets section
8966d40 minor #6160 remove versionadded for unmaintained versions (xabbuh)
8e91949 minor #6166 Fix by_reference deprecated FormType::class (nemo-)
dac0664 minor #6162 [Reference] add missing version number (xabbuh)
5d1806e Fix by_reference deprecated FormType::class
c97d5bf Merge branch '2.8' into 3.0
62a8755 minor #6082 change app/check.php for 3.0 (nanocom)
f398b03 Merge branch '2.7' into 2.8
e9e5b9c minor #6149 Reference to session + Corrected sample code char (sfdumi)
fc32f7f Reference to session + Corrected sample code char
b3eac88 Merge branch '2.3' into 2.7
60e1d0d [Reference] add missing version number
2eeb2df remove versionadded for unmaintained versions
f31a965 Merge branch '2.8' into 3.0
f792232 Merge branch '2.7' into 2.8
f355248 Merge branch '2.3' into 2.7
2d31a0f minor #6130 [Security][Guard] Completed start method signature (jeremyFreeAgent)
b6b6a39 [Security][Guard] Completed start method signature
24e2da6 minor #6080 Removed doc about getting original parameter value from ParameterBag (edefimov)
1e1ecc4 Removed doc about getting original parameter value from ParameterBag
14d2afb feature #6136 Update directory permissions to make var/ writable (andrerom)
559748b bug #6152 csrf_token_generator and csrf_token_id documentation (Raistlfiren, Aaron Valandra, xabbuh)
304d7a5 finish csrf_token_generator and csrf_token_id docs
3ceb61c Improper markdown for versionadded.
91b5e2e Updated documentation as requested by @stof and @xabbuh
0044aa2 Updated csrf_in_login_form.rst to include csrf_token_id and csrf_token_generator
61a4ae4 feature #5600 [DependencyInjection] Documented the ability of define the service decoration priority (dosten)
1c1c0e4 [#6108] remove remaining references to getName()
2bc4f55 minor #6108 [Form] remove the getName() function as it is deprecated (aybbou)
8815552 minor #6100 [Cookbook][Security] add back updateUserSecurityIdentity() hint (xabbuh)
c77773a minor #6129 Added new links to the Symfony screencast series at KnpU (javiereguiluz)
8f6038b minor #6139 Update the doc to change a deprecated use case (ChristopheBoucaut)
ced63f2 Update the doc to change a deprecated use case
d04cb14 minor #6133 fixed the component name (fabpot)
d6456ad Update dir permissions to reflect var being writable
f18a1aa Update directory permissions to make var/ writable
d930d1d fixed the component name
6ea7370 Added new links to the Symfony screencast series at KnpU
2db6e18 Merge branch '2.8' into 3.0
84ded6c Merge branch '2.7' into 2.8
ca8916c remove trailing whitespace
b9d6dc6 remove doubled colon from label
a1ac75e Merge branch '2.3' into 2.7
66b2469 Merge branch '2.8' into 3.0
b602b9c Merge branch '2.7' into 2.8
f4c88fd Merge branch '2.3' into 2.7
e9a92af [#6120] remove unneeded link to readme file
3775fc0 Merge branch '2.8' into 3.0
be32e96 minor #6120 fix README requirements link (garak)
f95ca48 Merge branch '2.7' into 2.8
c441f6d [#6120] version specific readme requirements link
bfbe593 Merge branch '2.3' into 2.7
fb5ad59 minor #6121 [MicroKernel] Fixed the display of a code block (jeremyFreeAgent)
acbadd2 [MicroKernel] Fixed the display of a code block
35c2b00 fix README requirements link
9df83c0 Merge branch '2.8' into 3.0
32eddf7 Merge branch '2.7' into 2.8
a48c537 Merge branch '2.3' into 2.7
6005584 Merge branch '2.3' into 2.7
bd29146 bug #6115 [Form] Fix syntax error in code snippet (valisj)
75edc24 [Form] Fix syntax error in code snippet
c7767ad Merge branch '2.8' into 3.0
172b72b Merge branch '2.7' into 2.8
f3f9339 minor #6111 Fixed a typo in the choice_label code example (ferdynator)
7f25299 Fixed a typo in the choice_label code example
5aa34c7 minor #6110 [Security][Guard] Fixed a typo (jeremyFreeAgent)
3f7191f minor #6105 Removed deprecated methods from VoterInterface (edefimov)
051f050 [Security][Guard] Fixed a typo
5868190 Documented the ability of define service decoration priority
2d72f3e [Form] remove the getName() function as it is deprecated
6eeb61e Merge branch '2.8' into 3.0
889db17 minor #6106 Remove repetition in text (dominikhajduk)
10ae1f0 Merge branch '2.7' into 2.8
9718832 Merge branch '2.3' into 2.7
fcbcf1c Remove repetition in text
874c840 Removed deprecated methods from VoterInterface
466e404 add back updateUserSecurityIdentity() hint
46ff6f1 minor #6014 [2.8][Form] entry_type option: replace "in favor" misuses (ogizanagi)
8774f7d minor #6013 [2.7][Form] placeholder option: replace "in favor" misuses (ogizanagi)
6077f91 [Form] entry_type option: replace "in favor" misuses
7e5b7f1 [Form] placeholder option: replace "in favor" misuses
64f8a1e Merge branch '2.8' into 3.0
ddd3478 Merge branch '2.7' into 2.8
86901d8 Merge branch '2.3' into 2.7
a23e753 feature #5906 Added documentation for choice_translation_domain option (peterrehm)
d2f58e0 feature #6017 Documented the Symfony Console Styles (javiereguiluz)
ab19079 Documented the Symfony Console Styles
3a7624f minor #5586 [2.8] Remove 2.6 versionaddeds as version reached eom (WouterJ)
bcbb87f Fixed the Symfony version number
bcc5634 Finished the rewording of the "profiler storage" article
83e73c2 [#6086] Use a more generic wording to avoid errors in the future
4b30758 bug #6086 Update form_customization.rst (vudaltsov)
36d9470 Update form_customization.rst
1f5ee01 change app/check.php for 3.0
6b6ac3d Fix symfony version and initial add
ae53c89 Merge branch '2.8' into 3.0
cf2fb97 Merge branch '2.7' into 2.8
b163920 Merge branch '2.3' into 2.7
92610e3 [#5993] fix doubled "interface"
02db120 minor #5993 [Cookbook] [Security] Use UserLoaderInterface instead of UserProviderInterface (ogizanagi)
afcbc51 minor #6071 Fix syntax (WouterJ)
eb6ce36 Fix syntax
f625981 minor #6066 Update location of `app/check.php` to `bin/symfony_requirements` (Kevinrob)
b3368c2 minor #6067 improve phrasing (greg0ire)
89bd7db improve phrasing
d33d77a Update location of `app/check.php` to `bin/symfony_requirements`
ec5671d Merge branch '2.8' into 3.0
e67deaa Merge branch '2.7' into 2.8
b94fc35 Merge branch '2.3' into 2.7
79ec09a [Cookbook] [Security] Use UserLoade
6D40
rInterface instead of UserProviderInterface
691616c Remove 2.6 versionaddeds as version reached eom
3b2f4d0 [#5966] Removed no longer used ref target
2648a7d feature #5966 Remove deprecated StringUtils from WSSE custom auth provider (pimpreneil)
786096e Update Symfony version to 3.0
bfc54c6 Merge branch '2.8' into 3.0
fac6023 [#5662] Update versions to 2.8
58979a2 Merge branch '2.7' into 2.8
9fe5455 minor #5662 Fixed wrong version of symfony with composer install (Nek-)
43f4125 Added documentation for choice_translation_domain option
4cd6dc2 Merge branch '2.8' into 3.0
b2b1239 Merge branch '2.7' into 2.8
d782c4b Merge branch '2.3' into 2.7
a5114d2 feature #5977 RequestStack parameter is required since 3.0 (leunggamciu)
cb54c5e RequestStack parameter is required since 3.0
de11d3e minor #6027 Update guard-authentication.rst (rvanginneken)
e23f2d4 minor #6025 Update guard-authentication.rst (rvanginneken)
a6ed958 minor #6038 Fix #6037 (zsturgess)
a7effb8 Fix #6037
7c60ea1 Merge branch '2.8' into 3.0
5275cfb Merge branch '2.7' into 2.8
af28636 Merge branch '2.3' into 2.7
a46a856 Update guard-authentication.rst
77999b2 Update guard-authentication.rst
32a63d8 ProfilerStorage configuration
168072b [#5973] some minor tweaks
433dd04 Added caution notes about the removal of AsseticBundle in 2.8/3.0
3ad7f26 Merge branch '2.8' into 3.0
7d0a00a Merge branch '2.7' into 2.8
9de5e2c Merge branch '2.3' into 2.7
744bed4 Merge branch '2.8' into 3.0
43b0eb8 Merge branch '2.7' into 2.8
a111d03 Merge branch '2.3' into 2.7
10b2a29 minor #6004 Fix for small typo (djoos)
9e64dd4 Fix for small typo
de7c9e7 bug #6001 Fix class name (BlueM)
b0772c0 Fix class name
276aa1f Added october and november changelog
55a015e Merge branch '2.8' into 3.0
2aeffdf Added october and november changelog
9c264b5 Merge branch '2.7' into 2.8
99975aa Added october and november changelog
303a593 Merge branch '2.3' into 2.7
099ea85 Remove deprecated StringUtils from WSSE custom auth provider
2ad1ba5 [#5954] minor tweaks
d58cb56 feature #5954 Fix #5236 [2.8][Translation] specify additional translation loading paths (Pierre Maraitre, Balamung)
e19f7a1 [#5957] remove deep parameter documentation
bf48c59 Merge branch '2.8' into 3.0
63dd246 Merge branch '2.7' into 2.8
03aa3d9 minor #5957 mark deep option as deprecated (snoek09)
7186d17 minor #5943 Add tip for when returning `null` from `createToken()` (jeroenseegers)
1337b31 Add caution when returning null from createToken()
5568146 minor #5940 [Cookbook][ServiceContainer] move filename comment to the top of the code block (xabbuh)
7d922b9 [#5956] change app/console back to bin/console
dcde292 Merge branch '2.8' into 3.0
00dc17c Merge branch '2.7' into 2.8
4ee6cb2 [#5956] change bin/console to app/console
30f9dfa minor #5956 Update security.rst (mpaquet)
e96416b Update security.rst
8d21262 Merge branch '2.8' into 3.0
78d11d8 Merge branch '2.7' into 2.8
6971a77 Merge branch '2.3' into 2.7
ecc2ca0 minor #5964 Missing n in Column (joshuataylor)
bc2447d Missing n in Column
46de0d6 Delete pmaraitre.xml
b3fa941 Adding configuration examples for other formats
2cabebe Replace with a shorter phrase
e6ead2b [#5948] Removed caution about 5.3.6 as 5.3.9 is required
8c17033 [#5948] Very minor detail
7a64f05 feature #5948 Update 3.0 docs accordingly to min PHP version requirement (ogizanagi)
bc8293b mark deep option as deprecated
0d8eadc Wrong code-block tag
c220cd0 Clearer formulation
40b7b78 Double "the"
f87f5f4 Fix #5236 [Translation] specify additional translation loading paths
09d9b29 minor #5924 Removed note about removed content (WouterJ)
d577848 Update docs accordingly to min PHP version requirement
d0248d6 minor #5938 Add proper use of the password type (themccallister)
7bd1f22 Add proper use of the password type
1646405 Merge branch '2.3' into 2.7
d5d68ab move filename comment to the top of the code block
340ec5f Adding a note thanks to Stof
3083e90 [#5917] Finding some more places with the old directory structure referenced
0e53bb5 [#5917] Adding bin
89f4d25 feature #5917 [3.0][Cookbook] Use the 3.0 directory structure (WouterJ)
8236647 feature #5916 [3.0][Best Practices][Quick Tour] Use the 3.0 directory structure (WouterJ)
dbf0d31 feature #5913 [3.0][Book] Use the 3.0 directory structure (WouterJ)
2daccc3 Merge branch '2.8'
8d61eb6 Merge branch '2.7' into 2.8
7b4c2b0 Merge branch '2.3' into 2.7
40a52c8 feature #5907 Updating some places to use the new CustomUserMessageAuthenticationException (weaverryan)
3d67202 tweaks thanks to the guys
1a27539 removing scope reference
3843cda removing deprecation note on a section that was removed
eff9733 removing more scope stuff
81c7572 Removed scopes article
35ae50c Merge branch '2.8'
4ad3bce Merge branch '2.7' into 2.8
d62fa0a Finding more old form references
7bb2785 Merge branch '2.8'
41670b0 [#5922] Tweaks thanks to reviewers
93a08f3 feature #5922 Added minimal cookbook article about the shared flag (WouterJ)
c36dc2a minor #5923 Remove information about request service deps of core services (WouterJ)
0dfc7bf feature #5908 Voter update (weaverryan)
31f6e3d Many tweaks thanks to a great review
3a59f72 feature #5909 More 2.8 form updates (weaverryan)
b094312 language tweak
8427c3d feature #5927 Use path() and url() PHP templating helpers (WouterJ)
757e159 feature #5926 Update voter section of best practices (WouterJ)
bb1a9b7 feature #5921 [2.8] Document some Security changes (WouterJ)
d131449 several other tweaks
feb68dd Completely updating the form type reference section for the text -> TextType changes
a4ad744 Use path() and url() PHP templating helpers
68da041 Update voter section of best practices
943ee0c Added minimal cookbook article about shared
eeb579c Remove note about request service, which is not used anymore
abad91d Removed note about removed content
179039b Remove information about request scpoe
0526ca0 Document deprecation of supports{Attribute,Class}() methods
22026ee Document Security key to secret renamings
4036d26 Use new Simple{Form,Pre}AuthenticatorInterface namespaces
25ae8c1 Applied suggestions
47e11f8 Applied comments
f2be12a Updated directory structures
df20095 Testing changes
ef613f6 app/SymfonyRequirements.php -> bin/SymfonyRequirements.php
af7052b app/bootstrap.php.cache -> var/bootstrap.php.cache
6614c0f app/logs -> var/logs
b3da3b7 app/cache -> var/cache
b6d93f0 app/phpunit.xml.dist -> phpunit.xml.dist
bea4a0c app/console -> bin/console
c6d436b [QuickTour] Use new directory structure
215c36d [BestPractices] Use new directory structure
ed43015 Prefix commands with 'php'
0d69414 Updating 'Exploring the Project'
6b5c977 app/bootstrap.php.cache -> var/bootstrap.php.cache
3318f2e app/(cache|logs) -> var/(cache|logs)
1461bdc app/phpunit.xml.dist -> phpunit.xml.dist
8794a4d app/console -> bin/console
5d0e6b2 tweaks thanks to Javier
a4c7d6e adding a section about calling isGranted() from within a voter
20cead6 Reworking the voter article for the new Voter class
832a12a fixing build error
3117df5 Another huge batch of changes for the form type changes in 2.8
4799a7c minor tweaks #5834
3ebf2d0 Fixing bad merge
9458a09 feature #5834 Updated form aliases to FQCNs for forms in book and component (hiddewie)
329182d Merge branch '2.7' into 2.8
7ca213a Merge remote-tracking branch 'origin/2.7' into 2.7
2409140 removing link to an old, non-existent article
f3a1355 feature #5265 Documentation for the new Guard authentication style (weaverryan)
51720c7 Many fixes thanks to great review from ogizanagi, javiereguiluz and others
1eb5f23 Updating some places to use the new CustomUserMessageAuthenticationException
5330c43 feature #5899 Adding the MicroKernel article (weaverryan)
e59d351 tweaks thanks to WouterJ and javiereguiluz
af97ce1 Merge branch '2.8'
5a361ee Merge branch '2.7' into 2.8
130e55b Merge branch '2.3' into 2.7
703abe3 minor #5896 [Book][Templating] Update absolute URL asset to match 2.7 (lemoinem)
e103627 Fixed wrong indendation
f8b080d Found more places which use old form types
3237a34 Updated form constant usage
3ab3830 Fixed PHP 5.5+ reference in form component
291a42a Fixed removed XML tag in form book
0820e69 Updated form aliases to FQCNs for forms in book and component
4752d4c adding one clarifying message
80c637d adding the MicroKernel article
9782ff1 adding toc entries
62dcae3 Using JsonResponse + cleanup
440fe6f revamping Guard article
bfce91b Fixing minor comments
9e411fe I'm extending the abstract class - so mention that. Also adding anonymous
ac107c7 WIP documentation for the new guard auth
f965e3a feature #5891 Removed the comments about the is_granted() issues in non-secure pages (javiereguiluz)
0e8b14e minor #5895 Update debug_formatter.rst (strannik-06)
44c8630 [Book][Templating] Update absolute URL asset to match 2.7
6d7c54e Update debug_formatter.rst
1361715 Removed the comments about the is_granted() issues in non-secure pages
e840343 Changing variable for clarity and removing unnecessary line break thanks to @OskarStark
c5fa409 fix thanks to Javier
96d8e4e feature #5876 Symfony 2.7 Form choice option update (aivus, althaus, weaverryan)
b55d170 typo!
70f5e85 tweaks thanks to comments
0ad7b18 fixing wrong image name
69fc3c3 removing scaling on images
a2ad990 fixing bad reference
7aa4106 Completely re-working all the choice docs, including screenshots - for 2.7 changes
79c905c changing option order - choice_name and choice_value seem like edge cases
68725e8 Fixed preferred choices example
e2dea88 Fixed linebreaking
889f123 Added choices_as_values description [amend]
e1f583b Added choices_as_values description
d3cf004 Added choice_loader basics
3763f71 Added basic choice type changes
fd35e21 Fix docs related with choice form type refactor
0061abe minor #5868 [2.8] Make screenshots with the new profiler/web dev toolbar design (WouterJ)
6b9ade3 minor tweaks
84202d6 feature #5861 Updated Table Console helper for spanning cols and rows (hiddewie)
267e898 Merge branch '2.8'
0f6fb0d Merge branch '2.7' into 2.8
d96d75e Merge branch '2.3' into 2.7
d01621d Remove hello_fabien.png as it's not used
59ac6e5 Make screenshots with the new profiler/web dev toolbar
7ea6441 Updated rowspan example to be more logical to humans
8465e85 Merge branch '2.8'
0b3985d Merge branch '2.7' into 2.8
261126b Merge branch '2.3' into 2.7
532b0a4 [#5835] Added versionadded
8f24268 feature #5835 Updated CssSelector code example to use the new Converter (hiddewie)
7c8d5d2 minor #5816 Merge branches (nicolas-grekas, snoek09, WouterJ, xabbuh)
62d9a15 minor #5807 Minor rewordings for the "deprecated" service option (javiereguiluz)
5494f15 feature #5804 Added documentation for dnsMessage option (BenjaminPaap)
567419a bug #5793 Callback Validation Constraint: Remove reference to deprecated option (ceithir)
25d459b minor #5780 Clarify when we are talking about PHP and Twig (carlos-granados)
bee9297 Clarify when we are talking about PHP and Twig
eabb982 minor #5731 [Cookbook][Security] update versionadded directive to match the content (xabbuh)
63e9824 minor re-wording
bc73643 minor #5363 Added description on how to enable the security:check command through… (bizmate)
ef3a7de Updated Table Console helper for spanning cols and rows
d8db51a Merge branch '2.8'
9068bc0 Merge branch '2.7' into 2.8
afffee6 Merge branch '2.3' into 2.7
cc10e47 Merge branch '2.3' into 2.7
9fa5033 minor #5852 Fix doc for 2.6+, `server:start` replace `...:run` (Kevinrob)
14d1577 Fix doc for 2.6+, `server:start` replace `...:run`
dfb9b16 Used :: for code block
df4fc7e Updated for CssSelectorConverter class name
9392f80 Updated CssSelector code example to use the new Converter
d85b865 minor #5797 [Process] use ProcessFailedException instead of RuntimeException. (aitboudad)
abc28e7 minor #5812 Remove duplicate and confusing info about testing error pages (carlos-granados)
4007ba1 Remove duplicate and confusing info about testing error pages
d83a2d8 minor #5822 Fixed a syntax issue (javiereguiluz)
f15a99a Fixed a syntax issue
67edbe2 Callback Validation Constraint: Remove reference to deprecated option
f7f9733 minor #5817 fix version for `entry_options` and `entry_type` (craue)
dc5a831 fixed version for `entry_options` and `entry_type`
ab19cfb fix code block syntax
0ed7d99 Merge remote-tracking branch 'upstream/2.6' into merge-branches
d7ae2a0 Merge branch '2.8'
e406c3b Merge branch '2.7' into 2.8
103def9 Merge branch '2.3' into 2.7
3c37397 Minor rewordings for the "deprecated" service option
e67beb2 Added missing comma after array element
368576b Fixed Yaml syntax
bffb90d Fixed all comments from @xabbuh
f5774d2 Changed 'in' to 'to' and removed 'composer'
8f00174 Merge remote-tracking branch 'remotes/upstream/2.7' into 2.7
4cc4bae Added documentation for dnsMessage option
71d51f8 Merge branch '2.8'
16ef37f [Process] use ProcessFailedException instead of RuntimeException.
f4ba8f1 Merge branch '2.7' into 2.8
61efc58 minor #5792 [Cookbook][EventDispatcher] fix build (xabbuh)
7ef7ba7 fix build
e4eca48 Merge branch '2.3' into 2.7
b785d35 Merge branch '2.8'
676c75f Merge branch '2.7' into 2.8
141caa2 Merge branch '2.3' into 2.7
9569e2d Merge branch '2.8'
2255de7 Removing getName() as it's not needed in 2.8
3787061 Merge branch '2.7' into 2.8
b6e61ca tweaks for 2.7
82d465a Merge branch '2.3' into 2.7
21931ed Fixing build error
61d904f feature #5051 Rename CollectionType entry options (WouterJ)
1b00278 Rename CollectionType entry options
2633b29 Merge branch '2.3' into 2.7
a0b06ae Merge remote-tracking branch 'origin/master'
622b149 Merge branch '2.7' into 2.8
2e8d0b7 Merge branch '2.3' into 2.7
b13593e Merge branch '2.8'
b03367c Merge branch '2.7' into 2.8
5b1b661 Merge branch '2.3' into 2.7
45381ac [#5623] don't configure default constraint message
f64d406 feature #5623 [Validator] added BIC validator (mvhirsch)
7911fe1 [Validator] added BIC validator
46096d3 Merge branch '2.8'
3da6681 Merge branch '2.7' into 2.8
804e04c Added September changelog
5bf2bf4 Merge branch '2.3' into 2.7
c9a4bbf [#5689] Some minor syntax fixes
44f8496 feature #5689 [DI] Add some documentation for the deprecation feature (Taluu)
1e1b036 [DI] Add some documentation for the deprecation feature
a6cbbb2 Revert "[#5771] remove another Response constant"
98967bf Revert "Remove not existing response constant"
e7f7391 Merge branch '2.3' into 2.7
0e3f25b Merge branch '2.8'
f8c9ce3 Merge branch '2.7' into 2.8
9b7fe51 Merge branch '2.3' into 2.7
6e8d5fc [#5761] add versionadded directive
5faa84c minor #5761 [DX] [Security] Renamed key to secret (SongoQ)
18c7f04 Remember me, Renamed key to secret
fdbc41c minor #5733 [Components][OptionsResolver] adding type hint to normalizer callback (xabbuh)
6468cd5 feature #5745 [Translation] Ability to format a message catalogue without actually writing it. (aitboudad)
d862ee8 minor #5561 Change default value of cookie_httponly (jderusse)
1b91720 Merge branch '2.8'
3ffe2e5 Merge branch '2.7' into 2.8
11033bd Merge branch '2.3' into 2.7
9231f92 [#5584] language tweak and XML config fix
2c9e8d1 minor #5584 Add DebugBundle config reference (WouterJ)
580f96f Add DebugBundle config reference
beaa7a4 minor #5753 configureOptions(...) : protected => public (lucascherifi)
a906993 minor #5730 Remove documentation of deprecated console shell (Tobion)
0776efe [#5702] add Foundation theme to example config
db48bf7 feature #5702 Added a reference to the Foundation form theme (totophe)
23c7798 Added a reference to the Foundation form theme
4d63c3a [#5468] remove outdated warning
cc9db34 Merge branch '2.7' into 2.8
e9b50e4 Merge branch '2.3' into 2.7
824fe40 configureOptions(...) : protected => public
7e3ab6f [Translation] Ability to format a message catalogue without dumping it.
692659e minor #5742 incorrect: severity is an array key here and not a constant (lbayerl)
22a1082 incorrect: severity is an array key here and not a constant
5ca9456 minor #5740 Fix typo in PdoSessionHandler Documentation (tobemedia)
d735cde Update pdo_session_storage.rst
8996aa9 adding type hint to normalizer callback
4db7055 update versionadded directive to match the content
14bea43 Remove documentation of deprecated console shell
194f5cc Merge branch '2.8'
25fe737 Merge branch '2.7' into 2.8
713541a fix a broken merge
a46560c Merge branch '2.8'
6a01917 Merge branch '2.7' into 2.8
89814fb update remaining GitHub repository names
b1e76b5 Merge branch '2.3' into 2.7
fbc7a8a Merge branch '2.8'
8d66137 Merge branch '2.7' into 2.8
c7a98c0 Merge branch '2.3' into 2.7
535a18e minor #5703 comment old logic (OskarStark)
26d7e6d minor #5711 removed service call from controller (sloba88)
42fa416 removed service call from controller
1d1578e minor #5720 adding closing tag (InfoTracer)
88d59cf adding closing tag
4e1932c comment old logic
b1ba29d Merge branch '2.8'
de141d5 Merge branch '2.7' into 2.8
9eb4b11 Merge branch '2.3' into 2.7
206a98d minor #5651 [Reference][Constraints] follow best practices in the constraints reference (xabbuh)
c93a948 [#5648] Added two missing use statements
9102bc3 minor #5648 Minor fixes for the QuestionHelper documentation (javiereguiluz)
25607ae Minor fixes for the QuestionHelper documentation
a1cf5e9 minor #5641 Move important information out of versionadded (WouterJ)
9f8d766 Merge branch '2.8'
f96eecf Merge branch '2.7' into 2.8
0340e1f Merge branch '2.3' into 2.7
bb2f991 Added August changelog
7c926c6 Merge branch '2.8'
d86bec8 Merge branch '2.7' into 2.8
ac3e2c9 Added August changelog
e5a33b2 Merge branch '2.3' into 2.7
a775e38 Fixed wrong version of symfony with composer install
3a4e8ca Merge branch '2.8'
a677694 Merge branch '2.7' into 2.8
ad013b5 Merge branch '2.3' into 2.7
1941e85 [#5480] Adding missing map entry (added 2 so it's easier to find)
a30b0fa Merge branch '2.8'
20f2ff3 Merge branch '2.7' into 2.8
5837c18 Merge branch '2.3' into 2.7
7eaf928 Merge branch '2.8'
84e2495 Merge branch '2.7' into 2.8
ec522d9 Merge branch '2.3' into 2.7
bfca2b7 follow best practices in the constraints reference
26ca438 minor #5579 [3.0] Remove mentions of Symfony1 (WouterJ)
f0baf30 minor #5587 [2.6] Don't use deprecated features (WouterJ)
b30e432 [2.6] Don't use deprecated features
043fea4 Merge branch '2.3' into 2.7
a991ea1 Merge branch '2.8'
7f05db4 Merge branch '2.7' into 2.8
ae3d583 Merge branch '2.3' into 2.7
a4f5b08 Move important information out of versionadded
feb2ab1 Remove mentions of Symfony1
b25b9e5 Merge branch '2.8'
ed71759 Merge branch '2.7' into 2.8
3c3615c Merge branch '2.3' into 2.7
6fc096e Merge branch '2.8'
3bdfec4 Merge branch '2.7' into 2.8
743f73b Merge branch '2.3' into 2.7
e0a8dfe Merge branch '2.8'
3e60dda Merge branch '2.7' into 2.8
acb40ee Merge branch '2.3' into 2.7
c7b448b bug #5607 Fix (sebastianbergmann)
d7f0a39 Fix
eae6b06 minor #5622 typo fix in pre authenticated (Maxime Douailin)
3a3d553 typo fix in pre authenticated
135d4b8 Added July changelog
8a2205c Merge branch '2.8'
6383740 Added July changelog
d65a04f Merge branch '2.7' into 2.8
1a7f1f5 Added July changelog
a6e4250 Merge branch '2.3' into 2.7
ee7f14f Merge branch '2.8'
eafdb8c Merge branch '2.7' into 2.8
5639097 Merge branch '2.3' into 2.7
c280be0 minor #5591 Update templating.rst: lint:twig instead of twig:lint in 2.7 (alexwybraniec)
8f26ed5 Update templating.rst
149576e feature #5310 Fix missing note about debug.dump_destination (nicolas-grekas)
f67c353 [#5572] Fix syntax
85dc294 feature #5572 4668 document isCsrfTokenValid (snoek09)
11383f8 4668 document isCsrfTokenValid
40d8d00 [#5374] Add deprecation notice in 2.7
fceaa9f feature #5374 Remove deprecated parameters (norkunas)
43565d9 minor #5498 [WIP] Added caution notes about the deprecation of container scopes (javiereguiluz)
dc93af2 Merge branch '2.8'
4ab47cc Merge branch '2.7' into 2.8
610e2e9 Merge branch '2.6' into 2.7
41c7059 Fixed another merge conflict
489adc2 Merge branch '2.8'
a20ea5d Merge branch '2.7' into 2.8
5135e4c Merge branch '2.6' into 2.7
c14f4da Remove merge conflict
14b39c3 Merge branch '2.8'
0281f61 Merge branch '2.7' into 2.8
4e4411f Merge branch '2.6' into 2.7
4bbe6c6 Merge branch '2.3' into 2.6
dae2811 Fix missing note about debug.dump_destination
e6c8b6c Change default value of cookie_httponly
3c1d229 minor #5542 [Cookbook][Email] add missing versionadded directive (xabbuh)
2874a67 minor #5476 [Cookbook][Security] some additional tweaks for the voter cookbook (xabbuh)
3905acb minor #5413 Fix doc about deprecations policy (nicolas-grekas)
bc880d0 add missing versionadded directive
7711e97 Merge branch '2.8'
74cd23b Merge branch '2.7' into 2.8
07b7c72 Merge branch '2.6' into 2.7
e93c251 Merge branch '2.3' into 2.6
966be4a Fix doc about deprecations policy
2a30c19 Merge branch '2.8'
343b349 Merge branch '2.7' into 2.8
441b936 Merge branch '2.6' into 2.7
e5d68b5 Merge branch '2.3' into 2.6
4d43a7d feature #5543 Add deprecation notice to "choice_list" option of ChoiceType (XitasoChris)
a4db275 Add deprecation notice to "choice_list" option of ChoiceType
1739549 [#5521] Added versionadded directive
2f98474 feature #5521 [Cookbook][WebServer] #5504 add a tip for the --force option (vincentaubert)
e9a9368 bug #5501 Fix typo in url for PHPUnit test coverage report (TrueGit)
2437bd9 [#5499] Added versionadded directive
3df5dd6 feature #5499 The "property" option of DoctrineType was deprecated. (XWB)
10e022d some additional tweaks for the voter cookbook
d5133bb minor #5544 [components][expression_language] Fix the wrong constructor for SerializedParsedExpression (zerustech)
d3f6c24 [components][expression_language] Fix the wrong constructor for SerializedParsedExpression
6603c33 Merge branch '2.8'
3b829c0 Merge branch '2.7' into 2.8
90745db Merge branch '2.6' into 2.7
a4b51a6 Merge branch '2.3' into 2.6
7518cc8 minor #5538 Update email.rst (TisLars)
421924b Update email.rst
e166d69 Merge branch '2.8'
befbf7b Merge branch '2.7' into 2.8
4500f1c Merge branch '2.6' into 2.7
85b8561 Merge branch '2.3' into 2.6
f4b7d7f feature #5458 HTML5 range documentation (harikt)
92eecd3 Merge branch '2.3' into 2.6
b77b148 Merge branch '2.8'
79a1902 Merge branch '2.7' into 2.8
336818d Merge branch '2.6' into 2.7
f71cc85 Merge branch '2.3' into 2.6
0a4192c [#5444] Fixing missing public: false declarations and proofing
963ed7f feature #5444 Documented the "auto_alias" feature (javiereguiluz)
571ed5b Merge branch '2.7' into 2.8
9755846 Merge branch '2.6' into 2.7
77fb9c7 Merge branch '2.3' into 2.6
914bd6a minor #5523 Custom voter example, fix missing curly brace (snroki)
8a0297f Custom voter example, fix missing curly brace
2cd9477 minor #5524 TYPO: missing closing parantheses of the array (listerical85)
577087e TYPO: missing closing parantheses of the array
2c6aa2f Merge branch '2.8'
dc173b6 Merge branch '2.7' into 2.8
c63e52e Merge branch '2.6' into 2.7
38ed15d Merge branch '2.3' into 2.6
b88a17e [Cookbook][WebServer] #5504 add a tip for the --force option on server:start
55a841d Merge branch '2.8'
7c967ed Merge branch '2.7' into 2.8
4561c17 Merge branch '2.6' into 2.7
1f8f8af Merge branch '2.3' into 2.6
9f8630a minor #5443 Added a note about the implementation of the verbosity semantic methods (javiereguiluz)
a88d1c6 Reworded a note about BC
28b98b9 Added a note about the implementation of the verbosity semantic methods
1524f5a Fixed an error in the auto_alias format value
fd78162 minor #5520 Fix RST (kenjis)
7876d7e Fix RST
2bb0d16 Merge branch '2.8'
8fadb17 Merge branch '2.7' into 2.8
9b88c4b Merge branch '2.6' into 2.7
558b266 Merge branch '2.3' into 2.6
2e9cfb9 minor #5429 Promote Symfony's builtin serializer instead of JMS (javiereguiluz)
1f74e07 minor #5510 [PSR-7] Fix Diactoros link (dunglas)
363b794 [PSR-7] Fix Diactoros link
3244eed Merge branch '2.8'
654b36c Merge branch '2.7' into 2.8
c8f4844 [#5456] Updating for Symfony 2.7
c8b3722 Merge branch '2.6' into 2.7
2d177a1 Merge branch '2.3' into 2.6
cdb9067 The "property" option of DoctrineType was deprecated.
6cc3445 Merge branch '2.7'
2f65bf2 Merge branch '2.7' into 2.8
cc4c448 [#5426] Porting the checkDNS option to 2.7 only
6daf19f Merge branch '2.6' into 2.7
92e20cf Merge branch '2.3' into 2.6
979c268 feature #5333 [FrameworkBundle] Update serializer configuration reference (dunglas)
e5ea3f0 Fix typo in url for PHPUnit test coverage report
99a996c Added caution notes about the deprecation of container scopes
11237e7 Merge branch '2.8'
2c1328e Merge branch '2.7' into 2.8
4df1ea8 Merge branch '2.6' into 2.7
6b84c59 Merge branch '2.3' into 2.6
2863079 Fix moving the mapped down as per @xabbuh
abf3e8e Fix the rendering issue
3c6ff76 Fix issues reported by @snoek09 . Thank you.
bab745d Minor grammar issue
b3a32af Merge branch '2.8'
cb482dc Merge branch '2.7' into 2.8
eff6e9c Merge branch '2.6' into 2.7
e3cbf35 Merge branch '2.3' into 2.6
3cdbc7c Merge branch '2.8'
0436ee7 Merge branch '2.7' into 2.8
b658ad4 Merge branch '2.6' into 2.7
047d1c3 Merge branch '2.3' into 2.6
89bc326 [FrameworkBundle] Update serializer configuration reference
7d6737b Merge branch '2.8'
bef92ec Added June changelog
ceebee0 Merge branch '2.7' into 2.8
13e4d92 Added June changelog
f46c375 Merge branch '2.6' into 2.7
67e02fa Added June changelog
2bad921 Merge branch '2.3' into 2.6
4d0f6ea Minor fixes
e08724e Merge branch '2.8'
273cab9 Merge branch '2.7' into 2.8
68afc0d Merge branch '2.6' into 2.7
7c85430 Merge branch '2.3' into 2.6
e46f02e [#5423] Minor tweaks to new voter update
eb2f7bd feature #5423 [Security] add & update doc entries on AbstractVoter implementation (Inoryy, javiereguiluz)
95537d3 Added a link to the AbstractVoter cookbook
73bd908 Fixed some typos
60643f0 Removed the abstract_voter.rst.inc file
59c60b1 add fixes to abstract_voter include file
e9053c0 fix problems pointed out by @javiereguiluz and @cordoval
968cb65 add & update doc entries on AbstractVoter implementation
ae27dd1 bug #5415 Updating for AppBundle and purposefully *not* doing work on configure (weaverryan)
0ef7e1a Merge branch '2.8'
9cbf3d4 Merge branch '2.7' into 2.8
d7c9085 Merge branch '2.6' into 2.7
6d3d892 Merge branch '2.3' into 2.6
cbf8fd7 feature #5409 [Reference] document new Doctrine APC cache service (xabbuh)
5c064e7 feature #5384 Added information about the new date handling in the comparison constraints and Range (webmozart, javiereguiluz)
b6c1a93 Added the "payload" option back
7ef2e6a Show annotations first
e3efbbf Reordered the code blocks to show Annotations, YAML, XML and PHP
39f46e1 Fixed the issues reported by @xabbuh
7003445 Finished the documentation of the new data comparison validators
1fa69fe Added information about the new date handling in the comparison constraints and Range
9f62c19 [#5332] typo
9d4724c feature #5332 [Serializer] ObjectNormalizer, object_to_populate doc. Minor enhancements. (dunglas)
f528471 [#5335] Minor tweaks
5123078 feature #5335 [Serializer] Updated the cookbook. (dunglas)
cc87822 Merge branch '2.8'
acff5b0 Merge branch '2.7' into 2.8
21c7666 Merge branch '2.6' into 2.7
2f64d2b Merge branch '2.3' into 2.6
effe563 Merge branch '2.3' into 2.6
a2c3f21 Make the necessary changes mentioned by @xabbuh and add example for form
e181ab4 minor #5460 Finish #5291: Bootstrap form theme and checkboxes (anacicconi, WouterJ)
e495337 Rewrite note a bit
a45a393 Merge branch '2.7' into 2.8
e2fd204 Merge branch '2.6' into 2.7
218780a Merge branch '2.3' into 2.6
5b71915 minor #5392 Wrap the table creation inside the class extending Command, so users … (harikt)
00e6d3e Wrap the table creation inside the class extending Command, so users know where the comes. They can use it as standalone when needed
d4d1f12 Starting with range documentation
464b578 feature #5360 [Serializer] Array Denormalization (derrabus)
9718c14 [Serializer] Array Denormalization
9dafd45 bug #5450 Fixing "Undefined method" error in code example (nebkam)
fa3936b Fixing "Undefined method" error on Symfony 2.7
58ca209 Revert "Changed dump() to var_dump()"
24716ec Merge branch '2.3' into 2.6
9fbd3b7 minor #5452 [#5388] change echo and print in examples (snoe
9E88
k09)
5c63064 5177 fix leftover dump()
ac4e02e 5177 use var_dump() in components
00a522b 5177 use dump() instead of echo in examples
52bd0a9 Merge branch '2.3' into 2.6
8b8ba03 [#5418] Let the code breath
ac010e0 bug #5418 Import Psr LogLevel (harikt)
ab87e62 Import Psr LogLevel
46cf9c7 feature #5416 fix for Symfony 2.7 (DQNEO)
dd0e33f minor #3782 [Form] Deprecate read_only option (snoob)
c9e8634 [#3782] Deprecating the read_only option
485c8a0 document new Doctrine APC cache service
4c50cb0 Fixed some errors and added a new note
e24f77e Removed an extra blank line
69152e7 Added the "versionadded: 2.7" directive
a5f0eec Documented the "auto_alias" feature
d85691c [#5435] Removed notion of Symfony 2.4
e141c87 feature #5435 Added information about the four sub-components of Security component (javiereguiluz)
839342d Added information about the four sub-components of Security component
beac11e Use the built-in serializer instead of promoting JMS
2d430dc Merge branch '2.8'
0fe1050 Merge branch '2.7' into 2.8
6d17756 Merge branch '2.6' into 2.7
9fd5229 Merge branch '2.3' into 2.6
15b6e8d bug #5412 Update serializer.rst (mantulo)
0d0282f fix for Symfony 2.7
f2d96d5 Revert "don't use BufferedOutput on Symfony 2.3"
ae8474d Merge branch '2.3' into 2.6
41d1733 Merge branch '2.8'
9538919 Merge branch '2.7' into 2.8
9cc3ebf Merge branch '2.6' into 2.7
28956ce Merge branch '2.3' into 2.6
a68ff44 Merge branch '2.8'
bfea184 Merge branch '2.7' into 2.8
db2edca Merge branch '2.6' into 2.7
34c1293 Merge branch '2.3' into 2.6
89eaec2 [#5331] Tiny typo
f73073e feature #5331 [PSR-7] Bridge documentation (dunglas)
6d87827 fixing standard and fixing missing argument in php+xml formats
06aed96 feature #4354 [WCM] Added depreciation note for the cascade_validation constraint (peterrehm)
22a87b5 Added depreciation note for the cascade_validation constraint and updated position of depreciation notes
6b1c640 Updating for AppBundle and purposefully *not* doing work on configure
edc33a8 Update serializer.rst
bab8430 [Serializer] Updated the cookbook.
95de32a bug #5400 Fix after install URL and new photo since AcmeDemoBundle is not part … (smatejic)
695fe21 [PSR-7] Bridge documentation
e1479e0 [Serializer] ObjectNormalizer, object_to_populate doc. Minor enhancements.
c98658c Fix after install URL and new photo since AcmeDemoBundle is not part of 2.7
5c872f2 Bundle name case change
d01d7ab Remove deprecated parameters
4c2d155 minor #5321 Use the reserved domains example.com and example.org (javiereguiluz)
179526c minor #4947 [Components][ClassLoader] remove DebugClassLoader (xabbuh)
73e9833 [Components][ClassLoader] remove DebugClassLoader
aa0dff4 Indented code block in security:check command description
078bb2d Merge branch '2.8'
59569c0 Added May Changelog
2e75cc1 Merge branch '2.6' into 2.7
7dd5e29 Added May Changelog
1c68bc3 Merge branch '2.3' into 2.6
5aa7044 Improved security:check command description
c7c6a9d bug #5358 Fix typo in description (martyshka)
8a0a995 Fix typo in description
396302b Added description on how to enable the security:check command through composer
f78cab7 Merge branch '2.8'
4fc429e Merge branch '2.6' into 2.7
08d27d2 Merge branch '2.3' into 2.6
6a9a26a Merge branch '2.8'
d16bd3e Merge branch '2.6' into 2.7
c3ba67d Merge branch '2.3' into 2.6
d6c5d5b Merge branch '2.8'
29edc0c bug #5328 Update create_form_type_extension.rst (jackdelin)
cc6e617 Update create_form_type_extension.rst
ed88e1c bug #5328 Update create_form_type_extension.rst (jackdelin)
78bab15 Merge branch '2.8'
6311638 feature #5329 Adding a new entry about deprecation warnings (weaverryan)
1e8b75f Fix thanks to Wouter
060fe03 Added a section about the framework
702394e Tweaks thanks to Mr @javiereguiluz
e74bbc9 Adding a new entry about deprecation warnings
0c089ec Update create_form_type_extension.rst
3931faf Updated the list of reserved domains and the URL reference
62ce220 Use the reserved domains example.com and example.org
68f51df Merge branch '2.8'
8b0c026 Merge branch '2.6' into 2.7
e9ef6a4 Merge branch '2.3' into 2.6
49a2a27 feature #5127 [VarDumper] Add doc for assertDump* assertions (nicolas-grekas)
5a34577 minor #5276 Better illustrate what the "user mistake" is. (diamondsea)
c3fd4f5 Merge branch '2.8'
1cb47ab Merge branch '2.6' into 2.7
b33c900 Readded missing reference
7cadcdc Merge branch '2.8'
b0ca503 Merge branch '2.6' into 2.7
7574e8b Merge branch '2.3' into 2.6
328e481 [VarDumper] Add doc for assertDump* assertions
6094deb Changed comment from # to //
e2d4986 bug #5305 [BestPractices][Security] revert #5271 on the 2.6 branch (xabbuh)
2d64dd5 Merge branch '2.8'
7e910b2 Merge branch '2.6' into 2.7
f6b1b34 Merge branch '2.3' into 2.6
7403a6d feature #5255 [Cookbook] Use configured user provider instead of injection (mvar)
8556ae2 Improve invalid user provider exception message
77fdbbe Check user provider type
f7d7f81 Use configured user provider instead of injection
2a949b9 bug #5237 Update authentication.rst (taavit)
6e2dab2 feature #5169 Removed synchronized services from Symfony 2.7 docs (javiereguiluz)
adf6f36 revert #5271 on the 2.6 branch
b74a2ac feature #5106 [VarDumper] upgrade doc to 2.7 wither interface (nicolas-grekas)
3653b67 feature #4084 [Book][Forms] describe the allow_extra_fields form option (xabbuh)
286d4f2 describe the allow_extra_fields form option
7545252 feature #4807 [2.7] bumped min PHP version to 5.3.9 (xelaris)
32b1060 Bootstrap form theme and checkboxes
8a69d0e Added a label to maintain the old URL
57fa634 bug #5270 Use OptionsResolver (tacman)
c2b92e1 Merge branch '2.8'
075a4b5 Merge branch '2.6' into 2.7
91f22e9 Merge branch '2.3' into 2.6
12d8531 Merge branch '2.8'
3fddd4a Merge branch '2.6' into 2.7
660a7e1 Merge branch '2.3' into 2.6
7d83726 feature #4675 [Serializer] Doc for groups support (dunglas)
380491f minor #5278 remove unnecessary code (karion)
8fd9a46 remove unnecessary code
9fc609d Better illustrate what the "user mistake" is.
857f96a Use OptionsResolver
25c9705 Merge branch '2.8'
1fa0659 Merge branch '2.6' into 2.7
ce9ba27 Merge branch '2.3' into 2.6
2f136e9 minor #5178 Usage of denyAccessUnlessGranted in the controller (94noni)
b50b12d Usage of denyAccessUnlessGranted in the controller
d9a0d04 bug #5247 [2.7] [Serializer] fixes the order of the Serializer constructor arguments. (hhamon)
4d1678e [Serializer] fixes the order of the Serializer constructor arguments.
de9b3d5 Merge branch '2.8'
164ce27 Merge branch '2.6' into 2.7
a504acf Merge branch '2.3' into 2.6
aca1344 minor #5217 Update _payload-option.rst.inc (bvleur)
c8c3c99 Update _payload-option.rst.inc
91bdf7e Update authentication.rst
4e0dee6 Update authentication.rst
c1cbb9a Merge branch '2.8'
5594531 Merge branch '2.6' into 2.7
4788a50 Merge branch '2.3' into 2.6
f3bf826 feature #5005 Renamed precision option to scale (WouterJ)
643f4c4 Merge branch '2.8'
d083c46 Remove merge commit
db2d0cb Merge branch '2.6' into 2.7
ee8d567 Removed merge commits
041b2af Merge branch '2.8'
d92dbd6 added April changelog
5e5b67f Merge branch '2.6' into 2.7
479ddae Added April changelog
0af3534 Merge branch '2.3' into 2.6
83636f0 Merge branch '2.8'
079b59e Merge branch '2.6' into 2.7
00556e1 bug #4273 - fix doctrine version in How to Provide Model Classes for several Doctrine Implementations cookbook
f0429d7 Merge branch '2.8'
43e7b62 Merge branch '2.6' into 2.7
c005dd3 Merge branch '2.3' into 2.6
0b7f89b minor #4868 Remove horizontal scrollbar (ifdattic)
bed19da Remove horizontal scrollbar
c166fdf minor #5212 Fixed typo. (pcky)
94cb872 Fixed typo.
701f2cf Merge branch '2.8'
1cb2363 Merge branch '2.6' into 2.7
e7d40c3 Merge branch '2.3' into 2.6
134268e minor #5209 [Reference] Fix order of config blocks (xelaris)
4eabb47 [#5206] Removed versionadded directives
b5dd5a1 feature #5206 [Cookbook][Security] Replace deprecated csrf_provider service (xelaris)
6cb591e [Cookbook][Security] Replace deprecated csrf_provider service
4240b4b [Reference] Fix missing comma in constraint annotation
f33b10d [Reference] Fix order of config blocks
b74593c Merge branch '2.8'
93ecd0a Merge branch '2.6' into 2.7
a98f3cd Merge branch '2.3' into 2.6
d681cca Merge branch '2.3' into 2.6
402b586 bug #5162 Fix misplelled XliffFileLoader class in the Using Message Domains (Nicola Pietroluongo)
2e86186 Merge branch '2.8'
721ed95 Merge branch '2.6' into 2.7
6fbcc28 Merge branch '2.3' into 2.6
6f2ef89 Reworded he notice about deprecation of synchronized services
edde458 Removed synchronized services from Symfony 2.7 docs
6ecf3b0 Fix misplelled XliffFileLoader class in the Using Message Domains example
c4e07cc Merge branch '2.7'
56a80f8 Merge branch '2.6' into 2.7
00ab55b Merge branch '2.3' into 2.6
ab01d08 minor #5141 Removed remaining setDefaultOptions usage (WouterJ)
e84182d Added March changelog
56fe069 Merge branch '2.7'
11138a9 Added March changelog
3f7ff3d Merge branch '2.6' into 2.7
6f576de Added March changelog
27f44b8 Merge branch '2.3' into 2.6
392398b Merge branch '2.7'
f5f8039 Merge branch '2.6' into 2.7
4e1184f Merge branch '2.3' into 2.6
a51c0f9 Removed remaining setDefaultOptions usage
e417395 [Serializer] Fix CS
ae2b78c [Serializer] Add getter group example
745f412 [Serializer] Doc for groups support
5dd50f5 Merge branch '2.7'
c2b5a6a Merge branch '2.6' into 2.7
644aae8 Merge branch '2.3' into 2.6
c4a5661 feature #5060 Adds note on new validation files scanned in 2.7 (GromNaN)
526c880 minor #5132 [Components][DependencyInjection] fix wrong disable of factories (sstok)
87c39b7 minor #5129 Fix to Twig asset function packageName argument (ockcyp)
b15c127 Fix to Twig asset function packageName argument
1d443c0 minor #5128 [VarDumper] little optim (lyrixx)
a880fe4 [VarDumper] little optim
5880f38 bug #5126 Fix a typo in ProgressBar usage example (kamazee)
511b7a8 Fix a typo in ProgressBar usage example
ca3eb9b Update factories.rst
25d2f54 feature #4958 Add Twitter Bootstrap form theme example (bocharsky-bw)
c94f902 bumped min PHP version to 5.3.9
edf9b78 bug #5118 Update logger.rst (jdecoster)
b5c4d3b Update logger.rst
6150991 [VarDumper] upgrade doc to 2.7 wither interface
fa74e41 Add twitter bootstrap form theme example
adf5b90 bug #5110 [Serializer] Fix class name (iamluc)
a1f2ed7 Fix class name
7681e39 Merge branch '2.7'
8566263 Merge branch '2.6' into 2.7
b91f05d Merge branch '2.3' into 2.6
d65880f bug #5092 Fixed a minor error introduced by the new redirectToRoute() method (javiereguiluz)
d6a838a minor #5082 Proofreading tweaks to asset component (weaverryan)
59325ee Changes thanks to WouterJ and xabbuh
65d2a27 Fixed a minor error introduced by the new redirectToRoute() method
3fb0d42 Merge branch '2.7'
3abbf0b Merge branch '2.6' into 2.7
9a53d1e Merge branch '2.3' into 2.6
f24c84f Merge branch '2.7'
1fccbf6 Merge branch '2.6' into 2.7
66831a6 Backporting some stuff from 2.7, that I think must have gotten merged only there by accident
5cae596 Merge branch '2.6' into 2.7
ebca342 Merge branch '2.3' into 2.6
33232a8 minor #5075 Removed an admonition that is no longer true for Symfony 2.6+ (javiereguiluz)
236797e Fixing bad merge conflict (forgot to save!)
df9c3f4 bug #5053 Correct RegisterListenersPass namespace (hacfi)
383de54 Remove unnecessary component reference
7575495 Correct RegisterListenersPass namespace
c2f21e6 feature #5050 [OptionsResolver] Fixed deprecated functionality usage (WouterJ)
0d0c795 minor #5047 Fix service id (JhonnyL)
cf31894 Fix service id
3405c42 feature #5046 Rebased "add shortcut methods" (Cydonia7, WouterJ)
2035d62 Updating for new security service names in 2.6
4166339 Merge branch '2.3' into 2.6
d6c0cb7 feature #5028 Finish #4308: Documentation for the new PropertyNormalizer (mnapoli, WouterJ)
50c8227 [#5015] Updating the security service name for 2.6 - thanks to Cordoval
4d22a78 Merge branch '2.3' into 2.6
04a12a5 [#5010] Removing note that doesn't affect 2.6 versions
dcc0536 Merge branch '2.3' into 2.6
110efab [#4987] Proofreading tweaks to asset component
22eee86 feature #4987 Added the documentation for the new Asset component (javiereguiluz)
7ab379a Lots of fixes and rewordings
9e8de96 Fixed RST syntax issues
5ca85d1 Fixed some RST syntax issues
17269a3 Moved the component documentation to its own folder
fab3c89 Fixed a lot of errors and added an introduction
49548b3 Tweaked documentation and added links to API methods/classes
76b8bea Added a missing link reference
d39b26e Minor rewording
6d367b1 Added the documentation for the new Asset component
3fb19ce feature #4959 Add excluded_ajax_paths new parameter in v2.6 (bocharsky-bw)
78733c3 feature #4941 Adding a section to emailing showing off absolute_url (weaverryan)
67efb2b minor tweak thanks to Javier
5ab1adf Adding a section to emailing showing off absolute_url
feb621b Merge branch '2.7'
2b87b47 Merge branch '2.6' into 2.7
0f6a906 Merge branch '2.3' into 2.6
325354e feature #4903 Reworded the explanation about when a lock is released (javiereguiluz)
8ad1724 [#4724] Minor language tweaks and cross-link to form theming
dbdb408 feature #4724 [Reference][Constraints] document the validation payload option (xabbuh)
f8e2e19 feature #4692 [Serializer] Name Converter (dunglas)
d335005 [Serializer] Fix CS
5b527ae Removed an admonition that is no longer true for Symfony 2.6+
dca4655 document the validation payload option
994ed3a Little fixes
5e08856 Merge branch '2.3' into 2.6
a0952bf [#4732] Tweaking language, clarifying purpose of disabling form and that you can disable CSRF on 1 form
0783879 Merge branch '2.3' into 2.6
0967d07 Adds note on new validation files scanned in 2.7
a2395ef minor #5054 [Changelog] fix changelog syntax (xabbuh)
515e87c Merge branch '2.7'
d3192a7 Merge branch '2.6' into 2.7
ea3d91f Merge branch '2.5' into 2.6
747696a Merge branch '2.3' into 2.5
653ac94 fix changelog syntax
544a676 [OptionsResolver] Fixed deprecated functionality usage
b28cf0a Added February changelog
1a587c5 Added February changelog
883f1aa Merge branch '2.6' into 2.7
af5c4e3 Added February changelog
46eea24 Merge branch '2.3' into 2.6
f807d14 Fixes
5b015f2 Modifications according to comments
7f9bc8c And now the same for isGranted where it is possible
46e2505 Changed to addFlash where it is possible (ie in controllers)
643c458 redirect changed to redirectToRoute
7ae62e8 Minor improvements
4611ce9 Minor format improvements
3bcb186 Added shortcut methods for controllers
4dd1f25 Merge branch '2.6' into 2.7
9caab86 Merge branch '2.5' into 2.6
ff44111 Merge branch '2.3' into 2.5
2a29225 minor #4985 Fixed a minor typo (javiereguiluz)
16dcf53 feature #4980 [#4974] Added Twig loader priority Documentation (wizhippo)
7d02f82 Added Twig loader priority Documentation
c6bea37 feature #4957 Added a mention to the @Security annotation (javiereguiluz)
ac88a71 Removed an unneeded reference to Symfony 2.4 version
420b338 Added a mention to the @Security annotation
89e626f minor #4952 symfony 2.7 requires at least php 5.3.9 (scaytrase)
14a080f feature #4907 Adjustments to PDO Session storage page (kbond)
73a7c0c [#4423] Added missing word
215cacf bug #4423 Fix description of ConfirmationQuestion (cxj)
3b96301 Applied comments
59ac3d5 Renamed precision option to scale
f4ab4b6 minor #5002 Revert very bad merge (WouterJ)
c4225f4 Removed bad comma
e747392 Revert "minor #4977 Unnecessary comma (edsonmedina)"
f4c1a2e symfony 2.7 requires at least php 5.3.9
6e14bac Fixed minor grammar issues
e632d49 Fixed the errors spotted by Wouter
026a1ea Minor grammar fix
ed80100 minor #4977 Unnecessary comma (edsonmedina)
583ec92 bug #4984 Fix the example using SerializedParsedExpression (stof)
b1aadbf minor #4993 Bumped symfony version number to 2.6 in flat php composer.json example (TSchuermans)
b8275b3 Bumped symfony version number to 2.6 in flat php composer.json example
151bcc0 Fixed a minor typo
b51bdbe Fix the example using SerializedParsedExpression
8a2f0ba Wrong comma
fa95eb0 Add excluded_ajax_paths new parameter in v2.6
89a7320 Added the new documentation inside a "caution" admonition
81e8c13 Merge branch '2.7'
70902f5 Merge branch '2.6' into 2.7
6ba90ec Merge branch '2.5' into 2.6
169315b Merge branch '2.3' into 2.5
6be214c minor #4948 Fixes for 2.6 branch (ifdattic)
52e21f3 Merge branch '2.3' into 2.5
008c4de minor #4928 Change installation method order (ifdattic)
1db39c2 Update introduction.rst
475be21 Change installation method order
ef39a01 Remove diff
8d56ad7 Merge branch '2.7'
7f8d6bd Merge branch '2.6' into 2.7
35093fa Merge branch '2.5' into 2.6
6dd6735 Merge branch '2.3' into 2.5
6fd286b Added January changelog
ad97700 Merge branch '2.7'
ebe2706 Added January changelog
78f4f69 Merge branch '2.6' into 2.7
851024b Added January changelog
fd0862b Merge branch '2.5' into 2.6
9606566 Added January changelog
3a86e3c Merge branch '2.3' into 2.5
c0f9f67 Merge branch '2.7'
d71fe6d Merge branch '2.6' into 2.7
a49ffcc Merge branch '2.5' into 2.6
737692e Merge branch '2.3' into 2.5
9ad21ea Fix typos
6e023c1 Fix typos
3907af6 minor #4944 Fix formatting (ifdattic)
6572fea Fix formatting
5a53e87 minor #4946 Remove horizontal scrollbar (ifdattic)
17c9cf9 Remove horizontal scrollbar
87eb36c Merge branch '2.7'
bc29584 Merge branch '2.6' into 2.7
eb86338 Merge branch '2.5' into 2.6
1503df6 Merge branch '2.3' into 2.5
04090c0 minor #4936 fixed typo (issei-m)
d17ca87 fixed typo
714f630 Merge branch '2.7'
39f6876 Merge branch '2.6' into 2.7
ddf9aa5 Merge branch '2.5' into 2.6
585644b Merge branch '2.3' into 2.5
768650e minor #4932 Add missing comma in array (ifdattic)
947e58b Add missing comma in array
30ecdde minor #4921 Fixes for 2.5 branch (ifdattic)
d1103a8 minor #4919 Fix code examples (ifdattic)
50c5a9e feature #4895 Added configuration of the user provider (peterrehm)
075b652 Removed unneeded spaces
56dd365 Updated as per discussion
c4cbd84 Updated according to comment and changed to AppBundle
a6fb18c Added configuration …
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges some commits that have been done in the
2.6branch after we stopped support for that version.