summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bug #21136 [Security] use authenticated token for json authentication ↵HEADorigin/masterorigin/HEADmasterFabien Potencier2017-01-032-3/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fbourigault) This PR was merged into the 3.3-dev branch. Discussion ---------- [Security] use authenticated token for json authentication | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21123 | License | MIT | Doc PR | N/A When using `UsernamePasswordJsonAuthenticationListener` with [LexikJWTAuthenticationBundle](https://github.com/lexik/LexikJWTAuthenticationBundle), we get a type exception > Type error: Argument 1 passed to Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationSuccessHandler::handleAuthenticationSuccess() must implement interface Symfony\Component\Security\Core\User\UserInterface, string given, called in .../vendor/lexik/jwt-authentication-bundle/Security/Http/Authentication/AuthenticationSuccessHandler.php on line 47 This error occurs because the `UsernamePasswordJsonAuthenticationListener` send to the authentication success handler the token which have the user as a string and not the authenticated one that have a UserInterface as user. Commits ------- 208c617716 use authenticated token for json authentication
| * use authenticated token for json authenticationFabien Bourigault2017-01-022-3/+6
| |
* | minor #21088 Rename DebugAccessDecisionManager to ↵Nicolas Grekas2017-01-033-84/+118
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TraceableAccessDecisionManager (Jean85) This PR was squashed before being merged into the 3.3-dev branch (closes #21088). Discussion ---------- Rename DebugAccessDecisionManager to TraceableAccessDecisionManager | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21085 | License | MIT [EDIT] No longer WIP, test passing. Also, test added to preserve BC with the SecurityBundle. Commits ------- c5e0e59 Rename DebugAccessDecisionManager to TraceableAccessDecisionManager
| * | Rename DebugAccessDecisionManager to TraceableAccessDecisionManagerAlessandro Lai2017-01-033-84/+118
| |/
* | [Security] Typo fixKévin Dunglas2017-01-031-1/+1
| |
* | Merge branch '3.2'Fabien Potencier2017-01-025-5/+5
|\ \ | |/ |/| | | | | | | | | | | | | * 3.2: updated LICENSE year updated LICENSE year updated LICENSE year Fixed `@return self` with `$this` [Yaml] add missing indicator character
| * Merge branch '3.1' into 3.2v3.2.2origin/3.2Fabien Potencier2017-01-025-5/+5
| |\ | | | | | | | | | | | | | | | | | | * 3.1: updated LICENSE year updated LICENSE year Fixed `@return self` with `$this`
| | * Merge branch '2.8' into 3.1v3.1.9Fabien Potencier2017-01-025-5/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: updated LICENSE year updated LICENSE year Fixed `@return self` with `$this`
| | | * updated LICENSE yearv2.8.16origin/2.8Fabien Potencier2017-01-021-1/+1
| | | |
| | | * Merge branch '2.7' into 2.8Fabien Potencier2017-01-024-4/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: updated LICENSE year Fixed `@return self` with `$this`
| | | | * updated LICENSE yearv2.7.23origin/2.7Fabien Potencier2017-01-025-5/+5
| | | | |
| | | | * fixed @return when returning this or staticFabien Potencier2016-12-273-7/+7
| | | | |
* | | | | fixed obsolete getMock() usageFabien Potencier2016-12-192-14/+14
| | | | |
* | | | | Merge branch '3.2'Fabien Potencier2016-12-1962-501/+501
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2: fixed obsolete getMock() usage fixed obsolete getMock() usage fixed obsolete getMock() usage fixed obsolete getMock() usage [WebProfilerBundle] Display multiple HTTP headers in WDT do not remove the Twig ExceptionController service removed obsolete condition do not try to register incomplete definitions
| * | | | Merge branch '3.1' into 3.2Fabien Potencier2016-12-1962-507/+507
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: fixed obsolete getMock() usage fixed obsolete getMock() usage fixed obsolete getMock() usage [WebProfilerBundle] Display multiple HTTP headers in WDT do not remove the Twig ExceptionController service removed obsolete condition do not try to register incomplete definitions
| | * | | fixed obsolete getMock() usageFabien Potencier2016-12-198-49/+49
| | | | |
| | * | | Merge branch '2.8' into 3.1Fabien Potencier2016-12-1955-458/+458
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: fixed obsolete getMock() usage fixed obsolete getMock() usage [WebProfilerBundle] Display multiple HTTP headers in WDT do not remove the Twig ExceptionController service removed obsolete condition do not try to register incomplete definitions
| | | * | fixed obsolete getMock() usageFabien Potencier2016-12-1911-71/+71
| | | | |
| | | * | Merge branch '2.7' into 2.8Fabien Potencier2016-12-1952-434/+434
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | * 2.7: fixed obsolete getMock() usage [WebProfilerBundle] Display multiple HTTP headers in WDT
| | | | * fixed obsolete getMock() usageFabien Potencier2016-12-1966-488/+488
| | | | |
| | | * | [Security] Fix testNicolas Grekas2016-12-171-1/+1
| | | | |
| | | * | Merge branch '2.7' into 2.8Fabien Potencier2016-12-142-1/+72
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Validator] add Indonesian translation fixed CS [config] Fix issue when key removed and left value only [Security] AbstractVoter method supportsAttribute gives false positive if attribute is zero (0)
| | | | * bug #20734 [Security] AbstractVoter->supportsAttribute gives false positive ↵Fabien Potencier2016-12-142-1/+72
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if attribute is zero (0) (martynas-foodpanda) This PR was merged into the 2.7 branch. Discussion ---------- [Security] AbstractVoter->supportsAttribute gives false positive if attribute is zero (0) | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Issue is easy to reproduce with test giving negative data set. 0 should not pass as supported attribute for any set of attributes but it does as in_array in the method does not use flag 'strict' set to true. As this is abstract voter and is used by users with their code flag 'strict' should be set to true. Since is there in 2.7 and 2.8 (LTS) IMHO it should be fixed. Commits ------- 8306530 [Security] AbstractVoter method supportsAttribute gives false positive if attribute is zero (0)
| | | | | * [Security] AbstractVoter method supportsAttribute gives false positive if ↵Martynas Narbutas2016-12-032-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | attribute is zero (0)
* | | | | | Merge branch '3.2'Nicolas Grekas2016-12-084-10/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2: (51 commits) [FrameworkBundle] [Workflow] Fix service marking store configuration Fix merge [Validator] add class name to the cache key [Serializer] Remove AbstractObjectNormalizer::isAttributeToNormalize Throw less misleading exception when property access not found [Twig] Fix deprecations with Twig 1.29 [FrameworkBundle] Fix validation cache warmer with failing or missing classes Fixed typo [FrameworkBundle] Removed the kernel.debug parameter from the cache pool namespace seed Fix email address fix the docblock in regard to the role argument [Bridge\Twig] Trigger deprecation when using FormExtension::$renderer Don't use the "app" global variable in the profiler [VarDumper] fix tests when xdebug is enabled Fix merge FIXED NON EXISTING TYPE DECLARATION [Form] Add failing test for data collector bug [Cache] Fix dumping SplDoublyLinkedList iter mode [Form] Fix FormDataCollector Ignore missing 'debug.file_link_formatter' service in Debug and Twig bundles ...
| * | | | | Merge branch '3.1' into 3.2v3.2.1Nicolas Grekas2016-12-084-4/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: (28 commits) Fix merge [Validator] add class name to the cache key [Serializer] Remove AbstractObjectNormalizer::isAttributeToNormalize Throw less misleading exception when property access not found [Twig] Fix deprecations with Twig 1.29 Fixed typo [FrameworkBundle] Removed the kernel.debug parameter from the cache pool namespace seed Fix email address fix the docblock in regard to the role argument Don't use the "app" global variable in the profiler [VarDumper] fix tests when xdebug is enabled Fix merge FIXED NON EXISTING TYPE DECLARATION [Cache] Fix dumping SplDoublyLinkedList iter mode [Console] fixed PHP7 Errors when not using Dispatcher Regression test for missing controller arguments (3.1) Regression test for missing controller arguments fix a test checking for a value [Form][DX] FileType "multiple" fixes fixed CS ...
| | * | | | Merge branch '2.8' into 3.1v3.1.8Nicolas Grekas2016-12-084-4/+4
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Twig] Fix deprecations with Twig 1.29 Fixed typo Fix email address fix the docblock in regard to the role argument [VarDumper] fix tests when xdebug is enabled Fix merge [Cache] Fix dumping SplDoublyLinkedList iter mode [Console] fixed PHP7 Errors when not using Dispatcher Regression test for missing controller arguments fix a test checking for a value [Form][DX] FileType "multiple" fixes fixed CS [TwigBundle] Fix twig loader registered twice [WebProfilerBundle] Fix dump block is unfairly restrained [Console] Fix wrong handling of multiline arg/opt descriptions [DependencyInjection] PhpDumper.php: hasReference() should not search references in lazy service arguments. [Form] fixed "empty_value" option deprecation Cast result to int before adding to it
| | | * | | Merge branch '2.7' into 2.8v2.8.15Nicolas Grekas2016-12-083-3/+3
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Twig] Fix deprecations with Twig 1.29 fix the docblock in regard to the role argument Cast result to int before adding to it
| | | | * | fix the docblock in regard to the role argumentv2.7.22Christian Flothmann2016-12-063-3/+3
| | | | |/
| | | * | Fix email addressVictor Bocharsky2016-12-071-1/+1
| | | | |
* | | | | [Security] deprecate the RoleInterfaceChristian Flothmann2016-12-078-25/+27
| | | | |
* | | | | [Security] Add a JSON authentication listenerKévin Dunglas2016-12-032-0/+299
| | | | |
* | | | | Merge branch '3.2'Nicolas Grekas2016-11-251-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2: [Routing] Fail properly when a route parameter name cannot be used as a PCRE subpattern name [FrameworkBundle] Improve performance of ControllerNameParser Update documentation link to the component [HttpFoundation] Add links to RFC-7231 [DI] Initialize properties before method calls [Bridge/Doctrine] Use cache.prefix.seed parameter for generating cache namespace Tag missing internals Add missing example for 'path' argument in debug:config [WebProfilerBundle] Dont use request attributes in RouterController Fix complete config tests
| * | | | Merge branch '3.1' into 3.2v3.2.0-RC2v3.2.0Nicolas Grekas2016-11-251-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: [Routing] Fail properly when a route parameter name cannot be used as a PCRE subpattern name [FrameworkBundle] Improve performance of ControllerNameParser Update documentation link to the component [HttpFoundation] Add links to RFC-7231 [DI] Initialize properties before method calls Tag missing internals [WebProfilerBundle] Dont use request attributes in RouterController Fix complete config tests
| | * | | Merge branch '2.8' into 3.1Nicolas Grekas2016-11-251-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Routing] Fail properly when a route parameter name cannot be used as a PCRE subpattern name [FrameworkBundle] Improve performance of ControllerNameParser Update documentation link to the component [HttpFoundation] Add links to RFC-7231 [DI] Initialize properties before method calls Tag missing internals [WebProfilerBundle] Dont use request attributes in RouterController Fix complete config tests
| | | * | Merge branch '2.7' into 2.8Nicolas Grekas2016-11-251-2/+2
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Routing] Fail properly when a route parameter name cannot be used as a PCRE subpattern name [FrameworkBundle] Improve performance of ControllerNameParser Update documentation link to the component [HttpFoundation] Add links to RFC-7231 [DI] Initialize properties before method calls Tag missing internals [WebProfilerBundle] Dont use request attributes in RouterController Fix complete config tests
| | | | * minor #20626 Tag missing internals (ogizanagi)Nicolas Grekas2016-11-251-2/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.7 branch. Discussion ---------- Tag missing internals | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A Commits ------- 97e94b4 Tag missing internals
| | | | | * Tag missing internalsMaxime Steinhausser2016-11-251-2/+2
| | | | | |
| * | | | | [HttpKernel] Deprecate checking for cacheable HTTP methods in ↵Nicolas Grekas2016-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Request::isMethodSafe()
* | | | | | Merge branch '3.2'Fabien Potencier2016-11-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2: (24 commits) [Filesystem] Remove extra argv in dumpFile() tests [DI] minor FileLoaders tests update [FrameworkBundle] Add framework.cache.prefix_seed for predictible cache key prefixes [SecurityBundle] Remove FirewallContext mandatory FirewallConfig argument deprecation [HttpKernel] Revert BC breaking change of Request::isMethodSafe() [DI] Allow null as default env value [WebProfilerBundle] Fix deprecated uses of profiler_dump [SecurityBundle] Fix FirewallConfig nullable arguments [FrameworkBundle] Avoid warming up the validator cache for non-existent classes [DOMCrawler] Bug fixed [FrameworkBundle] Mark cache.default_*_provider services private [Process] Do feat test before enabling TTY mode bumped Symfony version to 3.1.8 updated VERSION for 3.1.7 updated CHANGELOG for 3.1.7 bumped Symfony version to 2.8.15 updated VERSION for 2.8.14 updated CHANGELOG for 2.8.14 bumped Symfony version to 2.7.22 updated VERSION for 2.7.21 ...
| * \ \ \ \ \ Merge branch '3.1' into 3.2Fabien Potencier2016-11-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: [Filesystem] Remove extra argv in dumpFile() tests [DI] minor FileLoaders tests update [HttpKernel] Revert BC breaking change of Request::isMethodSafe() [DOMCrawler] Bug fixed [FrameworkBundle] Mark cache.default_*_provider services private [Process] Do feat test before enabling TTY mode bumped Symfony version to 3.1.8 updated VERSION for 3.1.7 updated CHANGELOG for 3.1.7 bumped Symfony version to 2.8.15 updated VERSION for 2.8.14 updated CHANGELOG for 2.8.14 bumped Symfony version to 2.7.22 updated VERSION for 2.7.21 update CONTRIBUTORS for 2.7.21 updated CHANGELOG for 2.7.21 Fix annotation type for $context [Doctrine][Form] support large integers
| | * | | | Merge branch '2.8' into 3.1Fabien Potencier2016-11-231-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [DI] minor FileLoaders tests update [HttpKernel] Revert BC breaking change of Request::isMethodSafe() [DOMCrawler] Bug fixed [Process] Do feat test before enabling TTY mode bumped Symfony version to 2.8.15 updated VERSION for 2.8.14 updated CHANGELOG for 2.8.14 bumped Symfony version to 2.7.22 updated VERSION for 2.7.21 update CONTRIBUTORS for 2.7.21 updated CHANGELOG for 2.7.21 Fix annotation type for $context [Doctrine][Form] support large integers
| | | * | | Merge branch '2.7' into 2.8Fabien Potencier2016-11-231-1/+1
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [DI] minor FileLoaders tests update [HttpKernel] Revert BC breaking change of Request::isMethodSafe() [DOMCrawler] Bug fixed [Process] Do feat test before enabling TTY mode bumped Symfony version to 2.7.22 updated VERSION for 2.7.21 update CONTRIBUTORS for 2.7.21 updated CHANGELOG for 2.7.21 [Doctrine][Form] support large integers
| | | | * | [HttpKernel] Revert BC breaking change of Request::isMethodSafe()Nicolas Grekas2016-11-231-1/+1
| | | | |/
* | | | | updated version to 3.3Fabien Potencier2016-11-195-5/+5
|/ / / /
* | | | Merge branch '3.1'v3.2.0-RC1Fabien Potencier2016-11-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: [Debug] Remove GLOBALS from exception context to avoid endless recursion [Serializer] Improve test coverage of the MaxDepth annotation DX: replace @link with @see annotation bumped min version of Twig to 1.28
| * | | Merge branch '2.8' into 3.1v3.1.7Fabien Potencier2016-11-161-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * 2.8: DX: replace @link with @see annotation bumped min version of Twig to 1.28
| | * | Merge branch '2.7' into 2.8v2.8.14Fabien Potencier2016-11-151-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * 2.7: DX: replace @link with @see annotation
| | | * DX: replace @link with @see annotationv2.7.21Dariusz Ruminski2016-11-131-1/+1
| | | |
* | | | erge branch '3.1'Nicolas Grekas2016-11-031-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: Remove trailing space CS fixes Remove trailing space CS: apply rules [Yaml] Clean some messages + add test case [Console] simplified code [Form] Fix UrlType transforms valid protocols [SecurityBundle] Changed encoder configuration example to bcrypt
| * | | Merge branch '2.8' into 3.1Nicolas Grekas2016-11-031-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: CS fixes Remove trailing space CS: apply rules [Yaml] Clean some messages + add test case [Console] simplified code [Form] Fix UrlType transforms valid protocols [SecurityBundle] Changed encoder configuration example to bcrypt
| | * | Merge branch '2.7' into 2.8Nicolas Grekas2016-11-031-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: CS fixes Remove trailing space CS: apply rules [Yaml] Clean some messages + add test case [Form] Fix UrlType transforms valid protocols [SecurityBundle] Changed encoder configuration example to bcrypt
* | | | Merge branch '3.1'v3.2.0-BETA1Nicolas Grekas2016-10-062-1/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: Minor fixes & cleanups [DependencyInjection] Add missing PHPDoc type Correct a typo in the ReflectionExtractor's description [HttpFoundation] JSONP callback validation [Console] Improved the explanation of the hasOption() method Uniformize exception vars according to our CS add missing use statement bug #18042 [Security] $attributes can be anything, but RoleVoter assumes strings
| * | | Merge branch '2.8' into 3.1v3.1.6Fabien Potencier2016-10-052-1/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [DependencyInjection] Add missing PHPDoc type Correct a typo in the ReflectionExtractor's description [HttpFoundation] JSONP callback validation [Console] Improved the explanation of the hasOption() method Uniformize exception vars according to our CS add missing use statement bug #18042 [Security] $attributes can be anything, but RoleVoter assumes strings
| | * | Merge branch '2.7' into 2.8v2.8.13Fabien Potencier2016-10-052-1/+12
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [HttpFoundation] JSONP callback validation [Console] Improved the explanation of the hasOption() method add missing use statement bug #18042 [Security] $attributes can be anything, but RoleVoter assumes strings
| | | * bug #19725 [Security] $attributes can be anything, but RoleVoter assumes ↵v2.7.20Fabien Potencier2016-10-052-1/+12
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings (Jonatan Männchen) This PR was merged into the 2.7 branch. Discussion ---------- [Security] $attributes can be anything, but RoleVoter assumes strings | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18042 | License | MIT | Doc PR | reference to the documentation PR, if any Commits ------- ad3ac95 bug #18042 [Security] $attributes can be anything, but RoleVoter assumes strings
| | | | * bug #18042 [Security] $attributes can be anything, but RoleVoter assumes stringsJonatan Männchen2016-09-212-1/+12
| | | | |
* | | | | Merge branch '3.1'Fabien Potencier2016-09-242-0/+142
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: expectedException expects FQCN Fixed expectedException annotations [Cache] Fix password used to make the redis connection. Security and validators messages translation to Latvian [Form] FormView->isRendered() remove dead code and simplify the flow Fixed issue with legacy find() method not working as expected
| * | | | Merge branch '2.8' into 3.1v3.1.5Fabien Potencier2016-09-242-0/+142
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: expectedException expects FQCN Fixed expectedException annotations Security and validators messages translation to Latvian [Form] FormView->isRendered() remove dead code and simplify the flow
| | * | | Merge branch '2.7' into 2.8v2.8.12Fabien Potencier2016-09-242-0/+142
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Fixed expectedException annotations Security and validators messages translation to Latvian [Form] FormView->isRendered() remove dead code and simplify the flow
| | | * | Security and validators messages translation to Latvianv2.7.19Rikijs Murgs2016-09-222-0/+142
| | | |/
* | | | AccessDeniedException: rename object to subjectChristian Flothmann2016-09-193-8/+8
| | | | | | | | | | | | | | | | | | | | With this change the name is inline with what we use in the base voter interface.
* | | | [HttpKernel] Use VarDumper in the profilerWouterJ2016-09-172-44/+8
| | | |
* | | | feature #19843 [Security] Allow run-time configuration of hash algo ↵Fabien Potencier2016-09-131-0/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (nicolas-grekas) This PR was merged into the 3.2-dev branch. Discussion ---------- [Security] Allow run-time configuration of hash algo | Q | A | ------------- | --- | Branch? | master | New feature? | yes | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Required if we want run-time config with env vars. See #19681 Commits ------- 7903a46 [Security] Allow run-time configuration of hash algo
| * | | | [Security] Allow run-time configuration of hash algoNicolas Grekas2016-09-041-0/+40
| | | | |
* | | | | Merge branch '3.1'Nicolas Grekas2016-09-122-2/+11
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: [travis/appveyor] Wire simple-phpunit [Console] fixed PHP7 Errors are now handled and converted to Exceptions Fix #19721 Fix translation:update command count bumped Symfony version to 2.8.12 updated VERSION for 2.8.11 updated CHANGELOG for 2.8.11 bumped Symfony version to 2.7.19 updated VERSION for 2.7.18 update CONTRIBUTORS for 2.7.18 updated CHANGELOG for 2.7.18 [Security] Optimize RoleHierarchy's buildRoleMap method [FrameworkBundle] Fix Incorrect line break in exception message (500 debug page) [Security] Added note inside phpdoc. Minor cleanups and improvements [form] lazy trans `post_max_size_message`. [DI] Fix setting synthetic services on ContainerBuilder [ClassLoader] Fix ClassCollectionLoader inlining with declare(strict_types=1)
| * | | | Merge branch '2.8' into 3.1Fabien Potencier2016-09-121-2/+10
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [travis/appveyor] Wire simple-phpunit [Console] fixed PHP7 Errors are now handled and converted to Exceptions Fix #19721 Fix translation:update command count bumped Symfony version to 2.8.12 updated VERSION for 2.8.11 updated CHANGELOG for 2.8.11 bumped Symfony version to 2.7.19 updated VERSION for 2.7.18 update CONTRIBUTORS for 2.7.18 updated CHANGELOG for 2.7.18 [Security] Optimize RoleHierarchy's buildRoleMap method
| | * | | Merge branch '2.7' into 2.8Fabien Potencier2016-09-121-2/+10
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [travis/appveyor] Wire simple-phpunit [Console] fixed PHP7 Errors are now handled and converted to Exceptions Fix #19721 bumped Symfony version to 2.7.19 updated VERSION for 2.7.18 update CONTRIBUTORS for 2.7.18 updated CHANGELOG for 2.7.18 [Security] Optimize RoleHierarchy's buildRoleMap method
| | | * | minor #19868 [Security] Optimize RoleHierarchy's buildRoleMap method (Enleur)v2.7.18Fabien Potencier2016-09-061-2/+10
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was squashed before being merged into the 2.7 branch (closes #19868). Discussion ---------- [Security] Optimize RoleHierarchy's buildRoleMap method | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | no | License | MIT | Doc PR | no I have an issue with a large role hierarchy(~150 roles). Optimized it a little bit ![image](https://cloud.githubusercontent.com/assets/858989/18271257/df6c4ba0-7439-11e6-8406-e13bdcefe9ca.png) Commits ------- c3b68b0 [Security] Optimize RoleHierarchy's buildRoleMap method
| | | | * | [Security] Optimize RoleHierarchy's buildRoleMap methodEnleur2016-09-061-2/+10
| | | | | |
| * | | | | Merge branch '2.8' into 3.1Fabien Potencier2016-09-061-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [FrameworkBundle] Fix Incorrect line break in exception message (500 debug page) [Security] Added note inside phpdoc. Minor cleanups and improvements [form] lazy trans `post_max_size_message`. [DI] Fix setting synthetic services on ContainerBuilder [ClassLoader] Fix ClassCollectionLoader inlining with declare(strict_types=1)
| | * | | | minor #19773 [Security] Added note inside phpdoc. (Koc)v2.8.11Fabien Potencier2016-09-061-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was squashed before being merged into the 2.8 branch (closes #19773). Discussion ---------- [Security] Added note inside phpdoc. | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- c49e462 [Security] Added note inside phpdoc.
| | | * | | | [Security] Added note inside phpdoc.Konstantin Myakshin2016-09-061-0/+1
| | | | | | |
* | | | | | | Merge branch '3.1'Nicolas Grekas2016-09-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [Form] Fix transformer tests after the ICU update [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" bumped Symfony version to 3.1.5 updated VERSION for 3.1.4 updated CHANGELOG for 3.1.4 bumped Symfony version to 2.8.11 updated VERSION for 2.8.10 updated CHANGELOG for 2.8.10 [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
| * | | | | Merge branch '2.8' into 3.1Nicolas Grekas2016-09-061-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [Form] Fix transformer tests after the ICU update [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" bumped Symfony version to 2.8.11 updated VERSION for 2.8.10 updated CHANGELOG for 2.8.10 [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
| | * | | | Merge branch '2.7' into 2.8Nicolas Grekas2016-09-061-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
| | | * | Code enhancement and cleanupYonel Ceruto2016-09-061-1/+1
| | | | |
* | | | | Merge branch '3.1'Nicolas Grekas2016-08-268-12/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: fix typo add "provides" for psr/cache-implementation [Validator][GroupSequence] fixed GroupSequence validation ignores PropertyMetadata of parent classes [FrameworkBundle][Security] Remove useless mocks Add symfony/inflector to composer.json "replaces" [DoctrineBridge] Enhance exception message in EntityUserProvider added friendly exception when constraint validator does not exist or it is not enabled remove duplicate instruction [FrameworkBundle] Remove TranslatorBagInterface check [FrameworkBundle] Remove duplicated code in RouterDebugCommand [Validator] fixed duplicate constraints with parent class interfaces SecurityBundle:BasicAuthenticationListener: removed a default argument on getting a header value
| * | | | Merge branch '2.8' into 3.1v3.1.4Nicolas Grekas2016-08-268-12/+18
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Validator][GroupSequence] fixed GroupSequence validation ignores PropertyMetadata of parent classes [FrameworkBundle][Security] Remove useless mocks [DoctrineBridge] Enhance exception message in EntityUserProvider added friendly exception when constraint validator does not exist or it is not enabled remove duplicate instruction [FrameworkBundle] Remove TranslatorBagInterface check [FrameworkBundle] Remove duplicated code in RouterDebugCommand [Validator] fixed duplicate constraints with parent class interfaces SecurityBundle:BasicAuthenticationListener: removed a default argument on getting a header value
| | * | | Merge branch '2.7' into 2.8v2.8.10Nicolas Grekas2016-08-268-12/+18
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Validator][GroupSequence] fixed GroupSequence validation ignores PropertyMetadata of parent classes [FrameworkBundle][Security] Remove useless mocks [DoctrineBridge] Enhance exception message in EntityUserProvider added friendly exception when constraint validator does not exist or it is not enabled remove duplicate instruction [FrameworkBundle] Remove TranslatorBagInterface check [FrameworkBundle] Remove duplicated code in RouterDebugCommand [Validator] fixed duplicate constraints with parent class interfaces SecurityBundle:BasicAuthenticationListener: removed a default argument on getting a header value
| | | * | minor #19736 [FrameworkBundle][Security] Remove useless mocks (Ener-Getick)v2.7.17Fabien Potencier2016-08-257-11/+17
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.7 branch. Discussion ---------- [FrameworkBundle][Security] Remove useless mocks | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Removes mocks causing issues in https://github.com/symfony/symfony/pull/19734. Commits ------- fcd3345 [FrameworkBundle][Security] Remove useless mocks
| | | | * | [FrameworkBundle][Security] Remove useless mocksEner-Getick2016-08-257-11/+17
| | | | | |
| | | * | | SecurityBundle:BasicAuthenticationListener: removed a default argument on ↵Dawid Nowak2016-08-011-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | getting a header value it's unnecessary.
| | | * | Minor fixesv2.7.16Vyacheslav Pavlov2016-07-301-2/+0
| | | | |
| | | * | Fixed bugs in names of classes and methods.Vyacheslav Pavlov2016-07-261-1/+1
| | | | |
* | | | | [Security] Expose the required roles in AccessDeniedExceptionTristan Darricau2016-07-295-3/+50
| | | | |
* | | | | Merge branch '3.1'Nicolas Grekas2016-07-171-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: [VarDumper] Fix dumping jsons casted as arrays PassConfig::getMergePass is not an array Revert "bug #19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)" [Serializer] Include the format in the cache key Fix the retrieval of the last username when using forwarding [Yaml] Fix PHPDoc of the Yaml class [HttpFoundation] Add OPTIONS and TRACE to the list of safe methods Update getAbsoluteUri() for query string uris Conflicts: src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
| * | | | Merge branch '3.0' into 3.1v3.1.3Nicolas Grekas2016-07-171-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: [VarDumper] Fix dumping jsons casted as arrays PassConfig::getMergePass is not an array Revert "bug #19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)" Fix the retrieval of the last username when using forwarding [Yaml] Fix PHPDoc of the Yaml class [HttpFoundation] Add OPTIONS and TRACE to the list of safe methods Update getAbsoluteUri() for query string uris Conflicts: src/Symfony/Component/Yaml/Yaml.php
| | * \ \ \ Merge branch '2.8' into 3.0v3.0.9origin/3.0Nicolas Grekas2016-07-171-1/+7
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [VarDumper] Fix dumping jsons casted as arrays PassConfig::getMergePass is not an array Revert "bug #19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)" Fix the retrieval of the last username when using forwarding [Yaml] Fix PHPDoc of the Yaml class [HttpFoundation] Add OPTIONS and TRACE to the list of safe methods Update getAbsoluteUri() for query string uris
| | | * | | Merge branch '2.7' into 2.8v2.8.9Nicolas Grekas2016-07-171-1/+7
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [VarDumper] Fix dumping jsons casted as arrays PassConfig::getMergePass is not an array Revert "bug #19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)" Fix the retrieval of the last username when using forwarding [Yaml] Fix PHPDoc of the Yaml class [HttpFoundation] Add OPTIONS and TRACE to the list of safe methods Update getAbsoluteUri() for query string uris
| | | | * | Fix the retrieval of the last username when using forwardingChristophe Coevoet2016-07-111-1/+7
| | | | | |
* | | | | | Merge branch '3.1'Nicolas Grekas2016-07-101-0/+79
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: [HttpKernel] fixed internal subrequests having an if-modified-since-header [Security] Fix deprecated usage of DigestAuthenticationEntryPoint::getKey() in DigestAuthenticationListener [Validator] Added additional MasterCard range to the CardSchemeValidator Make the exception message more clear. [Form] fixed bug - name in ButtonBuilder [DoctrineBridge] added missing error code for constraint. [ClassLoader] Fix declared classes being computed when not needed [varDumper] Fix missing usage of ExceptionCaster::$traceArgs
| * | | | | Merge branch '3.0' into 3.1Nicolas Grekas2016-07-101-0/+79
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: [HttpKernel] fixed internal subrequests having an if-modified-since-header [Security] Fix deprecated usage of DigestAuthenticationEntryPoint::getKey() in DigestAuthenticationListener [Validator] Added additional MasterCard range to the CardSchemeValidator Make the exception message more clear. [Form] fixed bug - name in ButtonBuilder [DoctrineBridge] added missing error code for constraint. [ClassLoader] Fix declared classes being computed when not needed [varDumper] Fix missing usage of ExceptionCaster::$traceArgs
| | * | | | Merge branch '2.8' into 3.0Nicolas Grekas2016-07-101-0/+79
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [HttpKernel] fixed internal subrequests having an if-modified-since-header [Security] Fix deprecated usage of DigestAuthenticationEntryPoint::getKey() in DigestAuthenticationListener [Validator] Added additional MasterCard range to the CardSchemeValidator Make the exception message more clear. [Form] fixed bug - name in ButtonBuilder [DoctrineBridge] added missing error code for constraint. [ClassLoader] Fix declared classes being computed when not needed [varDumper] Fix missing usage of ExceptionCaster::$traceArgs Conflicts: src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
| | | * | | [Security] Fix deprecated usage of DigestAuthenticationEntryPoint::getKey() ↵Maxime STEINHAUSSER2016-07-082-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | in DigestAuthenticationListener
* | | | | | Merge branch '3.1'Nicolas Grekas2016-07-057-14/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1: [VarDumper] Fix indentation trimming in ExceptionCaster [HttpKernel] Clarify deprecation of non-scalar values in surrogate renderer removed @since [Security] fixed DebugAccessDecisionManager::setVoters() Remove and change unrelevant comments in Validator and Security components. [Validator] add missing interface use statement for phpdoc block return type. [Validator] UuidValidator must accept a Uuid constraint. [Validator] make UuidValidator class formatting consistent. Conflicts: src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
| * | | | | Merge branch '3.0' into 3.1Nicolas Grekas2016-07-056-13/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: [VarDumper] Fix indentation trimming in ExceptionCaster removed @since Remove and change unrelevant comments in Validator and Security components. [Validator] add missing interface use statement for phpdoc block return type. [Validator] UuidValidator must accept a Uuid constraint. [Validator] make UuidValidator class formatting consistent.
| | * | | | Merge branch '2.8' into 3.0Nicolas Grekas2016-07-056-13/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | | Merge branch '2.7' into 2.8Nicolas Grekas2016-07-057-15/+1
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: 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.
| | | | * | removed @sinceFabien Potencier2016-07-047-14/+0
| | | | | |