diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
d7870a2b5d
symfony/src/Symfony/Component/HttpKernel/DataCollector
History
Fabien Potencier d7870a2b5d Merge branch '2.6' into 2.7 
* 2.6: (46 commits)
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  removed non-sense example
  Fixes small typo.
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Validator] fix DOS-style line endings
  Drop useless execution bit
  bumped Symfony version to 2.6.5
  [Serializer] update changelog
  updated VERSION for 2.6.4
  updated CHANGELOG for 2.6.4
  bumped Symfony version to 2.5.11
  [HttpKernel] Added use of provided by #12022 method to instantiate controller class in bundle's controller resolver
  updated VERSION for 2.5.10
  updated CHANGELOG for 2.5.10
  [Validator] Add a Russian translation for invalid charset message
  [2.3] [Validator] spanish translation for invalid charset message
  ...

Conflicts:
	src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
	src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
	src/Symfony/Component/HttpKernel/Exception/FlattenException.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
2015-02-05 07:58:17 +01:00
..
Util Merge branch '2.5' into 2.6 2014-12-05 13:00:15 +01:00
ConfigDataCollector.php [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
DataCollector.php [HttpKernel] Initialize DataCollector data as array 2014-09-30 11:28:36 +02:00
DataCollectorInterface.php fixed CS 2012-07-09 14:54:20 +02:00
DumpDataCollector.php Merge branch '2.6' into 2.7 2015-02-05 07:58:17 +01:00
EventDataCollector.php Merge branch '2.3' into 2.5 2014-10-26 08:41:27 +01:00
ExceptionDataCollector.php [2.3] Cleanup deprecations 2015-01-03 10:22:29 +01:00
LateDataCollectorInterface.php Removed dead code (unused use statements). 2013-10-16 13:59:56 +02:00
LoggerDataCollector.php [2.3] Cleanup deprecations 2015-01-03 10:22:29 +01:00
MemoryDataCollector.php Merge branch '2.3' into 2.5 2014-12-02 21:15:53 +01:00
RequestDataCollector.php [HttpKernel][2.6] Adding support for invokable controllers in the RequestDataCollector 2014-11-12 09:14:41 +01:00
RouterDataCollector.php Docblock fixes 2014-11-30 13:33:44 +00:00
TimeDataCollector.php Merge branch '2.3' into 2.5 2014-12-02 21:15:53 +01:00