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
Fabien Potencier 7e573f4f8a Merge branch '2.3' into 2.5
* 2.3:
  Revert "[DependencyInjection] backport perf optim"
  [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
  [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
  [DependencyInjection] perf optim: call dirname() at most 5x
  [DependencyInjection] backport perf optim
  [2.3] Remove possible call_user_func()

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
2014-12-11 20:53:06 +01:00
..
containers Merge branch '2.3' into 2.5 2014-10-26 08:41:27 +01:00
graphviz Merge branch '2.4' into 2.5 2014-07-28 15:20:46 +02:00
includes Merge branch '2.3' into 2.5 2014-12-02 21:15:53 +01:00
ini moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
php Merge branch '2.3' into 2.5 2014-12-11 20:53:06 +01:00
xml Merge branch '2.4' into 2.5 2014-09-27 10:35:39 +02:00
yaml Merge branch '2.4' into 2.5 2014-09-27 10:35:39 +02:00