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/Bundle/FrameworkBundle/Resources/config
Bernhard Schussek 054f1b5536 Merge branch '2.3' into 2.4
* 2.3:
  [Validator] Backported constraint validator tests from 2.5
  Fix toolbar vertical alignment.
  [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field
  [FrameworkBundle] add missing attribute to XSD
  Allow basic auth in url. Improve regex. Add tests.
  fix typos and syntax in Profiler controller method comments
  remove volatile tests
  [Console] fixed style creation when providing an unknown tag option
  [Validator] Convert objects to string in comparison validators. Reapplies 6cf5e0812e
  [HttpFoundation] Update QUERY_STRING when overrideGlobals

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
	src/Symfony/Component/Validator/Constraints/AllValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
	src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
2014-08-14 16:51:32 +02:00
..
schema Merge branch '2.3' into 2.4 2014-08-14 16:51:32 +02:00
annotations.xml Disable call to AnnotationReader::setAutoloadAnnotations() 2011-07-03 16:21:52 +02:00
collectors.xml [HttpKernel] decoupled TraceableEventDispatcher and Profiler 2013-09-30 10:52:26 +02:00
debug_prod.xml tweaked previous merge (refs #6474) 2013-04-30 19:23:11 +02:00
debug.xml [FrameworkBundle] made sure that the debug event dispatcher is used everywhere 2013-09-30 17:51:41 +02:00
esi.xml changed the ESI fragment renderer to be always registered 2013-08-13 11:17:13 +02:00
form_csrf.xml [Security\Csrf] Split CsrfTokenGenerator into CsrfTokenManager and TokenGenerator 2013-10-07 14:50:43 +02:00
form_debug.xml [Form] Improved form debugger 2013-09-25 17:47:13 +02:00
form.xml Merge branch '2.3' into 2.4 2014-03-26 12:35:33 +01:00
fragment_listener.xml renamed some classes and Twig functions to more descriptive names (refs #6871) 2013-02-01 15:17:20 +01:00
fragment_renderer.xml moved RequestStack to HttpFoundation and removed RequestContext 2013-09-08 07:38:03 +02:00
profiling.xml [HttpKernel] decoupled TraceableEventDispatcher and Profiler 2013-09-30 10:52:26 +02:00
property_access.xml [Validator] Renamed Condition to Expression and added possibility to set it onto properties 2013-09-19 12:59:33 +02:00
router_dev.php [HttpKernel] added an analyze of environment parameters for built-in server. 2014-08-08 17:50:03 +02:00
router_prod.php [HttpKernel] added an analyze of environment parameters for built-in server. 2014-08-08 17:50:03 +02:00
routing.xml moved RequestStack to HttpFoundation and removed RequestContext 2013-09-08 07:38:03 +02:00
security_csrf.xml [Security\Csrf] Split CsrfTokenGenerator into CsrfTokenManager and TokenGenerator 2013-10-07 14:50:43 +02:00
security.xml [FrameworkBundle][SecurityBundle] Added service configuration for the new Security CSRF sub-component 2013-09-27 10:16:29 +02:00
serializer.xml Add the serializer service 2013-03-23 19:05:00 +00:00
services.xml moved RequestStack to HttpFoundation and removed RequestContext 2013-09-08 07:38:03 +02:00
session.xml [HttpFoundation] Add a way to avoid the session be written at each request 2013-09-30 10:45:51 -07:00
templating_debug.xml Merge branch '2.3' into 2.4 2014-04-10 15:00:56 +02:00
templating_php.xml Merge branch '2.3' into 2.4 2013-12-28 22:39:51 +01:00
templating.xml [Templating] deprecate DebuggerInterface 2013-09-04 21:57:45 +02:00
test.xml [FrameworkBundle] changed the session listeners to be subscribers 2011-11-17 09:54:24 +01:00
translation.xml Merge branch '2.3' 2013-11-23 22:17:02 +01:00
validator.xml use "translator" alias not "translator.default" 2013-09-20 15:35:24 +02:00
web.xml moved RequestStack to HttpFoundation and removed RequestContext 2013-09-08 07:38:03 +02:00