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/DependencyInjection/Tests/Fixtures/xml
Fabien Potencier d752f74161 Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] fix routing descriptor for options
  exit when Twig environment is not set
  [Routing] fix misleading test for condition
  [Debug] fix test
  [Debug] add missing conflict dep rules
  [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle
  [HttpFoundation] Make use of isEmpty() method
  fix missing comma in YamlDumper
  [VarDumper] fix very special vars handling
  [Console] Helper\Table->addRow optimization
  [Console] Helper\Table->addRow optimization

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
2015-01-15 13:16:13 +01:00
..
extension1 moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
extension2 moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
extensions moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
namespaces.xml [DependencyInjection] Use DOM instead of SimpleXML for namespace support 2014-04-02 17:32:21 +02:00
nonvalid.xml moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
services1.xml moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
services2.xml Merge branch '2.3' into 2.4 2014-09-17 11:45:32 +02:00
services3.xml moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
services4_bad_import.xml moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
services4.xml moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
services5.xml [DependencyInjection] added support for anonymous services as properties (closes #2964) 2012-05-07 12:30:49 +02:00
services6.xml Merge branch '2.5' 2014-09-27 10:36:04 +02:00
services7.xml moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
services8.xml [DependencyInjection] Fix travis unit tests 2014-04-30 17:29:47 +02:00
services9.xml Merge branch '2.6' into 2.7 2015-01-15 13:16:13 +01:00
services10.xml Do normalization on tag options 2013-12-16 17:04:48 +01:00
services13.xml moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
services14.xml [DependencyInjection] Fix #10626, use better check on attribute existence and values on XML load 2014-04-03 14:00:33 +02:00
services20.xml [DependencyInjection] deprecated synchronized services 2015-01-09 18:43:28 +01:00
withdoctype.xml Merge branch '2.0' 2012-08-28 09:54:42 +02:00