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.

Fabien Potencier 83e078a035 Merge branch '2.2' ... * 2.2: Fix finding ACLs from ObjectIdentity's with different types [HttpKernel] tweaked previous merge #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path Fix autocompletion of command names when namespaces conflict Fix timeout in Process::stop method fixed CS Round stream_select fifth argument up. Fix Process timeout [HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes #7259 bumped Symfony version to 2.2.2-DEV updated VERSION for 2.2.1 updated CHANGELOG for 2.2.1 Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string) [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562) [WebProfilerBundle] removed next pointer class in a template fix overwriting of request's locale if attribute _locale is missing Conflicts: src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php src/Symfony/Component/HttpKernel/Kernel.php		2013-04-07 22:25:23 +02:00
..
AbstractProcessTest.php	Merge branch '2.2'	2013-04-07 22:25:23 +02:00
NonStopableProcess.php	Fix timeout in Process::stop method	2013-04-07 16:17:09 +02:00
PhpExecutableFinderTest.php	Removed underscores from test method names to be consistent with other components.	2013-01-11 00:31:43 +00:00
PhpProcessTest.php	[Process] Allow non-blocking start with PhpProcess	2012-12-19 14:27:19 +01:00
ProcessBuilderTest.php	Fixed @expectedException definitions to reference absolute exception paths	2013-01-05 18:52:40 +01:00
ProcessFailedExceptionTest.php	[Process] Normalize exceptions	2012-08-30 21:25:16 +02:00
ProcessInSigchildEnvironment.php	Add a Sigchild compatibility mode (set to false by default)	2012-09-19 00:37:29 +02:00
ProcessTestHelper.php	merged 2.0	2012-05-20 18:16:37 +02:00
SigchildDisabledProcessTest.php	Merge branch '2.1'	2013-01-17 16:25:59 +01:00
SigchildEnabledProcessTest.php	Merge branch '2.1'	2013-01-17 16:25:59 +01:00
SimpleProcessTest.php	[Process] Fix docblocks, remove return from PhpProcess#start() as parent returns nothing, cleaned up ExecutableFinder	2013-01-12 13:49:05 +01:00