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/WebProfilerBundle
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
..
Command [WebProfiler] replaced the import/export feature from the web interface to a CLI tool 2014-09-02 15:08:29 +02:00
Controller Docblock fixes 2014-11-30 13:33:44 +00:00
DependencyInjection [WebProfilerBundle] made toolbar listener instantiation conditional 2013-07-31 15:46:47 +02:00
EventListener Merge branch '2.3' into 2.5 2014-10-26 08:41:27 +01:00
Profiler [WebProfilerBundle] fixed wrong class name 2012-12-22 21:58:25 +01:00
Resources Merge branch '2.3' into 2.5 2014-12-11 20:53:06 +01:00
Tests Merge branch '2.3' into 2.5 2014-12-04 09:55:19 +01:00
Twig removed double-stringification of values in the profiler 2014-03-01 03:55:22 +01:00
.gitignore Added missing files .gitignore 2013-07-21 14:12:18 +02:00
CHANGELOG.md updated various CHANGELOG files that were not updated when the PRs were merged 2013-03-23 08:35:36 +01:00
composer.json Merge branch '2.4' into 2.5 2014-09-22 17:28:36 +02:00
phpunit.xml.dist removed defaults from PHPUnit configuration 2014-07-07 12:13:42 +02:00
WebProfilerBundle.php replaced symfony-project.org by symfony.com 2011-03-06 12:40:06 +01:00