Commit Graph

12 Commits

Author SHA1 Message Date
Nicolas Grekas
45b9c6261f Merge branch '2.8' into 3.0
* 2.8:
  [VarDumper] Fix indentation trimming in ExceptionCaster
  removed @since
  Remove and change unrelevant comments in Validator and Security components.
  [Validator] UuidValidator must accept a Uuid constraint.
  [Validator] make UuidValidator class formatting consistent.

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php
	src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php
	src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php
	src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php
	src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
	src/Symfony/Component/Validator/Constraints/UuidValidator.php
	src/Symfony/Component/Validator/Context/LegacyExecutionContext.php
	src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php
	src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
	src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php
	src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
	src/Symfony/Component/Validator/Validator/LegacyValidator.php
2016-07-05 13:09:15 +02:00
Fabien Potencier
5d6f6aa7c7 removed @since 2016-07-04 07:27:33 +02:00
Hugo Hamon
2cec4a61ef Remove and change unrelevant comments in Validator and Security components. 2016-07-01 22:22:57 +02:00
Fabien Potencier
dcc80c7b8a Merge branch '2.8'
* 2.8:
  fixes CS
  fixed CS
  [DependencyInjection] Add missing file headers
  fixed typo
  made Symfony compatible with both Twig 1.x and 2.x
  [FrameworkBundle] Fix precedence of xdebug.file_link_format
2015-08-24 09:21:16 +02:00
Fabien Potencier
c0e4495b66 fixes CS 2015-08-24 09:13:45 +02:00
Graham Campbell
35e0845f23 [3.0] Removed some old hacks 2014-12-30 11:17:11 +01:00
Graham Campbell
ed4fb54901 CS fixes 2014-12-04 20:26:11 +00:00
Christian Flothmann
d2f846b453 compare version using PHP_VERSION_ID
This continues the work started in #12497 on the `2.3` branch.
2014-11-23 21:10:39 +01:00
Fabien Potencier
0ecdda1770 fixed types in phpdocs 2014-04-16 12:34:42 +02:00
Tobias Schultze
d7eb8ff64a [Csrf] component fixes 2013-10-17 23:29:16 +02:00
Bernhard Schussek
d4bb5f4e3c [Security\Csrf] Split CsrfTokenGenerator into CsrfTokenManager and TokenGenerator 2013-10-07 14:50:43 +02:00
Bernhard Schussek
1bf16400fb [Security] Added CSRF sub-component 2013-09-27 10:08:54 +02:00