This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
symfony/src/Symfony/Component/HttpFoundation/Session/Storage
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
..
Handler Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
Proxy fixed types in phpdocs 2014-04-16 12:30:19 +02:00
MetadataBag.php Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
MockArraySessionStorage.php Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
MockFileSessionStorage.php removed dead code and fixed CS 2013-07-28 20:26:16 +02:00
NativeSessionStorage.php fixed types in phpdocs 2014-04-16 12:30:19 +02:00
PhpBridgeSessionStorage.php removed unneeded use statements 2014-01-01 08:52:14 +01:00
SessionStorageInterface.php fixed types in phpdocs 2014-04-16 12:30:19 +02:00