Skip to content
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

[Serializer] Handle circular references #12098

Merged
merged 1 commit into from
Oct 20, 2014

Conversation

dunglas
Copy link
Member

@dunglas dunglas commented Oct 2, 2014

Q A
Bug fix? Yes: avoid infinite loops. Allows to improve #5347
New feature? yes (circular reference handler)
BC breaks? no
Deprecations? no
Tests pass? yes
License MIT
Doc PR symfony/symfony-docs#4299

This PR adds handling of circular references in the Serializer component.
The number of allowed iterations is configurable (one by default).
The behavior when a circular reference is detected is configurable. By default an exception is thrown. Instead of throwing an exception, it's possible to register a custom handler (e.g.: a Doctrine Handler returning the object ID).

Usage:

use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
use Symfony\Component\Serializer\Serializer;

class MyObj
{
    private $id = 1312;

    public function getId()
    {
        return $this->getId();
    }

    public function getMe()
    {
        return $this;
    }
}

$normalizer = new GetSetMethodNormalizer();
$normalizer->setCircularReferenceLimit(3);
$normalizer->setCircularReferenceHandler(function ($obj) {
    return $obj->getId();
});

$serializer = new Serializer([$normalizer]);
$serializer->normalize(new MyObj());

@@ -114,7 +164,8 @@ public function normalize($object, $format = null, array $context = array())
if (!$this->serializer instanceof NormalizerInterface) {
throw new \LogicException(sprintf('Cannot normalize attribute "%s" because injected serializer is not a normalizer', $attributeName));
}
$attributeValue = $this->serializer->normalize($attributeValue, $format);

$attributeValue = $this->serializer->normalize($attributeValue, $format, $context);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replacing the $context['circular_reference_limit'] array by an SplObjectStorage should prevent the many copies that currently occurs along the recursive walk.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum, sorry, what I just said is wrong: an SplObjectStorage object would share the state between different branches of the recursive tree, which is not what you want I think.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the commit I just pushed? It should work and reduce the memory usage?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should add a test that checks what happens when you serialize a structure that has many times the same object at sibling positions (more than circularReferenceLimit times)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nicolas-grekas Good catch.
I've switched back to an array implementation and added a test for siblings.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, sorry for the misleading comment, at least we gained a test :-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're welcome. It could have been a good improvement!

@fabpot
Copy link
Member

fabpot commented Oct 5, 2014

Looks good to me. Can you submit a PR for the documentation? Thanks.

@dunglas
Copy link
Member Author

dunglas commented Oct 6, 2014

dunglas added a commit to dunglas/symfony-docs that referenced this pull request Oct 6, 2014
@fabpot
Copy link
Member

fabpot commented Oct 7, 2014

👍

dunglas added a commit to dunglas/symfony-docs that referenced this pull request Oct 7, 2014
@jakzal
Copy link
Contributor

jakzal commented Oct 8, 2014

@dunglas can you rebase? I think the failing tests were fixed in master.

@jakzal
Copy link
Contributor

jakzal commented Oct 8, 2014

👍

dunglas added a commit to dunglas/symfony-docs that referenced this pull request Oct 9, 2014
@dunglas
Copy link
Member Author

dunglas commented Oct 9, 2014

@jakzal rebased.

@jakzal
Copy link
Contributor

jakzal commented Oct 9, 2014

And Travis is happy again :)

@fabpot
Copy link
Member

fabpot commented Oct 20, 2014

Thank you @dunglas.

@fabpot fabpot merged commit 48491c4 into symfony:master Oct 20, 2014
fabpot added a commit that referenced this pull request Oct 20, 2014
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Serializer] Handle circular references

| Q             | A
| ------------- | ---
| Bug fix?      | Yes: avoid infinite loops. Allows to improve #5347
| New feature?  | yes (circular reference handler)
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT
| Doc PR        | symfony/symfony-docs#4299

This PR adds handling of circular references in the `Serializer` component.
The number of allowed iterations is configurable (one by default).
The behavior when a circular reference is detected is configurable. By default an exception is thrown. Instead of throwing an exception, it's possible to register a custom handler (e.g.: a Doctrine Handler returning the object ID).

Usage:
```php
use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
use Symfony\Component\Serializer\Serializer;

class MyObj
{
    private $id = 1312;

    public function getId()
    {
        return $this->getId();
    }

    public function getMe()
    {
        return $this;
    }
}

$normalizer = new GetSetMethodNormalizer();
$normalizer->setCircularReferenceLimit(3);
$normalizer->setCircularReferenceHandler(function ($obj) {
    return $obj->getId();
});

$serializer = new Serializer([$normalizer]);
$serializer->normalize(new MyObj());
```

Commits
-------

48491c4 [Serializer] Handle circular references
dunglas added a commit to dunglas/symfony-docs that referenced this pull request Oct 20, 2014
weaverryan added a commit to symfony/symfony-docs that referenced this pull request Oct 28, 2014
…y#12098. (dunglas)

This PR was merged into the master branch.

Discussion
----------

[Serializer] Handle circular references. symfony/symfony#12098.

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | symfony/symfony#12098
| Applies to    | 2.6 or 2.7
| Fixed tickets | n/a

Commits
-------

1a1476e [Serializer] Handle circular references. symfony/symfony#12098.
fabpot added a commit that referenced this pull request Dec 12, 2014
…e by default (dunglas)

This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #12295).

Discussion
----------

[FrameworkBundle] make GetSetMethodNormalizer available by default

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | very limited
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT
| Doc PR        | not yet

The `GetSetMethodNormalizer` has not been enabled by default in #6815 because it was broken by design. Since #12098 has been merged, circular references are handled and that normalizer cannot breaks applications.
This PR makes that normalizer automatically available when the serializer is enabled. To keep BC, I've set a "high" priority for this service (higher than the default `0`).

Commits
-------

4f0aa61 [FrameworkBundle] make GetSetMethodNormalizer available by default
wouterj added a commit to symfony/symfony-docs that referenced this pull request Jan 30, 2015
This PR was submitted for the 2.6 branch but it was merged into the 2.3 branch instead (closes #4935).

Discussion
----------

Fix typos

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.6
| Fixed tickets |

Commits
-------

cc078ab Fix typos
9ec09ee Merge branch '2.5' into 2.6
2f8a60e Merge branch '2.3' into 2.5
33914c9 minor #4859 [Components][EventDispatcher] don't explain deprecated `getName()` method (xabbuh)
b0d2263 Merge branch '2.5' into 2.6
62248df Merge branch '2.3' into 2.5
430de15 don't explain deprecated `getName()` method
2f41c9e minor #4887 Typo (XitasoChris)
d85fa76 minor #4880 Remove duplicate link, introduction.rst (Quberik)
8ef3477 bug #4856 [Components][Debug] fix DebugClassLoader namespace (xabbuh)
65da1a9 Merge branch '2.5' into 2.6
6f1bbab Merge branch '2.3' into 2.5
572bf3b feature #4800 [Cookbook][Security] Hint about createToken can return null (xelaris)
65b0822 minor #4798 Add version added note for the debug:event-dispatcher command (adamelso)
9edffa0 Typo
c4c8803 Update introduction.rst
0615928 Merge branch '2.5' into 2.6
4143076 minor #4872 [BestPractices] fix merge after removing @Security in 2.3 (xabbuh)
5c55491 fix merge after removing @Security in 2.3
48835de minor #4767 [2.6] Removed 2.4 versionadded as version is deprecated (WouterJ)
240a981 minor #4764 [Reference][Forms] move cautions to make them visible (xabbuh)
50946ca Reverting a commit on 2.5 branch, as it was only meant to be on 2.3 (so reverting after the merge)
c8928d8 Merge branch '2.3' into 2.5
7a8e00d Merge branch '2.3' into 2.5
2fe954e [#4735] Reverting what was left on the 2.5 branch after the merge conflict had already put back some of it
9a6f242 Merge branch '2.3' into 2.5
08e5ac9 feature #4658 Debug formatter tweaks (weaverryan)
cfad26c feature #4605 Adding a link to log things in the prod environment (weaverryan)
657284e Adding a link to log things in the prod environment
3643ec2 feature #4723 [Cookbook][Security] document the new AuthenticationUtils (xabbuh)
4b0ebea Merge branch '2.5' into 2.6
3a25b1d Merge branch '2.3' into 2.5
e9559a5 move cautions to make them visible
84839ba minor #4829 Fix code example (ifdattic)
9e4eb5a language tweak thanks to xabbuh!
0f4fda7 Adding an example image of the debug_formatter
c04ed79 minor #4848 Fix typo: BLOG => BLOB (ifdattic)
1da9206 Merge branch '2.5' into 2.6
952e317 Merge branch '2.3' into 2.5
5b91653 minor #4843 Fixed typo (beni0888)
467c538 minor #4824 fix SQL: table names (e-moe)
ecc18e2 fix SQL: table names
82bce29 minor #4815 Update translation.rst (ifdattic)
f7d99dd [#4799] One little fix more
6522145 minor #4799 Fix markup (WouterJ)
a42e5b6 minor #4778 Update templating.rst (ifdattic)
bd7d246 minor #4752 [Book][Validation] clarify group validation (xabbuh)
32a589b [Components][Debug] fix DebugClassLoader namespace
d83f005 Fix typo: BLOG => BLOB
73f07ed Fixed typo
7970f76 Fix code example
93bc1bf Update translation.rst
528aa17 [Cookbook][Security] Hint about createToken can return null
ab66a12 Fix markup
a3d43a5 Add version added note for the debug:event-dispatcher command
ca54d55 Merge branch '2.5' into 2.6
1f343b1 Merge branch '2.3' into 2.5
eb56376 minor #4781 [Serializer] Bad variable name in example (arno14)
ef4abd1 Typo in Serializer doc
32bd0b1 minor #4777 Update templating.rst (ifdattic)
aca0944 Update templating.rst
ce37b96 bug #4771 [QuickTour] use the debug:router command name (xabbuh)
36f2e1f bug #4757 [Components][ClassLoader] don't show deprecated usage of Yaml::parse() (xabbuh)
dd7c1dd document the new AuthenticationUtils
851be38 Update templating.rst
89caa75 Removed 2.4 versionadded as version is deprecated
e5a6c7c Merge branch '2.5' into 2.6
3f8cb31 Merge branch '2.3' into 2.5
b143754 bug #4744 [Book][Security] Update code example to fit description (xelaris)
b0d7cb6 use the debug:router command name
c810c69 Added December changelog
a8691fa Merge branch '2.5' into 2.6
e475bf1 Added 2.5 changelog
13fa716 Merge branch '2.3' into 2.5
9a620c4 don't show deprecated usage of Yaml::parse()
1c79cad clarify group validation
1f760c8 Merge branch '2.5' into 2.6
9f82c6f Merge branch '2.3' into 2.5
97a9c7b minor #4742 Formatting fix (WouterJ)
7be0dc6 feature #4681 adding note to assetic cache busting (weaverryan)
4fe4f65 feature #4682 [Reference] document the `2.5` validation options (xabbuh)
bd34c6b Update code example to fit description
a30bb1d Formatting fix
0df1064 Merge branch '2.5' into 2.6
c05e78f Merge branch '2.3' into 2.5
3eb14aa minor #4727 Renamed example: "Acme\BlogBundle" -> "AppBundle" (muxator)
caa2be6 minor #4737 [Book][Security] add missing versionadded directive (xabbuh)
57fdea6 minor #4729 Fixed typo in factories.rst (nietonfir)
c0c6dab add missing versionadded directive
7fc4d52 document the `2.5` validation options
a6c47db Fixed typo in factories.rst
5befc45 Merge branch '2.5' into 2.6
4d848d7 Merge branch '2.3' into 2.5
4c8d75f Renamed example: "Acme\BlogBundle" -> "AppBundle"
3470c87 Merge branch '2.5' into 2.6
2bed07c Merge branch '2.3' into 2.5
640b29e Merge branch '2.5' into 2.6
5deb315 Fixing build error
2edb030 Fixing build error
2560851 Merge branch '2.5' into 2.6
725f927 removing duplicate key
e174d47 Updating one more reference of security.context that I missed in the merge
79db0b9 bug #4699 Use new security.authorization_checker service (xelaris)
9c819b4 bug #4713 [Security] Removed deprecated example about SecurityContext (iltar)
91db61a [Security] Removed deprecated example about SecurityContext
02d594c Merge branch '2.5' into 2.6
5adc056 Merge branch '2.3' into 2.5
58f4a00 Use denyAccessUnlessGranted shortcut
aa88f99 feature #4609 Adding details about the changes to the PdoSessionHandler in 2.6 (weaverryan)
1e34823 Fixes thanks to comments and a new note about the LegacyPdoSessionHandler
91f6f41 Merge branch '2.5' into 2.6
7a0b1de Merge branch '2.3' into 2.5
8ded86a Use new security.authorization_checker service
b1503b9 Merge branch '2.5' into 2.6
ce2ed77 Merge branch '2.3' into 2.5
8cb3920 Merge branch '2.5' into 2.6
dfcea86 Merge branch '2.3' into 2.5
b45313a Merge branch '2.5' into 2.6
ce74c31 Merge branch '2.3' into 2.5
44b03ac adding note to assetic cache busting
ddd56ea feature #4449 Added cache_busting to default asset config (GeertDD)
0e45e29 feature #4655 Document new progressbar methods (javiereguiluz)
921f3cd Merge branch '2.5' into 2.6
f2fd74e Merge branch '2.3' into 2.5
16668bc Merge branch '2.5' into 2.6
eda75fe Merge branch '2.3' into 2.5
3b6341a minor #4663 Removed double `firewall_restriction` entry (vlad-ghita)
714b2ca Removed double `firewall_restriction` entry
8b611e2 bug #4598 [ExpressionLanguage] add missing argument (xabbuh)
815e0bf minor #4551 Normalize the method listings on version 2.5 (pedronofuentes)
2665407 Normalize the method listings on version 2.5
07aa471 Matching up the index position with the map
a09fd7b feature #4485 Added documentation about the DebugFormatter helper (WouterJ)
6a3cbd9 Changed the "new in Symfony 2.6" message for consistency
2b86d80 Documented getProgress/setProgress methods
99f31fc Reordered list of helpers
6a02f68 Applied comments from our great reviewers
a2ea256 bug #4637 fixed StringExpressionLanguageProvider code example #4636 (danieleorler)
33e0a7f fixed StringExpressionLanguageProvider code example #4636
fc3e50b Merge branch '2.5' into 2.6
c5d2eb8 Merge branch '2.3' into 2.5
63be343 bug #4630 [OptionsResolver] Fix namespace (xavren)
1c24163 [OptionsResolver] Fix namespace
4801a3c [ExpressionLanguage] add missing argument
2f974bb Updating statements, now that we're not overriding the names
fd8b552 Adding details about the changes to the PdoSessionHandler in 2.6
d327bae feature #4557 Update pdo_session_storage.rst (spbentz)
3e51551 Update pdo_session_storage.rst
38163f0 Merge branch '2.5' into 2.6
abd83ba Merge branch '2.3' into 2.5
1c9270d minor #4568 Update Symfony reference to 2.6 version (dangarzon)
ee44fe4 Reverts a commit to 2.3 for 2.4 features. This re-adds them to the 2.5 branch
646d933 Merge branch '2.3' into 2.5
deb7c29 Merge branch '2.3' into 2.5
0212a98 Front-porting changes by @pborreli in #4531
6e23bc7 Merge branch '2.5' into 2.6
06bc489 Merge branch '2.3' into 2.5
3b9d60d feature #4517 [Reference] document configurable PropertyAccessor arguments (xabbuh)
32e6f06 Added two missing pulls
70e2288 Added November changelog
4a59ae0 Merge branch '2.5' into 2.6
8c30ae9 Added November changelog
4ce26e7 Merge branch '2.3' into 2.5
5363542 feature #4188 Updated documentation regarding the SecurityContext split (iltar)
deff25f Updated documentation regarding the SecurityContext split; symfony/symfony#11690
5ef52ee changing line breaks to be shorter, no real change
564640c Merge branch '2.5' into 2.6
ddc0a50 Merge branch '2.3' into 2.5
f30f753 feature #4050 [Translation] added logging capability. (aitboudad)
e8e50fa added logging  to translator.
f587903 Merge branch '2.5' into 2.6
5edaca0 Merge branch '2.3' into 2.5
cd29dde Merge branch '2.5' into 2.6
a85991a Merge branch '2.3' into 2.5
2d95cb5 bug #4564 Typo when expression language is used to configure a service. (rubenrua)
21b00b0 Typo when expression language is used to configure a service.
27cb445 Update Symfony reference to 2.6 version
33554fc feature #4456 New validation API usage in Class Constraint Validator (skwi)
e431fdb New validation API usage in Class Constraint Validator
e96ebd3 bug #4522 Add missing brackets to PropertyAccessor examples (loonytoons)
d6b4795 Add missing brackets to PropertyAccessor examples
828ba4d document configurable PropertyAccessor arguments
ffd8d78 Merge branch '2.5' into 2.6
58c0baf Merge branch '2.3' into 2.5
f544d5f Merge branch '2.5' into 2.6
54957e1 Merge branch '2.3' into 2.5
5ec7cd1 Merge branch '2.5' into 2.6
f748378 feature #4498 Use new factory syntax (WouterJ)
8beadce minor #4496 [Book][Security] link to a bundle's current (not master) docs (xabbuh)
59f0374 feature #4490 Documented ExpressionLanguage extensibility (WouterJ)
ed241ab feature #4487 Documented html5 option (WouterJ)
48a5af3 feature #4486 Renamed empty_value to placeholder (WouterJ)
3ecfcaf Merge branch '2.5' into 2.6
4447b74 Merge branch '2.3' into 2.5
43809b1 minor #4479 remove versionadded directives for old versions (xabbuh)
d08925e Yet another typo fix
9cbcc2b Applied fixes
086885b Applied comments
238beef Typo fix
9a22865 feature #4446 [Book][Templating] refer to the VarDumper component for dump() (xabbuh)
ed5c61f feature #4411 Added a reference to the Bootstrap 3 form theme (javiereguiluz)
c85a8ac Added a reference to the Bootstrap 3 form theme
766e01f feature #4169 [Components][Form] document $deep and $flatten of getErrors() (xabbuh)
f8226e2 Merge branch '2.5' into 2.6
08ca28a Merge branch '2.3' into 2.5
d7998b0 Use new factory syntax
ef7495e link to a bundle's current (not master) docs
ef4ca42 Documented new tags
c553193 Documented expressionlanguage extensibility
22069f4 Documented html5 option
54c44ea Renamed empty_value to placeholder
363e38f Added documentation about the DebugFormatter helper
7f40f23 remove versionadded directives for old versions
ad4c1f0 Merge branch '2.5' into 2.6
0a889ff Merge branch '2.3' into 2.5
1122ee7 Merge branch '2.5' into 2.6
46167a6 Merge branch '2.3' into 2.5
a79196a typos in the var-dumper component
17c6cac [#4243] Tweaks to the new var-dumper component
cd182f2 [Form] Add entity manager instance support for em option
c1eb0c5 refer to the VarDumper component for dump()
733de39 Added cache_busting to default asset config
eb48e4d Redo URL fix
96a12f0 Reverted merge
d7e0fb9 Merge branch '2.5' into 2.6
7cc4287 bug #4442 replace doc role for bundle docs with external ref (xabbuh)
d27bcc5 replace doc role for bundle docs with external ref
abc88ee Merge branch '2.5' into 2.6
cea8f2a fixed a reference
e7cba20 Merge branch '2.5' into 2.6
5a92261 Merge branch '2.3' into 2.5
97943e8 Merge branch '2.5'
b5caf4a Merge branch '2.3' into 2.5
2328b48 Created October CHANGELOG
a85af58 Merge branch '2.5'
c8c99d6 Created October CHANGELOG
4e4f984 Merge branch '2.3' into 2.5
51d7032 Created September CHANGELOG
e5f1cd7 Merge branch '2.5'
67ae64f Created September CHANGELOG
8c518fb Merge branch '2.3' into 2.5
39e5578 Merge branch '2.5'
8e22758 Merge branch '2.3' into 2.5
d2c2b02 Merge branch '2.5'
0a0880c Merge branch '2.3' into 2.5
30c036b Merge branch '2.5'
1ae4e80 Merge branch '2.3' into 2.5
d1afa4d feature #4243 [WIP] var-dumper component (nicolas-grekas)
041e858 add examples
5d43069 [#4058] Minor language and formatting tweaks (moving the link reference to the bottom)
2270fd1 [#3386] Minor language tweaks
23f790a feature #4058 Skip console commands from event listeners (tPl0ch)
4b98d48 feature #3386 [Translation] added method to expose collected message (Grygir)
23712fb more accurate doc about limits
9ed31c8 Merge branch '2.5'
98e6c09 Merge branch '2.3' into 2.5
242d4f6 feature #4319 Documentation for debug:event-dispatcher command (matthieuauger)
a4fed11 Documentation for debug:event-dispatcher command
0245e91 [Form] document $deep and $flatten of getErrors()
4221db8 describe how to access form errors
217bf5f minor #4353 [Cookbook][Controller] fix route prefix in PHP code example (xabbuh)
c578fe7 how to dump as string note
edb0ff9 minor adjustments
6a3e170 § about DebugBundle config
83ed35b Merge branch '2.5'
de286e2 Merge branch '2.3' into 2.5
9cfc682 Merge branch '2.5'
b582e4e Merge branch '2.3' into 2.5
cb0ee89 § about Data::getLimitedClone()
e71e5f2 Merge branch '2.5'
715e00c Merge branch '2.3' into 2.5
dde6919 bug #4390 Update custom_constraint.rst (luciantugui)
ed0c41e Merge branch '2.5'
aeeb3c8 Merge branch '2.3' into 2.5
6406a27 minor #4391 Removed unused use UsernameNotFoundException (boekkooi)
4e6256b Removed unused use UsernameNotFoundException
dbb25b9 bug #4379 [OptionsResolver] Fix wrong namespace in example (rybakit)
ee2d7e4 section for DebugBundle/Twig integration
d695447 Merge branch '2.5'
37e6d4b Merge branch '2.3' into 2.5
5f8b13c Update custom_constraint.rst
22b9b27 minor #4372 Tweaks after proofreading the 2.6 OptionsResolver stuff (weaverryan, WouterJ)
b49731b Linking to the 2.6 headline thanks to a suggestion from @xabbuh
90bc241 Merge branch '2.5'
3b303a7 Merge branch '2.3' into 2.5
28eefe2 [#4299] Very minor language tweak
bd85865 feature #4299 [Serializer] Handle circular references. symfony/symfony#12098. (dunglas)
a1badc5 Renaming a method at the suggestion of my friend Bernhard
f179ec7 A few more tweaks from comments
a58b0d1 Merge branch '2.5'
fd9c1a0 Merge branch '2.3' into 2.5
0db5e03 [OptionsResolver] Fix wrong namespace in example
eb752cc minor #4363 Fixed sentence (WouterJ)
5e7fa55 Merge branch '2.5'
f11d31f Merge branch '2.3' into 2.5
59fd436 Also did a quick proofread
d190831 Tweaks after proofreading the 2.6 OptionsResolver stuff
1117741 feature #4159 [WCM][OptionsResolver] Adjusted the OptionsResolver documentation to describe the 2.6 API (webmozart, peterrehm)
1a410e4 Fixed sentence
575c320 Updated OptionsResolver documentation: removed static methods
b5b45bc move Dumper section above the Caster one
1a1476e [Serializer] Handle circular references. symfony/symfony#12098.
16daca4 fix route prefix in PHP code example
34f8fdf Merge branch '2.5'
6fb5ad5 Merge branch '2.3' into 2.5
399932a Merge branch '2.5'
358976c Merge branch '2.3' into 2.5
9838438 [#4293] Fixing bad path
2cd6646 feature #4293 Document error page preview (Symfony ~2.6) (mpdude)
142c826 feature #4005 [Cookbook][Web server] description for running PHP's built-in web server in the background (xabbuh)
d02c7c4 Updates according to GH feedback
3caec21 description for running PHP's built-in web server in the background
1afb389 Merge branch '2.5'
7d95faf Merge branch '2.3' into 2.5
5546d67 Merge branch '2.5'
2e35f03 Merge branch '2.3' into 2.5
cfbc03f Merge branch '2.3' into 2.5
1264963 [#4204] Fixing slight markup issue
f583a45 feature #4204 [Reference][Constraints] validate `null` (Expression constraint in 2.6) (xabbuh)
440e004 Merge branch '2.5'
fa32606 Merge branch '2.3' into 2.5
86c67e8 feature #4233 2.5 Validation API changes (nicolassing, lashae, Rootie, weaverryan)
0f34bb8 feature #3956 [Command] Added LockHelper (lyrixx)
909a294 [Filesystem] Added documentation for the new LockHandler
2bf8c55 [Filesystem] Moved current document to a dedicated folder
8e70373 Document error page preview in Symfony ~2.6 (#4293)
39b4430 Minor language tweaks
278de83 feature #3930 [Console] Add Process Helper documentation (romainneutron)
907ce67 Merge branch '2.5'
d618fd0 Merge branch '2.3' into 2.5
3b6d6d6 Merge branch '2.5'
9e942b1 Merge branch '2.3' into 2.5
9e0e12d Merge branch '2.5'
171f085 Merge branch '2.3' into 2.5
25a17fe feature #4264 [#4003] A few more form_themes config changes (weaverryan)
b78a20a Merge branch '2.3' into 2.5
459052d Merge remote-tracking branch 'origin/2.4' into 2.5
a9d6a8b [Console] Add Process Helper documentation
228111b minor #4316 Remove horizontal scrollbar (ifdattic)
53638a6 Remove horizontal scrollbar
5b65654 feature #3912 [Security] Added remote_user firewall info and documentation for pre authenticated firewalls (Maxime Douailin, mdouailin)
10e6f05 Merge branch '2.5'
bbcb866 Merge branch '2.3' into 2.5
e5fed9d minor #4303 Fix spelling (nurikabe)
8bb1c9a Fix spelling
2fc3811 use VarCloner instead of Php/ExtCloner
f36c45e uppercase title
6405a21 Merge branch '2.5'
6c6aecf Merge branch '2.3' into 2.5
b6286fd Merge branch '2.5'
aac823e Merge branch '2.3' into 2.5
5d505bb feature #4206 Added note about ProgressBar changes (kbond)
fb18056 validate `null` (Expression constraint in 2.6)
fab825d Merge pull request #1 from peterrehm/patch-9
a535c9f minor #4285 Update security.rst (placid2000)
97a6290 Update security.rst
350e0c7 split intro/advanced sections
036edcb doc for Dumpers
4198889 Merge branch '2.5'
3e91380 Merge branch '2.4' into 2.5
a6724f4 Merge branch '2.3' into 2.4
9874d8e [#4233][#4094] Making validateValue and validate changes
94fc520 Minor tweaks and a missing location thanks to xabbuh and WouterJ
f97ba7a Fixes thanks to @xabbuh
279d8d6 Adding a section about keeping BC in a re-usable bundle
280440e Adding details about the 2.4 API as comments
e658b56 added a versionadded comment to Callback.rst
70c5ca1 Update custom_contraint.rst to meet the new 2.5 api
5dfe499 Don't use deprecated functions in Callback.rst
f4380ed Update Callback.rst
042dcf9 Replace addViolationAt (deprecated) by buildViolation
2b9675a Merge branch '2.5'
77d166b Merge branch '2.4' into 2.5
42e243c Merge branch '2.3' into 2.4
e8a1501 feature #4201 [Components][Process] `mustRun()` documentation (xabbuh)
ad6a340 [Components][Process] `mustRun()` documentation
e5d432c [#4047] Re-adding the versionadded for the info() method
705921f Merge branch '2.5'
8c9847d Merge branch '2.4' into 2.5
a2a6a08 Merge branch '2.3' into 2.4
c289ac8 bug #4279 Double-quotes instead of single quotes (UnexpectedValueException in Windows 8) (galdiolo)
ac4d9cd Double-quotes instead of single quotes (UnexpectedValueException in Windows 8)
3580658 Merge branch '2.5'
0017bf4 Merge branch '2.4' into 2.5
f56e733 Merge branch '2.3' into 2.4
7dc6e5c Reduce line length
5e0b9bd review effect
f4d308a Created August CHANGELOG
9dd3a77 Created August CHANGELOG
f641e69 Created August CHANGELOG
2a14bf3 Clarifying some language
287c7bf minor #4275 added Nicolas to the list of mergers for the new var dumper component (fabpot)
881f8d8 added Nicolas to the list of mergers for the new var dumper component
695cb20 [#4003] A few more form_themes config changes
2962e14 feature #4003 [Twig][Form] Moved twig.form.resources to a higher level (stefanosala)
e6aa733 swapped comment and opening in xml configuration example
63d8657 [Twig][Form] Moved twig.form.resources to a higher level
8386d44 Merge branch '2.5'
84aaa10 Merge branch '2.4' into 2.5
ba293dd Merge branch '2.3' into 2.4
8dfd259 Merge branch '2.5'
f42a300 Merge branch '2.4' into 2.5
fdeab33 Merge branch '2.3' into 2.4
4e2142d Added note about ProgressBar changes
26edf7a intro the var-dumper component
bb0f530 Merge branch '2.5'
b50dd72 Merge branch '2.4' into 2.5
a16b71b Merge branch '2.3' into 2.4
235558c Merge branch '2.5'
90c2cc1 Merge branch '2.4' into 2.5
4485637 Merge branch '2.3' into 2.4
9f0f14e feature #4210 Move debug commands to debug namespace (matthieuauger)
f202fb8 Removed duplicate use statements
a3400fd Merge branch '2.5'
73d44d1 Merge branch '2.4' into 2.5
4f2f54d Merge branch '2.3' into 2.4
1254d77 Merge branch '2.5'
de0e355 Merge branch '2.4' into 2.5
c570ee3 Merge branch '2.3' into 2.4
ea068c2 feature #4202 [Reference][Constraints] caution on `null` values in Expression constraint (xabbuh)
d6dd540 Move debug command to the debug namespace
070489b caution on `null` values in Expression constraint
72939d5 Merge branch '2.5'
f732747 Merge branch '2.4' into 2.5
4267086 Merge branch '2.3' into 2.4
c0f9c31 Merge remote-tracking branch 'origin/master'
db425d9 Merge branch '2.5'
1018da8 Merge branch '2.4' into 2.5
3a77561 Merge branch '2.3' into 2.4
8f01195 minor #4212 Missing backtick, thanks to @Baptouuuu (WouterJ)
02d1091 bug #4209 Fix method for adding placholders in progressBar (danez)
dadaea3 Missing backtick, thanks to @Baptouuuu
be4ec85 Reverts c723d8dd546412b08ffaf3846b5574f4f4021418
c723d8d Missing backtick, thanks to @Baptouuuu
f3ef9dc The name of the placeholder must not be encapsulated in %
fb0e79c Fix method for adding placholders in progressBar
1ea6304 Merge branch '2.5'
4a7f973 Merge branch '2.4' into 2.5
e579876 Merge branch '2.3' into 2.4
60bdde9 Merge branch '2.5'
0d2bf4f Merge branch '2.4' into 2.5
a7738ca Merge branch '2.3' into 2.4
3aba31f bug #4184 [Page Creation] Route description correction. (ohvitorino)
9de96e6 feature #3995 [DX] New service to simplify password encoding (aferrandini)
0a45113 Route description correction.
785827f New service to simplify password encoding
928a579 Merge branch '2.5'
cea3fa6 Merge branch '2.4' into 2.5
924851f Merge branch '2.3' into 2.4
5fac303 bug #4165 Update voters.rst (gerryvdm)
a5f54e3 Update voters.rst
df640b2 Updated for CMF doc refactoring
ae66893 Added missing mailer class and use statements
7a585a5 Merge branch '2.5'
936cb0f Merge branch '2.4' into 2.5
4c3c726 Merge branch '2.3' into 2.4
155c3e8 bug #4153 [Reference] fix namespace in Expression constraint (xabbuh)
43ae1d8 [OptionsResolver] Adjusted the OptionsResolver documentation to describe the 2.6 API
b87f1ee Merge branch '2.5'
e7a17ff Merge branch '2.4' into 2.5
281d490 Merge branch '2.3' into 2.4
a7f3297 minor #4136 [Reference] fix from suffix to prefix (xabbuh)
5379f54 feature #4086 [Reference][Constraints] Added hint about attaching the expression constraint to a form field (peterrehm)
abc3927 Added hint about attaching the expression constraint to a form field
1deabde [Reference] fix namespace in Expression constraint
d185f40 fix from suffix to prefix
be22e06 Merge branch '2.5'
cd07f5f Merge branch '2.4' into 2.5
850b93b Merge branch '2.3' into 2.4
79cb4f1 feature #4069 document the namespace alias feature (dbu)
c53d9d6 Merge branch '2.5'
bb39863 Merge branch '2.4' into 2.5
303ff29 Merge branch '2.3' into 2.4
08bed5f feature #4128 Finished #3759 (WouterJ)
5ab5246 minor #4127 Second part of #3848 (WouterJ)
4629d8b bug #4116 Fixed the code snippets for the expression language functions (stof)
e2f13a4 feature #4039 [DomCrawler] Added node name getter (fejese)
aa70a98 [#3975] Minor typo
2758e79 Merge pull request #3975 from WybrenKoelmans/binaryresponse-delete-file-after-send
3f92d5f feature #3966 [Cookbook][Controller] Add note about invokable controller services (kbond)
9d7c999 feature #3895 [Validator] Support "maxSize" given in KiB (jeremy-derusse)
d753d0e document the namespace alias feature
529675a Check for api_key in request
59e4bd4 Update api_key_authentication.rst - POST Method
c7d1791 Fixed typos
f701f73 [Translation] added method to expose collected message
fdf2a95 Merge branch '2.5'
cffd6b9 Merge branch '2.4' into 2.5
1f14a0e Merge branch '2.3' into 2.4
569e0fc Merge branch '2.5'
bdd729a Merge branch '2.4' into 2.5
fb387a8 Merge branch '2.3' into 2.4
e197e34 Merge branch '2.5'
d0ca865 Merge branch '2.4' into 2.5
3ecfb85 Fixing my bad merge conflict resolution
f40bb24 Merge branch '2.4' into 2.5
68e022a Merge branch '2.3' into 2.4
2b9cb7c feature #4076 Fixed description of session storage of the ApiKeyAuthenticator (peterrehm)
98aed88 Fixed description for session storage
3eaaf26 Fixed the code snippets for the expression language functions
47c7fe2 Added July changelog
b2a70d1 Added July changelog
8cbdf15 Added July changelog
bedc0b8 Merge branch '2.5'
5e9fe63 Merge branch '2.4' into 2.5
aa43d32 Merge branch '2.3' into 2.4
2f85518 Merge branch '2.5'
e9e57ce Merge branch '2.4' into 2.5
6606698 Merge branch '2.3' into 2.4
8f3a261 bug #4092 See #4091 (dannykopping)
b8687dd minor #4091 Put version into quotes, otherwise it fails in ZSH (dannykopping)
e586e6c See #4091
6dc62a8 Put version into quotes, otherwise it fails
488fbb2 Merge branch '2.5'
30bb6c5 Merge branch '2.4' into 2.5
3f3cd2a Merge branch '2.3' into 2.4
f13e0fc Merge branch '2.5'
b8481d8 Merge branch '2.4' into 2.5
8ead0b7 Merge branch '2.3' into 2.4
09c9af4 [DomCrawler] Added node name getter
9879ee6 Add note about invokable controller services
561c6ee Merge branch '2.5'
61434a8 Merge branch '2.4' into 2.5
4de8cd5 Merge branch '2.3' into 2.4
8fdfc22 Merge branch '2.5'
8804fe3 Merge branch '2.4' into 2.5
1f12a08 Merge branch '2.3' into 2.4
a7fe00f minor #4068 Remove diff info from cookbook/security/voters.rst (pmartelletti)
6236fdb Remove diff info from file.
1fc14af Merge branch '2.5'
1c948c8 Merge branch '2.4' into 2.5
7c98ac7 Merge branch '2.3' into 2.4
639bc92 Merge branch '2.5'
ffa4360 Merge branch '2.4' into 2.5
6d11002 Merge branch '2.3' into 2.4
f519869 Merge branch '2.5'
5e5abd3 Merge branch '2.4' into 2.5
1ad82b6 Merge branch '2.3' into 2.4
eed8d64 minor #4026 Updating Symfony version from 2.4 to 2.5 (danielsan)
cb508f7 [WCM] Skip console commands from event listeners
6751a07 Merge branch '2.5'
aab4044 Merge branch '2.4' into 2.5
1eec58b Merge branch '2.3' into 2.4
99932cf bug #4010 [Console] Fixed documentation for ProgressBar (VasekPurchart)
7ea87e6 minor #4016 Fixed the format of one letter-based list (javiereguiluz)
12752c1 minor #4013 Removed wrong reference to cookbook (gquemener)
06f8c31 bug #4012 Fix xml route configuration for routing condition (xavierbriand)
e918a6d Fix xml route configuration for routing condition
81d962f Configuring composer.json to use the 2.5 version
2299df0 Updating Symfony version from 2.4 to 2.5
47fe03a Merge branch '2.5'
74c2e94 Merge branch '2.4' into 2.5
95243cd Merge branch '2.3' into 2.4
a2a628f bug #4025 added CVE 2014-4931 (fabpot)
df88491 added CVE 2014-4931
cf129dc Merge branch '2.5'
8022f46 Merge branch '2.4' into 2.5
0718cee Merge branch '2.3' into 2.4
5946be6 Merge branch '2.5'
21e1df6 Merge branch '2.4' into 2.5
b6e631e Merge branch '2.3' into 2.4
a1435e5 bug #3998 [Console] Fixed QuestionHelper examples (florianv)
ec832dc minor #3994 [Console] Fix Console component $app to $this and use of getHelper() method (eko)
b32f9f2 bug #3771 Fix function example in expression language component (raulfraile)
235cf33 Removed return statement
755b1c1 Fix function example in expression language component
4bc00df Fixed documentation for ProgressBar
d87d803 Fixed the format of one letter-based list
b8f27ef Removed wrong reference to cookbook
97c3894 [Console] Fixed QuestionHelper examples
1f4dc76 [Console] Fix Console some $app to $this and getHelperSet()->get() to getHelper()
abda29b #11212 [HttpFoundation] Added a switch to delete file after the response is send
2ae4f34 feature #3746 [Validator] Disallow empty file in FileValidator (megazoll)
1805aa9 Merge branch '2.5'
1938c2f feature #3724 Updated ISBN validator docs (sprain)
fcae3cd Updated ISBN validator
2140e2c Merge branch '2.5'
1efcdba Merge branch '2.4' into 2.5
a2ce937 Merge branch '2.3' into 2.4
7c71b18 feature #2952 Enabling profiler in test (danieledangeli)
e9a1a32 Merge branch '2.5'
071f583 Merge branch '2.4' into 2.5
2aea99d Merge branch '2.3' into 2.4
25e75ef Merge branch '2.5'
fc872a9 Merge branch '2.4' into 2.5
575a75a Merge branch '2.3' into 2.4
373013a Merge branch '2.5'
a40a4c4 Merge branch '2.4' into 2.5
49f4cda Merge branch '2.3' into 2.4
2b2d9d3 feature #3972 Added PSR-4 to Class Loaders list (dosten)
d9ac63f Merge branch '2.5'
f34eaed Added June changelog
91ce3a7 Merge branch '2.4' into 2.5
1e6b55e Added June changelog
01598a7 Merge branch '2.3' into 2.4
4f550c8 Merge branch '2.5'
deb7835 Merge branch '2.4' into 2.5
ec0f87b Merge branch '2.3' into 2.4
b8a0eb2 fixes missing backtick
1e8fa48 Replace bullet list by a table
77a0687 Add versionAdded on binary suffix
b414f5c Use comma as thousands separator
7dcd7c3 Move secion "binaryFormat" to the right place
71fdd60 Fix line wrap
3f3f4e0 Provide information about SI and Binary prefixes
deac0c3 Add option binaryFormat in constraint file
e3acdc5 Support MaxSize in KiB and MiB
d1c95ce Added PSR-4 ClassLoader to list
80673d5 Disallow empty file in FileValidator
855f959 Merge branch '2.5'
741ad05 Merge branch '2.4' into 2.5
d305d91 Merge branch '2.3' into 2.4
84332ff bug #3945 Fixed missing component name in namespaces (WouterJ)
9dfc088 Fixed missing component name in namespaces
eb268c5 Merge branch '2.5'
b879ad7 Merge branch '2.4' into 2.5
3f0c9ea Merge branch '2.3' into 2.4
b7a03f8 minor #3937 properly escape backslashes in class and method directives (xabbuh)
be0d866 fix missing backtick, rephrased bottom note
86ba188 rebased using x509 pr, added remote_user pre authenticated part
8465d46 [Reference][Configuration] Removed version added for remote_user
34ad1b5 [Security] Added remote_user firewall info and documentation for pre authenticated firewalls
6c4421b properly escape backslashes in class and method directives
29664fb Merge branch '2.5'
c042934 Merge branch '2.4' into 2.5
d45a60f Merge branch '2.3' into 2.4
882471f minor #3935 Typo (greg0ire)
04f4318 bug #3934 Move __construct after the repository assignment (cmodijk)
84ea4c8 Move __construct after the repository assignment
0c2a9b3 minor #3931 [Component][EventDispatcher] 2.5 specific documentation for the TraceableEventDispatcher (xabbuh)
46b21bd Merge branch '2.4' into 2.5
d6ad6a9 Merge branch '2.3' into 2.4
b31ea51 minor #3929 Update custom_authentication_provider.rst (verschoof)
3ec651c Update custom_authentication_provider.rst
c7c48b8 fix typo
cf667c9 update the TraceableEventDispatcher to reflect its movement to the EventDispatcher component in Symfony 2.5
8f69f0e Merge branch '2.4'
140e54e Merge branch '2.4' into 2.5
3393cba Merge branch '2.3' into 2.4
b6bba95 Merge branch '2.4'
6629db8 Merge branch '2.4' into 2.5
95a6b74 Merge branch '2.3' into 2.4
22cbf1f Merge branch '2.4'
e19fd2a Merge branch '2.4' into 2.5
5a4eb57 Merge branch '2.3' into 2.4
3ddbe1b minor #3923 Fixed the headers of one table (javiereguiluz)
864d930 Fixed the headers of one table
70a7871 Merge branch '2.5'
db48945 Merge branch '2.4' into 2.5
cd3d7cf Merge branch '2.3' into 2.4
5b8df28 Merge remote-tracking branch 'origin/2.5' into 2.5
df9f31a minor #3882 change version numbers in installation notes to be in line with the docu... (xabbuh)
c24d262 change version numbers in installation notes to be in line with the documented Symfony version
43ae4f1 Added May changelog
c5ca497 Added May changelog
b937b41 Added May changelog
bfd8488 Merge branch '2.4' into 2.5
1561f03 Merge branch '2.3' into 2.4
ed496ae minor #3887 [Components][Form] add versionadded for the data collector form extension (xabbuh)
47ce3f1 Fixed syntax
eadf281 feature #3874 Updated the installation instructions for Symfony 2.5+ (javiereguiluz)
f368523 Merge branch '2.3' into 2.4
9a533ce Merge branch '2.4' into 2.5
bc0fe91 Merge branch '2.3' into 2.4
3e3004f minor #3865 Fixed link. (aitboudad)
564f60d Fixed link.
4fd1b49 feature #3753 [DependencyInjection] Add documentation about service decoration (romainneutron)
e6bc038 Add documentation about service decoration
beceed4 add versionadded for the data collector form extension
6c87f99 Merge branch '2.4' into 2.5
080a769 Merge branch '2.3' into 2.4
f913dd7 feature #3603 [Serializer] Support for is.* getters in GetSetMethodNormalizer (tiraeth)
1f5d980 added a note about is* getters support with GetSetMethodNormalizer
e8511cb feature #3776 Updated event_listener.rst (bfgasparin)
83bb723 Updated the installation instructions to Symfony 2.5+
704d206 Merge branch '2.4'
fc2698b Merge branch '2.3' into 2.4
797cbd5 minor #3794 Adds link to new QuestionHelper (weaverryan)
6b56422 Merge branch '2.4'
344c1e4 Merge branch '2.3' into 2.4
b760612 Merge branch '2.4'
bbfdb21 Merge branch '2.3' into 2.4
00f60a8 minor #3837 More asset version details (weaverryan)
21a4b9d Merge branch '2.4'
a669d83 Merge branch '2.3' into 2.4
681ddc8 minor #3843 [Changelog] fix literal positions (xabbuh)
1aa79d5 minor #3834 fix the wording in versionadded directives (for the master branch) (xabbuh)
4eafdbd [#3837] Fixes thanks to stof and WouterJ
36f68b6 fix the wording in versionadded directives
3e3b79d Merge branch '2.4'
1dbf4f9 Removing incorrect "No Changes" after merge conflicts
0fe1bfd Merge branch '2.4'
0ef4751 Merge branch '2.3' into 2.4
89d0dae minor #3833 fix the wording in versionadded directives (for the 2.4 branch) (xabbuh)
fe5a39f fix literal positions
6d00c3d [#3797] Reordered changelog
c01e87c Added April changelog
513a389 [#3797] Reordered changelog
66dffb0 Added April changelog
5e7092f Merge branch '2.4'
6487c65 Merge branch '2.3' into 2.4
baa9759 bug #3791 Property access tweaks (weaverryan)
d6474fc Merge branch '2.4'
e28d0cb Merge branch '2.3' into 2.4
560e010 Adding more details to be clear that you can set asset version globally or locally on an asset
a9648e8 feature #3742 [2.5][Templating] Add documentation about generating versioned URLs (romainneutron)
27360b6 fix the wording in versionadded directives
be6c79d Merge branch '2.4'
f1a79e2 Merge branch '2.3' into 2.4
678224e minor #3808 Fixed broken link in "Handling Authentication Failure" (stacyhorton)
69b52c7 Merge branch '2.4'
fed881d Merge branch '2.3' into 2.4
136f98c minor #3784 [Expression Langage] be consistent in "print/print out" uses (mickaelandrieu)
c8bfde6 Merge branch '2.4'
863a764 Merge branch '2.3' into 2.4
2ebabfb bug #3792 Update commands_as_services.rst (mimol91)
ea07ef1 Update commands_as_services.rst
14a78d3 Fixed broken link in "Handling Authentication Failure"
512ae2c Updated changelog for March
98288fc Updated changelog for March
b4a0fb0 Merge branch '2.4'
7e40a29 Merge branch '2.3' into 2.4
eef3313 [#3752] Adding the question helper to the helper list and marking dialog as deprecated
9e129bc feature #3752 [Console] Add documentation for QuestionHelper (romainneutron)
552c780 Revert "[Console] Add Process Helper documentation"
64a924d feature #3756 [WCM][Console] Add Process Helper documentation (romainneutron)
fb9fe99 [#3729] Removing 3rd argument to isWritable - this doesn't exist in the final merged item
319bf29 [#3729] Making minor changes thansk to @WouterJ and @xabbuh.
be4b9d3 feature #3729 Added documentation for the new PropertyAccessor::isReadable() and isWritable() methods (webmozart)
70a3893 feature #3774 [Book][Internals] add description for the kernel.finish_request event (xabbuh)
4fc3b6a Fixed internals.rst syntax
c0fdca7 [Expression Langage] be consistent in "print/print out" uses
1705231 [Console] Add Process Helper documentation
f4ee337 [Console] Add documentation for QuestionHelper
a6b17a0 Added KernelEvent::isMasterRequest method reference
8e8b8a0 Added Versionadded directive to event_listener.rst
0127bd2 Updated event_listener.rst
f02fb35 [Book][Internals] add description for the kernel.finish_request event
cedfdce minor #3757 Fixed a typo in the request formats configuration page (gquemener)
c77835c Merge branch '2.4'
1172b7d Merge branch '2.3' into 2.4
1934720 feature #3461 [Form] Deprecated max_length and pattern options (stefanosala)
610462e minor #3755 [Cookbook][Security] Firewall resitrction tweaks, fix markup, add to toc (xabbuh)
efbe0f3 Fixed a typo
612ab9b add missing toctree entry for the firewall restriction article
456da28 [Form] Deprecated max_length and pattern options
899bc4e fix literal
f6af251 [Templating] Add documentation about generating versioned URLs
d2faada Merge branch '2.4'
b123484 Merge branch '2.3' into 2.4
0a21718 minor #3695 Firewall backport (weaverryan)
c062d81 feature #3469 [Validator] - EmailConstraint reference (egulias)
ec3aaca Merge branch '2.4'
dbaef06 Merge branch '2.3' into 2.4
a4ef0e1 Merge branch '2.4'
f8645c8 Merge branch '2.3' into 2.4
bb8e3ed Added documentation for the new PropertyAccessor::isReadable() and isWritable() methods
80045df Merge branch '2.4'
78425c6 minor #3722 add "Commands as Services" chapter to the cookbook's map (xabbuh)
119064d Merge branch '2.4'
1f6bdd1 Merge branch '2.3' into 2.4
b34fb64 feature #3619 [Validator] Uuid constraint reference (colinodell)
d7027c0 feature #3418 [Validation] Add "hasser" support (bicpi)
cad38ae bug #3721 tweaks to the Console logger (xabbuh)
3580b7b add "Commands as Services" chapter to the cookbook's map
610eb6b code fixes as mentioned by @dirkluijk
83adc87 fix class roles
3bbccf7 fix PSR-3 link as mentioned by @max-voloshin
9b0911b fix grammer mistake
dd16589 add logger chapter to the component's map
974cb18 Merge branch '2.4'
9f7bbdf Merge branch '2.3' into 2.4
4b611d6 minor #3717 [master] Fixed versionadded blocks (WouterJ)
4fd5fc1 feature #3539 [Stopwatch] Describe retrieval of StopwatchEvent (jochenvdv)
c703549 Merge branch '2.4'
499eb6c minor #3714 [2.4] Versionadded consistency (WouterJ)
8e6e550 Merge branch '2.4'
a849123 Merge branch '2.3' into 2.4
b3372cf Made versionadded consistent
239b1b6 Some markup fixes
0ee15d3 Fix versionadded
295f109 Add reason for getEvent()
ac484f4 Made suggested tweaks
78d4a0f More consistency stuff
8187776 was added -> was introduced
72d40a8 Merge branch '2.4'
b0e07b4 Merge branch '2.3' into 2.4
db1cda5 minor #3700 [Cookbook][Security] Firewall restrictions tweaks (xabbuh)
1908a15 feature #3696 [Console] Added standalone PSR-3 compliant logger (dunglas)
c75b1a7 feature #3621 [Console] Command as service (gnugat)
15628e6 [Console] Added standalone PSR-3 compliant logger
c8fe610 Moved back and listened to @weaverryan
955526c Merge branch '2.4'
d8182fc Merge branch '2.3' into 2.4
70b55b5 fix literal
ddf5fe4 add firewall restriction document to security toctree
a12aa41 Merge branch '2.4'
5a161d5 Merge branch '2.3' into 2.4
15a9d25 minor #3697 [Console] Change Command namespaces (dunglas)
0816a07 [Console] Change Command namespaces
e40733d Merge branch '2.4'
15b813f Merge branch '2.3' into 2.4
be46c76 After backporting something from master (2.5), removing the 2.5-specific features
9889dbe Enhanced Firewall Restrictions docs
450146e feature #3681 Enhanced Firewall Restrictions docs (danez)
2f3f88b Merge branch '2.4'
3570711 Merge branch '2.3' into 2.4
eafbab1 Enhanced Firewall Restrictions docs
5fb6d21 Merge branch '2.4'
de03953 Merge branch '2.3' into 2.4
27b3410 minor #3692 [Book][Translations] fixing a code block (xabbuh)
a6a074c fixing a code block
8673b59 Merge branch '2.4'
68e8c04 Merge branch '2.3' into 2.4
dcf8e6e feature #3402 Added documentation about new requests formats configuration (gquemener)
842fd30 feature #3683 [TwigBundle] Add documentation about generating absolute URL with the asset function (romainneutron)
fc1576a feature #3664 [Process] Add doc for Process::disableOutput and Process::enableOutput (romainneutron)
3731e2e feature #3686 Documentation of the new PSR-4 class loader. (derrabus)
cd6d1de minor #3676 remove unnecessary code block directive (xabbuh)
bd947c7 [TwigBundle] Add documentation about generating absolute URL with the asset function
5b915c2 feature #3629 Added documentation for translation:debug (florianv)
4dde2ca [Process] Add doc for Process::disableOutput and Process::enableOutput
07822b8 minor #3675 add missing code block directive (xabbuh)
cb2be4a Moved versionadded block to the top.
16fead4 Adjustments from comments by @bicpi
a05da41 Minor corrections.
6f2a1a3 Adjustments from comments be @WouterJ
17166bd First shot of a documentation of the new PSR-4 class loader.
37278d8 remove unnecessary code block directive
3ace4d6 add missing code block directive
b6ac454 Fixed the issues
739f43f minor #3669 Fixed syntax highlighting (rvanlaarhoven)
38b2955 Improved the documentation with examples and images
864b9f2 Merge branch 'master' of github.com:symfony/symfony-docs into translation-debug
857725b Merge branch '2.4'
f893883 Merge branch '2.3' into 2.4
df637409 feature #3627 added docs for the new Table console helper (fabpot)
484b7b9 Added :
7eb3051 Fixed syntax highlighting
876a55d Merge remote-tracking branch 'origin/master'
96bd81b feature #3626 added documentation for the new Symfony 2.5 progress bar (fabpot)
1cc5925 add parenthesis in the example to correct precendence
153f97f Added 2.5 CHANGELOG
6c7cb88 Merge branch '2.4'
881477c Created 2.4 CHANGELOG
b6eb309 Merge branch '2.3' into 2.4
8eaf232 Merge branch '2.4'
0bc09d7 Merge branch '2.3' into 2.4
b02c16a feature #3565 added information on AuthenticationFailureHandlerInterface (samsamm777)
e915162 fixed typo
9445676 recommendations by xabbuh
c5a87fa fixed authentication failed header
698825f fixed line wrapping
92fb4b1 added information on AuthenticationFailureHandlerInterface in api keys docs
e8b3320 Took into account @cordoval's feedback
0a65b6f minor #3608 [Reference][Forms] add versionadded directive for multiple option of file type (xabbuh)
e33be6d Merge branch '2.4'
d6a17e7 Merge branch '2.3' into 2.4
fc28453 bug #3039 use DebugClassLoader class from Debug component instead of the one from ... (xabbuh)
9a93879 use DebugClassLoader class from Debug component instead of the one from the Class Loader component
5cda1c7 feature #3311 Use KernelTestCase instead of WebTestCase for testing code only requiring the Container (johnkary)
6c52b92 [#3311] Use KernelTestCase instead of WebTestCase for tests needing only a Container
6adf160 Added documentation about new requests formats configuration
8903e23 Merge branch '2.4'
1065855 Merge branch '2.3' into 2.4
2d9647b Added documentation for translation:debug
9e2727d added documentation for the new Symfony 2.5 progress bar
bd9cd26 added docs for the new Table console helper
11bfe50 Added warning about performances
6a7a25f Fixed @WouterJ's feedback
e137951 Created a new article
cdd534a Added @lsmith77 and @dbu use cases
a7b916e Fixed typos spotted by @cordoval
a055140 Took @WouterJ's advices into account
947ad92 [Console] Adding use cases to command as service
6f6c03f Fix formatting issues
3ea9137 List the UUID constraint in the reference section
f4afaab Documentation for the new Uuid constraint
5c4336a bug #3570 Callback: [Validator, validate] expects validate to be static (nixilla)
eefd0ab add versionadded directive for multiple option
cadca3b Merge branch '2.4'
77628d0 Merge branch '2.3' into 2.4
2cb2c2d Merge branch '2.4'
a2817c6 Merge branch '2.3' into 2.4
b7ac326 minor #3557 Minimize horizontal scrolling in code block to improve readability (ifdattic)
027bc97 Callback: [Validator, validate] expects validate to be static
642e776 bug #3544 Fix build errors (xabbuh)
dce2e23 minor #3532 Added tip for Entity Listeners (slavafomin)
65649aa Update event_listeners_subscribers.rst
400a0c0 Minimize horizontal scrolling in code block to improve readability
46e0b52 remove empty_data from the list of inherited options, it's documented in the overriden options section
7e3c0e3 readd configuration block
64602c8 fix referenced documents names
2ca9bd5 Describe retrieval of StopwatchEvent
bdc6c3f Merge branch '2.4'
c483ac6 Merge branch '2.3' into 2.4
7e75b64 minor #3533 Moving the new named algorithms into their own cookbook entry (weaverryan)
34e69de [#3533] Lots of nice changes thanks to @xabbuh
f634600 minor #3531 Remove horizontal scrolling in code block (ifdattic)
9676f2c feature #3523 [Components][EventDispatcher] describe that the event name and the event dispatcher are passed to even... (xabbuh)
a43f15a bug #3519 [Book][Service Container] Fix syntax highlighting (iamdto)
86e02c6 bug #3514 Fixed some small typos in code example (RobinvdVleuten)
b53e178 Fixed typo
0dc8c26 bug #3507 Fix a typo (missing `) in :doc: link (ifdattic)
272197b bug #3504 fix include directive so that the contents are really included (xabbuh)
2fbf17c [#3491] Moving the new named algorithms into their own cookbook entry and making some minor tweaks
8ccfe85 feature #3491 Added feature doc for named encoders (tamirvs)
b97e79c Added tip for Entity Listeners
4419aad Remove horizontal scrolling in code block
46377b2 feature #3486 Documenting createAccessDeniedException() method (klaussilveira)
6058408 Merge branch '2.4'
a45fee8 Merge branch '2.3' into 2.4
6d34aa6 bug #3478 Update custom_password_authenticator.rst (piotras-s)
a171700 bug #3477 Api key user provider should use "implements" instead of "extends" (skowi)
269c166 describe that the event name and the event dispatcher are passed to event listeners by the event dispatcher
edec44d [Book][Service Container] Fix syntax highlighting
0c6cfd1 Example creates a class not an interface
ea5531b An interface should be implemented
064c740 Fixed small typo in code example
d57c738 Fix a typo (missing `) in :doc: link
fb22fa0 bug #3456 remove duplicate label (xabbuh)
3090cf2 fix include directive so that the contents are really included
b9bbe5d minor #3499 Fix YAML syntax highlight + remove trailing whitespace (ifdattic)
8bd668e Merge branch '2.4'
4bb11ea Merge branch '2.3' into 2.4
0723078 Fix YAML syntax highlight + remove trailing whitespace
f1c1273 ApiKeyUserProvider should implements UserProviderInterface
2746067 minor #3472 Fixed `versionadded` inconsistencies in Symfony 2.5+ (danielcsgomes)
a87fe18 bug #3470 Fixed typo (danielcsgomes)
d52f3f8 feature #3454 [Security] Add host option (ghostika)
b6abafb [#3446] Minor tweaks as suggested by @xabbuh
11e079b feature #3446 [WCM] Documented deprecation of the apache router. (jakzal)
0a0bf4c feature #3437 Add info about callback in options resolver (marekkalnik)
c6ac96c Merge branch '2.4'
5ba2227 Merge branch '2.3' into 2.4
8cd63d0 Added feature doc for named encoders
257c483 Blank line restored
da6002d Wrapping line
b1b9090 Adding versionadded detail
53f156c Updating references to match doc format
6fd3f93 Documenting createAccessDeniedException() method
c50f041 CS
18657aa Update custom_password_authenticator.rst
f39686a Changed extends to implements
a0dd460 Lowercase and link label
8231230 Fix according to PR comments
aa5aa61 Typo and link label
8beb570 Fixed `versionadded` inconsistencies
cce3b40 fixed typo
517e4c5 Link moved and heading updated
f0b3b85 Version added and clarifications
e4a0e2f Use of Sphinx markup
faa034b [WIP][Valiadtor] - EmailConstraint reference
6cba192 remove versionadded from book and fix words
3e42b84 Add versionadded tag to security config reference, reference cookbok entry in book
bede4c3 bug #3447 Fix error in namespace when use TokenInterface (joanteixi)
a6ad607 bug #3441 [Expression]Change title 'Accessing Public Methods' (Pyrech)
52c8586 fixe tagline
3334743 Change title 'Accessing Public Methods'
b64d73f remove duplicate label
cc8d19a line break
0244173 add host to the config page
4fb6e59 Add host config to the security documentation
3c2c5fc bug #3435 Update custom_password_authenticator.rst (boardyuk)
6db5f23 feature #3426 New Feature: Change the Default Command in the Console component (danielcsgomes)
c1b2aad Applied suggestions from Ryan
6b3c424 feature #3428 Translation - Added info about JsonFileLoader added in 2.4 (singles)
541cd73 Merge branch '2.3' into 2.4
f2f5e9a bug #3421 [Contributing] Cleaning the "contributing patch" page a bit (lemoinem)
a5a5668 Fix error in namespace when use TokenInterface
fdf4891 Documented deprecation of the apache router.
5e97202 Applyed suggestions from @fabpot and @stof
0f90fed Merge branch '2.4'
f08e2a5 Merge branch '2.3' into 2.4
c0de1cb [Contributing] Replace HEAD~3 by upstream/master
94fe8dc Add info about callback in options resolver
4101d9b Update custom_password_authenticator.rst
732758b [Contributing] Fix "When you finish" => "When you are finished"
adf678b Added info about JsonFileLoader added in 2.4
c23f34e Applied some suggestions
b028282 Merge branch '2.3' into 2.4
d0b8de4 Merge pull request #3424 from danielcsgomes/fix_broken_urls
012456d Moved `versionadded` to the right section
730985f Updated references to the new document
af9eac4 Changed the code to remove references to Symfony Framework since it's the standalone component
60e2b3e Added the delete document to avoid broken urls and added a notice that the document was moved to another location
11c7174 Added the version number where the setDefaultCommand was introduced
b9f8b8d fix "versionadded" wording
b29ab89 Documented the Change the Default Command in the Console component
49a02dc Fixed broken urls
b25ec96 [Contributing] Replace mentions of 2.2 for 2.3
70ed645 [Contributing] Add PSR-1 and 2 links
6796ba8 [Contributing] Fix single vs double backtick issues
bb9004e Add "versionadded" directive for 2.5
b35e62b [Contributing] Clarify the rebase operation
bfe3a20 [Validation] Add "hasser" support
b1e0886 Merge branch '2.4'
780cd22 Merge branch '2.3' into 2.4
a5d1539 Merge remote-tracking branch 'origin/2.4' into 2.4
c2b3ecd Merge pull request #3403 from xabbuh/issue-2939
16f0226 Moved complete role to a new line
447b716 Fixed internal url linked to @Security annotation
669d72e Fixed SensioFrameworkExtraBundle complete name
78e07b9 Documentation should refers to @Security and no @Secure
257ee78 Merge pull request #3365 from evilr00ts/patch-1
33d27cc [#3362] Updating composer install version on the master branch
d5fe901 Merge branch '2.4'
1c927a6 Merge pull request #3362 from unairoldan/patch-1
cc879cd Merge pull request #3361 from xabbuh/fix-build-errors-2.4
7867615 Merge pull request #3357 from symfony/security-2914-additions
6da1df6 [#3357] Many many changes thanks to @WouterJ and @xabbuh
8735384 Merge branch '2.4'
ddaf1a2 Merge branch '2.3' into 2.4
42084dd [#3338] Adding versionadded
bd1e53e Revert "[#3338] Removing delete_empty details because this is first being committed to 2.3"
7112444 Merge branch '2.4'
4f64a29 Merge branch '2.3' into 2.4
04890d7 clarify that the ConsoleHandler was added to the MonologBridge and not the MonologBundle
6c3d9eb Merge branch '2.4'
bade680 Merge branch '2.3' into 2.4
6b7d307 Merge branch '2.4'
479ec86 Merge branch '2.3' into 2.4
0dfffff Update PHP example to include synthetic attribute.
4ef1a71 Synchronized setter injection occurs on Container::set() not on Container::enterScope()
6bdcdb1 Merge pull request #3354 from bamarni/patch-6
d31465b Merge branch '2.4'
7c1b2c3 Merge branch '2.3' into 2.4
3945d5f [#3340] Tweaks to console logging:
4834b77 How to Configure Monolog to display Console messages
69f8a88 Merge branch '2.3' into 2.4
34551d2 [#3319] Fixing typos thanks to @xabbuh
1401372 Merge branch '2.4'
14b0c47 Merge branch '2.3' into 2.4
2cbca5f Removing versionadded 2.1 from merge
6f286e1 Merge branch '2.3' into 2.4
2a10a46 [#3319] Linking to the whole method
06f2f74 Merge pull request #3319 from lemoinem/features/acl-update-security-id
fb781dd Merge pull request #3318 from willdurand/patch-1
d86e542 [#3315] Adding a little bit more information about the $arguments argument
abe419b Merge pull request #3315 from jakzal/patch-1
abc3a18 Update process.rst
2ebb4bf adding XML code block
876994a Merge pull request #3300 from xabbuh/expression-component-cache-tweaks
134a7e3 Merge pull request #3298 from pauliusmasiliunas/patch-1
d62f19b Merge pull request #3287 from h4cc/patch-1
e6728fe Update composer installation command
c83cca8 Merge pull request #3274 from bicpi/document_finish_request_event
cefdd6c Merge pull request #3271 from berny46/patch-1
77455c9 [#2986] Fix thanks to @WouterJ
cc5c9a3 Merge branch '2.4'
7f7d7a5 Merge branch '2.3' into 2.4
0a9241d [#2953][#2986] Tweaks to firewall hostname
14c5382 document how to restrict a firewall to a specific host
daf5d3c [#2979] Minor tweaks
baec6de Added a note about removing the default namespace.
68fa18e Documented explicit namespace registration.
47bc7dc Documented changing of default namespace prefix.
827014e Documented xml namespace autodiscovery.
110e22b [#2914][WIP] Additions to the new authentication articles
bf98517 fixed spaces
a7b80a6 [Form] added multiple option to file type doc
afdb708 add example on how to use the new SimplePreAuthenticatorInterface
8ddb26b clarify the authenticator type
1bd187f fixes thanks to @WouterJ
37deaa7 document the new authentication customization options
2f486ce [Security][Acl] Documentation for the new updateUserSecurityIdentity method in Dbal\MutableAclProvider
a45464f Added missing argument to the evaluator function
6e610bf [Components] [ExpressionLanguage] Fix missing quote
6212968 changed version in create project example to 2.4.* and remove the hint above as it is not longer necessary due to the new wildcard feature in composer
7bf21c2 changed create-project example
7e1e4a2 some tweaks to the Expression Language cache chapter
9d4a138 Merge branch 'master' into eom-2-2
a7f2c98 Change symfony version on composer.json
986e876 Updated install page to v2.4.*
1f385da [Components][HttpKernel] Add FINISH_REQUEST to events table
a2ec22b Update Callback.rst
821a1b4 Merge branch '2.3' into 2.4
be60602 [#3260] Minor tweaks when proofreading
180fc13 Merge pull request #3260 from WouterJ/component_expression_caching
d1bbdc4 Merge pull request #3261 from zczapran/2.4
0a59f6d Added doctrine note
d6b3a14 [Cookbook] Fixes a link to the Request class
a9e0e66 Added Caching article
816c06b Merge pull request #3258 from symfony/expression-language-framework
0000250 [#3258] A bunch of fixes thanks to @WouterJ
bc22f16 [#3022][#3258] Enhancing example at @ggam's suggestion
0cf1828 [#3022][#3258] Tweaks thanks to @cordoval
33676dc [#3022] Adding a quick cookbook entry to highlight where the expression component is used in the framework
d72759a [#3022] Adding all of the security-related expression functionality docs
be86fef [#3022] Adding new Expression validation constraint
ac15bf5 [#3022] Adding framework documentation for routing expressions
93e8cd2 Merge branch '2.3' into 2.4
4738c75 [#3232] Fixing note about expressions with parameters thanks to @WouterJ
667d590 [#3241] Minor tweaks to new expression language functions
240df84 Merge pull request #3241 from WouterJ/expression-furthering-component
4147ad4 Merge pull request #3232 from symfony/expression-framework-container
22c9404 [#3232][#3022] Making many small tweaks thanks to @WouterJ and @xabbuh
4d50f34 [#3022] Adding service container expression language details
78baee9 Merge pull request #3233 from peterkokot/patch-2.4
6e2e583 Added article about custom functions
0725a8b Added docs for using functions
e506f01 Added example of range operator
0675b56 Removed assignment operator
77b84ea executable permission unset
2198c86 Merge branch '2.3' into 2.4
4dba1ac Changed parameter container to requestStack (2.4+)
08de8b2 Merge branch '2.3' into 2.4
22b3776 [#3205] Tweaking versionadded
fe0571a Merge branch '2.3' into 2.4
112d16b Merge branch '2.3' into 2.4
6ec097d [#3203] Minor tweaks to new 404 logging entry
aea6533 documentation for the regex based exclusion of 404 errors with MonologBundle
6f0694c Merge branch '2.3' into 2.4
cd98a63 [#3191] Fixing semicolon thanks to @WouterJ
a14c39d [#3191] Many tweaks to expression language component thanks to @WouterJ, @xabbuh and @cordoval. Thanks guys!
e9a81bf [#3044] Furthering @WouterJ's work on the ExpressionLanguage component
70b475b Merge branch '2.3' into 2.4
12621a9 Merge branch '2.3' into 2.4
2b97bbe Merge branch '2.3' into 2.4
55a2de4 Removing a versionadded:: 2.1  that came from the merge
fb61db9 Merge branch '2.3'
799b2c6 Merge pull request #3044 from WouterJ/document_expressionlanguage
2e91170 Merge branch '2.3'
ff4a44e [#2906][#3190] Removing versionadded:: 2.1 tags after merge
4754401 Merge branch '2.3'
2f4479d Merge pull request #3179 from xabbuh/master-tweaks
343a59e Removing some 2.1 references that were merged up
ba413f4 Merge branch '2.3'
80a3643 some tweaks and fixes to d417f7b and 3dcbbc2
941a5cc Merge pull request #2972 from symfony/scope-refactoring
3dcbbc2 [#2972] Clarifying how to use the request_stack with an example
d417f7b [#2972] Many small tweaks - thanks very much to @WouterJ and @xabbuh
c5ae3dd [#2956] Refactoring the scopes entry entirely to not talk about the request anymore, since it has a simpler solution
f4975fd Merge pull request #3175 from peterrehm/patch-5
87962e3 Bumped version number
4dfdb36 Merge branch '2.3'
b9b60d7 Merge branch '2.3'
e094853 Merge pull request #3148 from xabbuh/http-status-code-constants
9660455 use verbose HTTP status code constants
a516f61 Merge pull request #3119 from cordoval/patch-17
f65f1d0 [#3114] Lining up spaces
8a71cdf Merge pull request #3114 from Tobion/patch-2
6829df3 Removing versionadded 2.1 that leaked in from a merge up
4644e2b Merge branch '2.3'
3943d8f [#3084] Putting back message that was incorrect in 2.3, but correct in 2.4/master
67b4d21 Merge branch '2.3'
10fe8a4 Removed 2.2 references as it reached eom
957bca4 Merge branch '2.3'
ae03fdb [#3075] Moving new Form::disableValidation DomCrawler details into the component
8a91f15 Merge branch '2.3'
02d6a71 Merge pull request #3075 from pylebecq/dom-crawler-disable-internal-validation
fda51ee fix introducing typo
2a50493 switch argument to key to be more precise
f3e9d17 Merge pull request #3087 from xabbuh/issue-2870-master
31fb5b8 update framework csrf configuration
e874269 Merge branch '2.3'
85fce13 Merge pull request #3058 from xabbuh/fix-build-errors
8fe9fd6 Fixed comments and splitted in intro and syntax
b02bc8c add note about not passing the command argument with Symfony 2.4
b944124 Added documentation about disabling internal validation of DomCrawler forms.
72b690f [#3031] Fixing typo thanks to @xabbuh
a53c8ad [#3048] Adding intro paragraph about the semantic verbosity methods
0c34aa1 Merge pull request #3048 from lyrixx/console-ouput-verbosity
4009c51 Merge branch '2.3'
0925090 [#3031] Adding some details as to why you may or may not want to register a command a service
7e7425c Merge pull request #3031 from lyrixx/command-in-the-DIC
808319d Merge pull request #3029 from egeloen/f-valid-form-view
ce45928 make target name unique that is used as a reference
bdd37ba [#3017] Very minor tweaks
22a270e Merge pull request #3017 from adrienbrault/session-metadata
26b2e9f Merge branch '2.3'
9268e3a Merge pull request #3025 from fabpot/console-compact-layout
ca83f6a Documents Output::*Verbose methods
3efd179 [Form] Add a 'submitted' attribute to the form view
b94e3f7 [#3012] Tweaks to Callback changes - most thanks to the careful eye of @xabbuh
9b04e53 Merge branch 'issue2480' of github.com:bschussek/symfony-docs into bschussek-issue2480
b1478f3 Merge branch '2.3'
cfee7b8 Merge pull request #3043 from xabbuh/patch-1
f98fa24 Register Commands in the Service Container
4ff9fae Added another operator
6631f70 Added operators
efe349e use literal for class name
27822ff Bootstraps intro
cab5c89 Creates Expression Language chapter
1d94f34 [#3021] Minor tweaks thanks to @WouterJ and @GromNaN
5aa3a19 Merge pull request #3021 from fabpot/request-factory
adcef55 Merge branch '2.3'
022763a Merge pull request #3036 from xabbuh/fix-build-errors-master
4732a76 [#2728] Fixing typo thanks to @xabbuh
e52ac5c fix versionadded directive
d4f9478 Merge branch '2.3'
66f1672 [#2971] Minor language tweak to be consistent with the other areas
32c510f Merge pull request #2971 from xabbuh/issue-2958
88f051a [#2728] Minor tweaks to docs on Process flush methods
6a13396 Merge pull request #2728 from imobilis/ticket_7884
2be6510 [#2960] Minor changes thanks to @xabbuh
0f674c1 Merge pull request #2960 from WouterJ/doc_php_stopwatch
7e0cb8b [#2947] Adding versionadded details
81698fe Merge pull request #2947 from ChristianGaertner/patch-1
16799b4 added the compact layout information
0e9f02a added documentation about Request::setFactory()
a866606 Add a cookbook entry on how to limit session metadata writes
574d7a8 [#2913] Removing versionadded 2.1 messages from the master branch
c8dfa9e Merge branch '2.3'
893a780 [#3009] Updating information for 2.4 with the new checkPasswordLength method
cc70738 Merge branch '2.3'
887f0d2 Updated the documentation for the simplified Callback constraint
9a715ed Merge branch '2.3'
6be4f80 Merge branch '2.3'
a7e86b0 Merge branch '2.3'
3210251 [#2891] Shortening note about ContainerAwareTrait
1112cc2 Merge branch 'patch-1' of github.com:endroid/symfony-docs into endroid-patch-1
5f69c8f Merge branch '2.3'
67901ff document the getEncodings() method of the Request class
b84f52c [#2956] A few more changes to the scopes chapter to update the new way of working with the request service
3548a51 Merge pull request #2956 from fabpot/request-stack
3780933 Documented Stopwatch Helper
f1ab2ad Merge branch '2.3'
7ed82a0 Merge branch '2.3'
d9050a5 added documentation for the new request_stack service
d03f39d Added configuration to enable profiler in test
feb346d Update filesystem.rst
7afa87f Update filesystem.rst
066fcd5 Added docs for the changes proposed in symfony/symfony#8908
a801c09 Improve documentation of ContentAwareTrait
69be273 Merge branch '2.3'
0c2f735 Merge pull request #2872 from bschussek/issue8473
0dfcdf7 Merge branch '2.3'
c6e50b7 Removing several "2.1" references, which is consistent with our release process:
5471a32 Merge branch '2.3'
3d27f53 [#2630] Tweaks for new stopwatch tag - updating version, syntax for using it, and wrong bundle name
76e460d Merge pull request #2630 from WouterJ/document_stopwatch_helper
03aaa5c Document possibility to use ContainerAwareTrait
8e6f084 [#2840] Minor tweaks to new orientation Image validation constraints
6f0c697 Merge pull request #2840 from lmammino/improved-image-validator
d695cad Merge branch '2.3'
8b0611a [Process] Update docs for modifications.
871b340 Merge remote-tracking branch 'origin/master'
fc8a060 Merge branch '2.3'
e797af3 Merge branch '2.3'
1891edd Updated documentation for PR https://github.com/symfony/symfony/pull/8490
e1cf110 Merge pull request #2875 from schmittjoh/patch-2
3fa71b8 adds api link
2e25e00 adds docs for idle timeout (see symfony/symfony#8651)
b6d5606 Updated rounding_mode documentation to reflect changed ROUND_ constants.
c80e4e7 [#2783] Removing 2.1 versionadded that came back due to a tweak on the 2.2 branch
d0d7c47 Merge branch '2.3'
92a9437 Merge branch '2.3'
b414088 Merge branch '2.3'
d3b0a38 Merge branch '2.3'
f57b569 [#2829] Changing reference back to master - eventually we'll need an extension that helps us manage this version stuff
95e651f Merge branch '2.3'
f897411 [#2797] Removing the 2.1 version notes on master (since 2.1 has been deprecated - see documentation release directions)
d633094 Merge branch '2.3'
84d569d Merge branch '2.3'
07341ba Merge remote-tracking branch 'origin/master'
40f407d Merge branch '2.3'
28d51a9 Merge pull request #2642 from mpartel/progresshelper-clear
d7da8a5 Merge pull request #2784 from symfony/version-catchup
1f78980 [#2720] Playing "catch-up" to get the master branch up to date with the new documentation standards
ca1a38d Merge branch '2.3'
ff2e2c4 Merge branch '2.3'
7038693 Merge branch '2.3'
0e843ff Merge branch '2.3'
062789b Merge branch '2.3'
f9f20e5 [Process] Rewriting to avoid wrong sentences.
3ca7875 [Process] Doc for output flush methods.
1f33137 Merge branch '2.3'
ebdcaba Merge branch '2.3'
458c392 Merge branch '2.3'
37c86d6 Merge branch '2.3'
030a6f8 Merge branch '2.3'
4c06860 Merge branch '2.3'
ac3df57 Documented ProgressHelper's clear() method.
2b7dcf9 Merge branch '2.2'
d7ea3a5 [#2619] Tweaks for new proxy/lazy services entry
a2bc822 Merge pull request #2619 from Ocramius/feature/proxy-manager-bridge
a981ae7 Merge pull request #2640 from bschussek/icu-3.8
438c824 Made the Icu component compatible with ICU 3.8
abe537f Merge pull request #2624 from pierredup/master
2d9316f Added new tag
931091d Applying changes suggested by @WouterJ, adding lazy_services to components map
c3c3e98 [Components][Console] Fixed typos for table helper
50905ff Adding lazy services documentation as of symfony/symfony#7890
@dunglas dunglas deleted the serializer_circular branch December 5, 2015 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants