Fabien Potencier
|
d5bd9bdd68
|
Merge branch '2.3' into 2.4
* 2.3:
fixed types in phpdocs
Conflicts:
src/Symfony/Bridge/Twig/TwigEngine.php
src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Stopwatch/StopwatchEvent.php
src/Symfony/Component/Templating/PhpEngine.php
|
2014-04-16 12:34:31 +02:00 |
|
Fabien Potencier
|
e96b018805
|
fixed types in phpdocs
|
2014-04-16 12:30:19 +02:00 |
|
Jean-François Simon
|
dd8014a0f4
|
Replace sha1 and md5 hashing with sha256 algorithm
|
2013-08-31 13:25:41 +02:00 |
|
Fabien Potencier
|
175827713a
|
tweaked previous commit
|
2013-02-01 22:56:52 +01:00 |
|
Victor
|
3fee9c0f80
|
[HttpKernel] Fix the URI signer (closes #6801)
|
2013-02-01 22:56:31 +01:00 |
|
Fabien Potencier
|
f7da1f0eb8
|
added some unit tests (and fixed some bugs)
|
2013-01-10 16:26:59 +01:00 |
|
Fabien Potencier
|
403bb060ce
|
[HttpKernel] added missing phpdoc and tweaked existing ones
|
2013-01-10 09:21:31 +01:00 |
|
Fabien Potencier
|
892f00ffee
|
[HttpKernel] added a URL signer mechanism for hincludes
|
2013-01-10 09:21:31 +01:00 |
|