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
Fabien Potencier c4dc0034e7 Merge branch '2.3' into 2.5
* 2.3:
  Updated generateSql tool
  Fix the implementation of deprecated Locale classes
  Fix phpdoc and coding standards
  Replace usages of the deprecated TypeTestCase by the new one
  Remove usages of deprecated constants
  Update functional tests to use the PSR NullLogger
  Make fabbot happy
  Clean up testing
  [DomCrawler] fixed bug #12143

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
	src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
	src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
2014-12-30 10:03:46 +01:00
..
CacheWarmer Merge branch '2.3' into 2.5 2014-12-02 21:15:53 +01:00
Command fix dependency on ExtensionInterface over implementation 2014-12-23 12:45:12 +01:00
Console CS fixes 2014-12-04 20:26:11 +00:00
Controller Merge branch '2.3' into 2.5 2014-12-22 17:29:52 +01:00
DataCollector moved the request data collector to HttpKernel 2012-07-18 10:39:53 +02:00
DependencyInjection bug #12975 [FrameworkBundle] Allow custom services for validator mapping cache. (jakzal) 2014-12-24 07:41:03 +01:00
EventListener [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
Fragment [HttpKernel] added escaping for hx:include tag attributes 2013-03-29 05:29:22 +01:00
HttpCache made phpdoc types consistent with those defined in Hack 2014-04-15 07:41:45 +02:00
Resources Merge branch '2.3' into 2.5 2014-11-03 04:54:42 +01:00
Routing Merge branch '2.3' into 2.5 2014-10-26 08:41:27 +01:00
Templating Merge branch '2.3' into 2.5 2014-12-30 10:03:46 +01:00
Test fix phpdoc's alignment 2014-12-09 19:18:22 +01:00
Tests Merge branch '2.3' into 2.5 2014-12-30 10:03:46 +01:00
Translation Merge branch '2.3' into 2.5 2014-12-22 17:29:52 +01:00
Validator [Validator] Removed legacy validator classes 2014-08-06 15:23:29 +02:00
.gitignore Added missing files .gitignore 2013-07-21 14:12:18 +02:00
CHANGELOG.md Fix issue 9172 2014-05-04 18:56:58 +02:00
Client.php [FrameworkBundle] forward error reporting level to insulated Client 2014-12-23 08:41:15 +01:00
composer.json [FrameworkBundle] fix browserkit requirement 2014-12-26 00:04:51 +01:00
FrameworkBundle.php [EventDispatcher][HttpKernel] Move RegisterListenersPass from HttpKernel to EventDispatcher. 2013-12-18 18:16:40 +01:00
phpunit.xml.dist [Tests] Silenced all deprecations in tests for 2.3 2014-12-18 20:00:19 +01:00