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/Bridge/Doctrine/DependencyInjection
Fabien Potencier d79830fcfd Merge branch '2.5' into 2.6
* 2.5:
  Use PHPUnit ini_set wrapper in tests
  [Process] Added a test skip check for Windows
  [Process] Removed unused variable assignment
  Fixes various phpdoc and coding standards.
  Fixes Issue #13184 - incremental output getters now return empty strings
  Updated copyright to 2015
  Updated copyright to 2015
  Clarify a comment.

Conflicts:
	src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
2015-01-03 09:01:59 +01:00
..
CompilerPass Merge branch '2.5' into 2.6 2014-12-22 17:44:09 +01:00
Security/UserProvider CS fixes 2014-12-03 20:10:26 +00:00
AbstractDoctrineExtension.php Merge branch '2.5' into 2.6 2015-01-03 09:01:59 +01:00