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/Tests/Templating
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
..
Helper Merge branch '2.3' into 2.5 2014-12-22 17:29:52 +01:00
Loader [FrameworkBundle] Improve the TemplateLocator exception message 2011-12-09 10:35:15 +01:00
DelegatingEngineTest.php Merge branch '2.3' into 2.4 2014-09-22 10:51:05 +02:00
PhpEngineTest.php Remove aligned '=>' and '=' 2014-10-30 21:17:55 +01:00
TemplateFilenameParserTest.php [FrameworkBundle] Create a dedicated template filename parser 2012-07-03 14:58:30 +02:00
TemplateNameParserTest.php [FrameworkBundle][Template name] avoid error message for the shortcut notation. 2014-12-08 10:32:45 +00:00
TemplateReferenceTest.php fixed CS 2011-06-23 13:39:36 +02:00
TemplateTest.php [FrameworkBundle] removed unneeded files in tests 2011-04-21 22:43:38 +02:00
TimedPhpEngineTest.php Merge branch '2.3' into 2.5 2014-12-30 10:03:46 +01:00