summaryrefslogtreecommitdiffstats
path: root/Core
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '2.8'Nicolas Grekas2015-10-075-350/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: composer.json src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Translation/PluralizationRules.php src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
| * Deprecate the SecureRandom classPierre du Plessis2015-10-064-141/+21
| |
| * Merge branch '2.7' into 2.8Nicolas Grekas2015-10-062-7/+7
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php src/Symfony/Component/Security/composer.json
| | * [Security] sync translations and add a test for itChristian Flothmann2015-10-061-6/+6
| | |
| | * Merge branch '2.3' into 2.7Nicolas Grekas2015-10-061-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Process/Process.php
* | | \ Merge branch '2.8'Fabien Potencier2015-10-054-42/+59
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (21 commits) [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1] [ci] Use current PHP_BINARY when running ./phpunit Fixed typos [UPGRADE-3.0] fix bullet indentation Throw exception if tempnam returns false in ProcessPipes [DomCrawler] Deprecated using /_root/ in XPath expressions Pass missing request template variables Simplify AbstractVoter [Form] add missing deprecation triggers Throw exception if tempnam returns false Fix PropertyAccessor modifying array in object when array key does not exist [DependencyInjection] Add autowiring capabilities Fixing typo in variable name Add a few additional tests for the Crawler [Form] remove obsolete deprecation comments Updated the style of the event commands [Debug] Deprecate providing $fileLinkFormat as second argument [Form] minor CS fix Updated PHPDoc of the AbstractVoter class [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing ...
| * | | Merge branch '2.7' into 2.8Fabien Potencier2015-10-052-17/+53
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1] [ci] Use current PHP_BINARY when running ./phpunit Fixed typos [UPGRADE-3.0] fix bullet indentation Fix PropertyAccessor modifying array in object when array key does not exist [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
| | * | Merge branch '2.3' into 2.7Fabien Potencier2015-10-052-17/+53
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1] [ci] Use current PHP_BINARY when running ./phpunit Fixed typos [UPGRADE-3.0] fix bullet indentation [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
| | | * bug #13627 [Security] InMemoryUserProvider now concerns whether user's ↵Fabien Potencier2015-10-051-11/+26
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | password is changed when refreshing (issei-m) This PR was merged into the 2.3 branch. Discussion ---------- [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When a user has changed own password, I want to logout any sessions which is authenticated by its user except changer itself. [DaoAuthenticationManager::checkAuthentication()](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php#L59) method seems to concern about it. But, this situation actually never happens because both users that will be passed to this method are always identical in re-authentication. It's because the token refreshes own user via [ContextListener](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Http/Firewall/ContextListener.php#L90) before re-authentication. Commits ------- 729902a [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
| | | | * [Security] InMemoryUserProvider now concerns whether user's password is ↵Issei.M2015-08-101-11/+26
| | | | | | | | | | | | | | | | | | | | changed when refreshing
| * | | | feature #16102 Simplify AbstractVoter (Koc)Fabien Potencier2015-10-052-27/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.8 branch. Discussion ---------- Simplify AbstractVoter | Q | A | ------------- | --- | Bug fix? | no | New feature? | no, just simplification | BC breaks? | no, because 2.8 is not yet released | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 93de659 Simplify AbstractVoter
| | * | | | Simplify AbstractVoterKonstantin.Myakshin2015-10-042-27/+8
| | | | | |
| * | | | | Updated PHPDoc of the AbstractVoter classKonstantin Myakshin2015-10-021-5/+2
| |/ / / /
* | | | | Merge branch '2.8'Fabien Potencier2015-10-021-2/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Updated the stlyes of the YAML commands [Security] Configuring a user checker per firewall [PropertyInfo] Test behavior when an extractor return null.
| * | | | [Security] Configuring a user checker per firewallIltar van der Berg2015-10-021-2/+9
| | | | |
* | | | | [3.0][Security] Remove deprecated features (follow up of #15899)Konstantin.Myakshin2015-10-018-99/+7
| | | | |
* | | | | Remove more testsWouterJ2015-09-301-36/+0
| | | | |
* | | | | Remove AbstractVoter#isGranted() methodWouterJ2015-09-302-84/+1
| | | | |
* | | | | Removed supports{Attribute,Class}() methodsWouterJ2015-09-304-150/+1
| | | | |
* | | | | Merge branch '2.8'Tobias Schultze2015-09-298-52/+369
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: composer.json src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php src/Symfony/Component/ClassLoader/DebugClassLoader.php src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Console/Input/StringInput.php src/Symfony/Component/Debug/DebugClassLoader.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/DependencyInjection/ContainerInterface.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/DefinitionDecorator.php src/Symfony/Component/DependencyInjection/Scope.php src/Symfony/Component/DependencyInjection/ScopeInterface.php src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/Event.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/KernelInterface.php src/Symfony/Component/HttpKernel/Log/LoggerInterface.php src/Symfony/Component/HttpKernel/Log/NullLogger.php src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Resources/translations/security.tr.xlf src/Symfony/Component/Security/composer.json src/Symfony/Component/Translation/Translator.php
| * | | | [Ldap] add some missing license file headersChristian Flothmann2015-09-282-0/+18
| | | | |
| * | | | fix tests for the `AbstractVoter` classChristian Flothmann2015-09-282-44/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The `LegacyAbstractVoterTest` class is not needed anymore, tests have been moved to the `AbstractVoterTest` class tagging them with the legacy group. * Tests are applied on `stdClass` object instances. Thus, the legacy voter fixture class must not support `AbstractVoterTest_Object` instances, but support `stdClass` objects instead.
| * | | | Implemented LDAP authentication and LDAP user providerGrégoire Pineau2015-09-285-1/+342
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-09-283-63/+149
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Finder] simplified code Fix tests in 2.8 [Validator] Sync polish translation file Adding a class to make it easier to set custom authentication error messages Readd the correct tests
| * | | | Fix tests in 2.8Wouter J2015-09-281-12/+42
| | | | |
| * | | | feature #15882 Easier Custom Authentication errors (weaverryan)Fabien Potencier2015-09-282-0/+105
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.8 branch. Discussion ---------- Easier Custom Authentication errors | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | not yet This makes failing authentication with a custom message much easier: ```php throw CustomAuthenticationException::createWithSafeMessage( 'That was a ridiculous username' ); // or $e = new CustomAuthenticationException(); $e->setSafeMessage('That was a ridiculous username'); throw $e; ``` Currently, to do this, you'd need to create a new sub-class of `AuthenticationException`, which is way more work than it needs to be. The original design was so that all messages exposed are safe, which is why I've named the methods like I have. Thanks! Commits ------- d7c1463 Adding a class to make it easier to set custom authentication error messages
| | * | | | Adding a class to make it easier to set custom authentication error messagesRyan Weaver2015-09-272-0/+105
| | | | | |
| * | | | | Merge branch '2.7' into 2.8Fabien Potencier2015-09-281-75/+26
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | * 2.7: Readd the correct tests
| | * | | Readd the correct testsWouter J2015-09-271-46/+30
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-09-275-35/+61
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (28 commits) Detect Mintty for color support on Windows Detect Mintty for color support on Windows [WebProfilerBundle] Fix search button click listener [Form][Type Date/Time] added choice_translation_domain option. Massively simplifying the BC and deprecated-throwing code thanks to suggestions by stof in #15870 Making all "debug" messages use the debug router Making GuardTokenInterface extend TokenInterface Updating behavior to not continue after an authenticator has set the response Add a group for tests of the finder against the FTP server Fix trigger_error calls Fix legacy security tests tweaking message related to configuration edge case that we want to be helpful with Minor tweaks - lowering the required security-http requirement and nulling out a test field Fix license headers Fix license headers Fix license headers Ensure the ClockMock is loaded before using it in the testsuite Allow serializer 3.0 in the PropertyInfo component Add the replace rules for the security-guard component Forbid serializing a Crawler ...
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-09-271-2/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Detect Mintty for color support on Windows Detect Mintty for color support on Windows Add a group for tests of the finder against the FTP server Fix license headers Forbid serializing a Crawler Fix phpdoc block of NativeSessionStorage class Added exception when setAutoInitialize is called when locked [FrameworkBundle] Advanced search templates of bundles [Security] Allow user providers to be defined in many files Use random_bytes function if it is available for random number generation
| | * | | Merge branch '2.3' into 2.7Fabien Potencier2015-09-271-2/+6
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Detect Mintty for color support on Windows Add a group for tests of the finder against the FTP server Fix license headers Forbid serializing a Crawler Fix phpdoc block of NativeSessionStorage class Added exception when setAutoInitialize is called when locked [FrameworkBundle] Advanced search templates of bundles [Security] Allow user providers to be defined in many files Use random_bytes function if it is available for random number generation
| | | * | Use random_bytes function if it is available for random number generationPierre du Plessis2015-09-231-4/+8
| | | | |
| * | | | Massively simplifying the BC and deprecated-throwing code thanks to ↵Ryan Weaver2015-09-262-26/+39
| | | | | | | | | | | | | | | | | | | | suggestions by stof in #15870
| * | | | minor #15923 Fix legacy security tests (stof)Christophe Coevoet2015-09-261-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.8 branch. Discussion ---------- Fix legacy security tests | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a when merging legacy test classes together in #15893, use statements where not copied, making the tests fail. Commits ------- 8b615bb Fix legacy security tests
| | * | | | Fix legacy security testsChristophe Coevoet2015-09-261-2/+2
| | | | | |
| * | | | | Fix trigger_error callsWouterJ2015-09-262-7/+7
| |/ / / /
| * | | | Fix license headersGábor Egyed2015-09-261-0/+9
| | | | |
| * | | | minor #15893 Merged LegacySecurityContext tests (WouterJ)Fabien Potencier2015-09-262-31/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.8 branch. Discussion ---------- Merged LegacySecurityContext tests I've no idea why this test was introduced in the wrong namespace in 2.8, but I merged it in the correct test case now. Commits ------- 2c4da3c Merged LegacySecurityContext tests
| | * | | | Merged LegacySecurityContext testsWouterJ2015-09-251-0/+10
| | | | | |
* | | | | | Merge branch '2.8'Fabien Potencier2015-09-267-4/+242
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (23 commits) [Validator] added BIC (SWIFT-BIC) validation constraint [TwigBridge] Foundation form layout integration [Security] Deprecated supportsAttribute and supportsClass methods bumped Symfony version to 2.7.6 updated VERSION for 2.7.5 updated CHANGELOG for 2.7.5 bumped Symfony version to 2.3.34 updated VERSION for 2.3.33 update CONTRIBUTORS for 2.3.33 updated CHANGELOG for 2.3.33 [Console] Fix transient HHVM test [OptionsResolver] Fix catched exception along the dependency tree mistakenly detects cyclic dependencies fixed tests [DI] Support deprecated definitions in decorators [DI] Allow to change the deprecation message in Definition [DI] Trigger a deprecated error on the container builder [DI] Dump the deprecated status [DI] Supports the deprecated tag in loaders [DI] Add a deprecated status to definitions Fixing test locations ...
| * | | | | feature #15151 [Security] Deprecated supportsAttribute and supportsClass ↵Fabien Potencier2015-09-257-5/+121
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods (WouterJ) This PR was squashed before being merged into the 2.8 branch (closes #15151). Discussion ---------- [Security] Deprecated supportsAttribute and supportsClass methods These methods aren't used at all in a Symfony application and don't make sense to use in the application. They are only used internally in the voters. This means the voter interface can be made much easier. I'm not sure how we do these deprecations, should we remove the methods from the interface now already? Also, I don't think it's possible to trigger deprecation notices for the voter methods? | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | one of #11742 | License | MIT | Doc PR | - Abstract Voter --- There is one remaining question about the abstract voter. This currently has abstract `getSupportedAttributes()` and `getSupportedClass()` methods. One of the reasons to remove the methods for the interface was that these methods are not flexible. Does it make sense to deprecate these methods as well and replace them by an abstract `protected vote(array $attributes, $class)` method in the `AbstractVoter` (which is called from `AbstractVoter#vote()`) ? Commits ------- 6588708 [Security] Deprecated supportsAttribute and supportsClass methods
| | * | | | | [Security] Deprecated supportsAttribute and supportsClass methodsWouterJ2015-09-257-4/+192
| | |/ / / /
| * | | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-09-252-0/+153
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Console] Fix transient HHVM test [OptionsResolver] Fix catched exception along the dependency tree mistakenly detects cyclic dependencies fixed tests Fixing test locations [VarDumper] Fix dump comparison on large arrays [expression-language] Code Cleanup for GetAttrNode
| | * | | fixed testsv2.7.5Fabien Potencier2015-09-251-1/+1
| | | | |
| | * | | Fixing test locationsRyan Weaver2015-09-232-0/+121
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-09-242-4/+73
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (29 commits) Updating AbstractVoter so that the method receives the TokenInterface Adding the necessary files so that Guard can be its own installable component Fix syntax in a test Normalize the way we check versions Avoid errors when generating the logout URL when there is no firewall key Removing unnecessary override fabbot Adding a new exception and throwing it when the User changes Fixing a bug where having an authentication failure would log you out. Tweaks thanks to Wouter Adding logging on this step and switching the order - not for any huge reason Adding a base class to assist with form login authentication Allowing for other authenticators to be checked meaningless author and license changes Adding missing factory registration Thanks again fabbot! A few more changes thanks to @iltar Splitting the getting of the user and checking credentials into two steps Tweaking docblock on interface thanks to @iltar Adding periods at the end of exceptions, and changing one class name to LogicException thanks to @iltar ... Conflicts: UPGRADE-2.8.md src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
| * | | | feature #14673 New Guard Authentication System (e.g. putting the joy back ↵Fabien Potencier2015-09-241-0/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into security) (weaverryan) This PR was merged into the 2.8 branch. Discussion ---------- New Guard Authentication System (e.g. putting the joy back into security) | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | at least partially: #14300, #11158, #11451, #10035, #10463, #8606, probably more | License | MIT | Doc PR | symfony/symfony-docs#5265 Hi guys! Though it got much easier in 2.4 with `pre_auth`, authentication is a pain in Symfony. This introduces a new authentication provider called guard, with one goal in mind: put everything you need for *any* authentication system into one spot. ### How it works With guard, you can perform custom authentication just by implementing the [GuardAuthenticatorInterface](https://github.com/weaverryan/symfony/blob/guard/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php) and registering it as a service. It has methods for every part of a custom authentication flow I can think of. For a working example, see https://github.com/weaverryan/symfony-demo/tree/guard-auth. This uses 2 authenticators simultaneously, creating a system that handles [form login](https://github.com/weaverryan/symfony-demo/blob/guard-auth/src/AppBundle/Security/FormLoginAuthenticator.php) and [api token auth](https://github.com/weaverryan/symfony-demo/blob/guard-auth/src/AppBundle/Security/TokenAuthenticator.php) with a respectable amount of code. The [security.yml](https://github.com/weaverryan/symfony-demo/blob/guard-auth/app/config/security.yml) is also quite simple. This also supports "manual login" without jumping through hoops: https://github.com/weaverryan/symfony-demo/blob/guard-auth/src/AppBundle/Controller/SecurityController.php#L45 I've also tested with "remember me" and "switch user" - no problems with either. I hope you like it :). ### What's Needed 1) **Other Use-Cases?**: Please think about the code and try it. What use-cases are we *not* covering? I want Guard to be simple, but cover the 99.9% use-cases. 2) **Remember me** functionality cannot be triggered via manual login. That's true now, and it's not fixed, and it's tricky. ### Deprecations? This is a new feature, so no deprecations. But, creating a login form with a guard authenticator is a whole heck of a lot easier to understand than `form_login` or even `simple_form`. In a perfect world, we'd either deprecate those or make them use "guard" internally so that we have just **one** way of performing authentication. Thanks! Commits ------- a01ed35 Adding the necessary files so that Guard can be its own installable component d763134 Removing unnecessary override e353833 fabbot dd485f4 Adding a new exception and throwing it when the User changes 302235e Fixing a bug where having an authentication failure would log you out. 396a162 Tweaks thanks to Wouter c9d9430 Adding logging on this step and switching the order - not for any huge reason 31f9cae Adding a base class to assist with form login authentication 0501761 Allowing for other authenticators to be checked 293c8a1 meaningless author and license changes 81432f9 Adding missing factory registration 7a94994 Thanks again fabbot! 7de05be A few more changes thanks to @iltar ffdbc66 Splitting the getting of the user and checking credentials into two steps 6edb9e1 Tweaking docblock on interface thanks to @iltar d693721 Adding periods at the end of exceptions, and changing one class name to LogicException thanks to @iltar eb158cb Updating interface method per suggestion - makes sense to me, Request is redundant c73c32e Thanks fabbot! 6c180c7 Adding an edge case - this should not happen anyways 180e2c7 Properly handles "post auth" tokens that have become not authenticated 873ed28 Renaming the tokens to be clear they are "post" and "pre" auth - also adding an interface a0bceb4 adding Guard tests 05af97c Initial commit (but after some polished work) of the new Guard authentication system 330aa7f Improving phpdoc on AuthenticationEntryPointInterface so people that implement this understand it
| | * | | | Adding a new exception and throwing it when the User changesRyan Weaver2015-09-201-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is quite technical. As you can see in the provider, the method is called sometimes when the User changes, and so the token becomes de-authenticated (e.g. someone else changes the password between requests). In practice, the user should be unauthenticated. Using the anonymous token did this, but throwing an AccountStatusException seems like a better idea. It needs to be an AccountStatusException because the ExceptionListener from the Firewall looks for exceptions of this class and logs the user out when they are found (because this is their purpose).
| * | | | | Updating AbstractVoter so that the method receives the TokenInterfaceRyan Weaver2015-09-241-4/+42
| |/ / / /
* | | | | Merge branch '2.8'Tobias Schultze2015-09-091-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG-2.7.md UPGRADE-2.8.md src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml src/Symfony/Component/Config/CHANGELOG.md src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php src/Symfony/Component/HttpKernel/Kernel.php
| * | | | Merge branch '2.7' into 2.8Tobias Schultze2015-09-091-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
| | * | | fix class use and in phpdocEvgeniy Sokolov2015-09-091-1/+1
| | | | |
* | | | | [Security] Remove deprecated interfacesNicolas Grekas2015-09-0310-476/+0
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-08-313-4/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: bumped minimal version in appveyor to 5.3.9 [VarDumper] Fix missing support for dumping PHP7 return type Require security-acl 2.7 for BC [travis] disable symfony_debug ext when deps!=no Require actual version of ACL component until ACL/2.8 branch released Do not normalize the kernel root directory path (see symfony/symfony#15474). Don't trigger deprecation on interfaces [Debug] Ignore silencing for deprecations [ci] Run minimal versions on appveyor only Deprecated Security ClassUtils in favor of Acl ClassUtils Fix appveyor file consistently use str_replace to unify directory separators (remaining)
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-08-311-2/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [VarDumper] Fix missing support for dumping PHP7 return type [travis] disable symfony_debug ext when deps!=no Do not normalize the kernel root directory path (see symfony/symfony#15474). Don't trigger deprecation on interfaces [Debug] Ignore silencing for deprecations [ci] Run minimal versions on appveyor only Fix appveyor file consistently use str_replace to unify directory separators (remaining)
| | * | | Don't trigger deprecation on interfacesv2.7.4Nicolas Grekas2015-08-301-2/+0
| | | | |
| * | | | Deprecated Security ClassUtils in favor of Acl ClassUtilsIltar van der Berg2015-08-272-2/+12
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-08-272-1/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (21 commits) Fix merge Fix typo Various fixes esp. on Windows Fix the validation of form resources to register the default theme Fix the retrieval of the value with property path when using a loader [appveyor] minor enhancements [Process] Disable failing tests on Windows [Translation] Fix the string casting in the XliffFileLoader Windows and Intl fixes Add appveyor.yml for C.I. on Windows [VarDumper] fixed HtmlDumper to target specific the head tag [travis] merge php: nightly and deps=high test-matrix lines consistently use str_replace to unify directory separators Support omitting the <target> node in an .xlf file. Fix the handling of values for multiple choice types moved PHP nightly to PHP 7.0 fixed tests using deprecation features [Form] made deprecation notice more precise fixed CS Fix BC break after split of ACL from core ... Conflicts: .travis.yml composer.json src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php src/Symfony/Component/Locale/Tests/LocaleTest.php
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-08-272-1/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Various fixes esp. on Windows Fix the validation of form resources to register the default theme Fix the retrieval of the value with property path when using a loader [appveyor] minor enhancements [Process] Disable failing tests on Windows [Translation] Fix the string casting in the XliffFileLoader Windows and Intl fixes Add appveyor.yml for C.I. on Windows [VarDumper] fixed HtmlDumper to target specific the head tag [travis] merge php: nightly and deps=high test-matrix lines consistently use str_replace to unify directory separators Support omitting the <target> node in an .xlf file. Fix the handling of values for multiple choice types moved PHP nightly to PHP 7.0 [Security] Add missing docblock in PreAuthenticatedToken Conflicts: .travis.yml
| | * | | Merge branch '2.3' into 2.7Nicolas Grekas2015-08-262-1/+8
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Windows and Intl fixes Add appveyor.yml for C.I. on Windows [travis] merge php: nightly and deps=high test-matrix lines [Security] Add missing docblock in PreAuthenticatedToken Conflicts: .travis.yml src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/HttpFoundation/JsonResponse.php src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
| | | * | [Security] Add missing docblock in PreAuthenticatedTokenv2.3.33v2.3.32Titouan Galopin2015-08-072-1/+8
| | | |/
* | | | Merge branch '2.8'Fabien Potencier2015-08-248-10/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | Merge branch '2.7' into 2.8Fabien Potencier2015-08-248-10/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | * 2.7: fixes CS
| | * | fixes CSFabien Potencier2015-08-248-10/+12
| | | |
* | | | Merge branch '2.8'Nicolas Grekas2015-08-011-7/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (63 commits) [Debug] Deprecate ExceptionHandler::createResponse [Debug] cleanup ExceptionHandlerTest Reordered the toolbar elements via service priorities bumped Symfony version to 2.7.4 Increased the z-index of .sf-toolbar-info Removed an unused media query updated VERSION for 2.7.3 updated CHANGELOG for 2.7.3 Redesigned "abbr" elements Restored the old behavior for toolbars with lots of elements Tweaks and bug fixes Added some upgrade notes about the new toolbar design fixed typo in translation keys Fix the return value on error for intl methods returning arrays Removed an useless CSS class and added styles for <hr> Added a new profiler_markup_version to improve BC of the new toolbar Fix merge Removed an unused import Reverted the feature to display different toolbar versions Minor JavaScript optimizations ... Conflicts: CHANGELOG-2.7.md UPGRADE-2.8.md src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml src/Symfony/Component/Debug/composer.json src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
| * | | Small optimization in AccessDecisionManagerJérémy Derussé2015-07-281-7/+1
| | | |
* | | | Merge branch '2.8'Fabien Potencier2015-07-262-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Yaml] throw a ParseException on invalid data type [TwigBridge] type-dependent path discovery Resources as string have the same problem Introduce failing test case when a SplFileInfo object is passed to the extract() method in the TwigExtractor. #15331 add infos about deprecated classes to UPGRADE-3.0 [Asset] removed unused private property. [Twig+FrameworkBundle] Fix forward compat with Form 2.8 [2.6] Static Code Analysis for Components [Security/Http] Fix test relying on a private property [Serializer] Fix bugs reported in https://github.com/symfony/symfony/commit/b5990be49149501bef7bb83a797a1aea2eb5fbe0#commitcomment-12301266 [Form] Fix not-BC test assertion [Security] Moved Simple{Form,Pre}AuthenticatorInterfaces to Security\Http [Security] removed useless else condition in SwitchUserListener class. [travis] Tests deps=low with PHP 5.6 Implement resettable containers [Console] Fix console output with closed stdout
| * | | feature #15131 [Security] Moved Simple{Form,Pre}AuthenticatorInterfaces to ↵Fabien Potencier2015-07-222-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security\Http (WouterJ) This PR was squashed before being merged into the 2.8 branch (closes #15131). Discussion ---------- [Security] Moved Simple{Form,Pre}AuthenticatorInterfaces to Security\Http Description --- The `SimpleFormAuthenticatorInterface` and `SimplePreAuthenticatorInterface` rely on `Request`, which means it's a Http land class. This means they don't belong in core. Having a form login that doesn't depend on the request is an option as well (e.g. a console application might use the question helper to implement a "form" login). However, then there is a need for a new abstraction of the request. I don't think it's worth it. Furthermore, the only classes typehinting/relying on this interfaces can be found in `Security\Http`. Implementation --- The new interfaces extend the old ones for better backwards compability. Symfony doesn't trigger deprecation errors for interfaces, see https://github.com/symfony/symfony/commit/6f57b7b552e77a12f8116460671d78a3eb0ddbb9 PR Info Table --- | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- ebb2064 [Security] Moved Simple{Form,Pre}AuthenticatorInterfaces to Security\Http
| | * | | [Security] Moved Simple{Form,Pre}AuthenticatorInterfaces to Security\HttpWouterJ2015-07-222-0/+4
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-07-223-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (27 commits) [2.8] Fix 3.0 incompatible deps [HttpKernel] Fix lowest dep [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization() [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Forbid container cloning [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3 [WebProfilerBundle] Add link to show profile of latest request [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr [Console] Set QuestionHelper max attempts in tests [Form] Fix a BC break in the entity fix broken ChoiceQuestion bumped Symfony version to 2.7.3 updated VERSION for 2.7.2 updated CHANGELOG for 2.7.2 bumped Symfony version to 2.6.11 ... Conflicts: .travis.yml CHANGELOG-2.3.md CHANGELOG-2.6.md CHANGELOG-2.7.md UPGRADE-2.7.md src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpKernel/composer.json
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-07-223-3/+3
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [HttpKernel] Fix lowest dep [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization() [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr bumped Symfony version to 2.3.32 updated VERSION for 2.3.31 update CONTRIBUTORS for 2.3.31 updated CHANGELOG for 2.3.31 Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpKernel/composer.json
| | * | Merge branch '2.6' into 2.7Nicolas Grekas2015-07-223-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr bumped Symfony version to 2.3.32 updated VERSION for 2.3.31 update CONTRIBUTORS for 2.3.31 updated CHANGELOG for 2.3.31 Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json
| | | * \ Merge branch '2.3' into 2.6Nicolas Grekas2015-07-223-3/+3
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr bumped Symfony version to 2.3.32 updated VERSION for 2.3.31 update CONTRIBUTORS for 2.3.31 updated CHANGELOG for 2.3.31 Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/HttpKernel/Kernel.php
| | | | * [Security] fix check for empty usernamesChristian Flothmann2015-07-223-3/+3
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-07-091-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Added 'default' color [HttpFoundation] Reload the session after regenerating its id [HttpFoundation] Add a test case to confirm a bug in session migration [Serializer] Fix ClassMetadata::sleep() [2.6] Static Code Analysis for Components and Bundles [Finder] Command::addAtIndex() fails with Command instance argument [DependencyInjection] Freeze also FrozenParameterBag::remove [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig fix CS fixed CS Add a way to reset the singleton [Security] allow to use `method` in XML configs [Serializer] Fix Groups tests. Remove duplicate example Remove var not used due to returning early (introduced in 8982c32) [Serializer] Fix Groups PHPDoc Enhance hhvm test skip message fix for legacy asset() with EmptyVersionStrategy [Form] Added upgrade notes for #15061
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-07-091-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Added 'default' color [HttpFoundation] Reload the session after regenerating its id [HttpFoundation] Add a test case to confirm a bug in session migration [Serializer] Fix ClassMetadata::sleep() [2.6] Static Code Analysis for Components and Bundles [Finder] Command::addAtIndex() fails with Command instance argument [DependencyInjection] Freeze also FrozenParameterBag::remove [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig fix CS fixed CS Add a way to reset the singleton [Security] allow to use `method` in XML configs [Serializer] Fix Groups tests. Remove duplicate example Remove var not used due to returning early (introduced in 8982c32) [Serializer] Fix Groups PHPDoc Enhance hhvm test skip message fix for legacy asset() with EmptyVersionStrategy [Form] Added upgrade notes for #15061
| | * | | Merge branch '2.6' into 2.7v2.7.2Fabien Potencier2015-07-091-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Added 'default' color [HttpFoundation] Reload the session after regenerating its id [HttpFoundation] Add a test case to confirm a bug in session migration [2.6] Static Code Analysis for Components and Bundles [Finder] Command::addAtIndex() fails with Command instance argument [DependencyInjection] Freeze also FrozenParameterBag::remove [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig fix CS fixed CS Add a way to reset the singleton [Security] allow to use `method` in XML configs Remove duplicate example Remove var not used due to returning early (introduced in 8982c32) Enhance hhvm test skip message
| | | * | [2.6] Static Code Analysis for Components and Bundlesv2.6.10Vladimir Reznichenko2015-07-081-1/+1
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-07-028-51/+77
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [travis] start hhvm first [DX] [Security] Renamed Token#getKey() to getSecret() [Validator] always evaluate binary format when changed Conflicts: .travis.yml src/Symfony/Component/Security/Http/composer.json
| * | | | feature #15141 [DX] [Security] Renamed Token#getKey() to getSecret() (WouterJ)Fabien Potencier2015-07-028-51/+77
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was squashed before being merged into the 2.8 branch (closes #15141). Discussion ---------- [DX] [Security] Renamed Token#getKey() to getSecret() There are 2 very vague parameter names in the authentication process: `$providerKey` and `$key`. Some tokens/providers have the first one, some tokens/providers the second one and some both. An overview: | Token | `providerKey` | `key` | --- | --- | --- | `AnonymousToken` | - | yes | `PreAuth...Token` | yes | - | `RememberMeToken` | yes | yes | `UsernamePasswordToken` | yes | - Both names are extremely general and their PHPdocs contains pure no-shit-sherlock-descriptions :squirrel: (like "The key."). This made me and @iltar think it's just an inconsistency and they have the same meaning. ...until we dived deeper into the code and came to the conclusion that `$key` has a Security task (while `$providerKey` doesn't really). If it takes people connected to Symfony internals 30+ minutes to find this out, it should be considered for an improvement imo. So here is our suggestion: **Rename `$key` to `$secret`**. This explains much better what the value of the string has to be (for instance, it's important that the string is not easily guessable and cannot be found out, according to the Spring docs). It also explains the usage better (it's used as a replacement for credentials and to hash the RememberMeToken). **Tl;dr**: `$key` and `$providerKey` are too general names, let's improve DX by renaming them. This PR tackles `$key` by renaming it to `$secret`. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - *My excuse for the completely unrelated branch name* Commits ------- 24e0eb6 [DX] [Security] Renamed Token#getKey() to getSecret()
| | * | | | [DX] [Security] Renamed Token#getKey() to getSecret()WouterJ2015-07-028-51/+77
| | | | | |
* | | | | | Merge branch '2.8'Nicolas Grekas2015-07-011-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (65 commits) [VarDumper] Fix tests for HHVM Update DateTimeToArrayTransformer.php Mock microtime() and time() in transient tests Azerbaijani language pluralization rule Move HHVM tests out of the allowed failures Fix merge [2.6] Towards 100% HHVM compat [Security/Http] Fix test [Stopwatch] Fix test Minor fixes [Validator] Added missing error codes and turned codes into UUIDs Towards 100% HHVM compat Warmup twig templates in non-standard paths (closes #12507) [Bridge/PhpUnit] Enforce a consistent locale Fix param order of assertEquals (expected, actual) in test for Finder\Glob Fix choice translation domain for expanded choice widget unify default AccessDeniedExeption message trigger event with right user (add test) [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser fixed CS ... Conflicts: UPGRADE-2.8.md src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/legacy-services9.dot src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services6.xml src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services9.xml src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services6.yml src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services9.yml src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php src/Symfony/Component/Form/ResolvedFormType.php src/Symfony/Component/Form/Tests/CompoundFormTest.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php src/Symfony/Component/VarDumper/Tests/CliDumperTest.php src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
| * | | | | Merge remote-tracking branch 'origin/2.7' into 2.8Abdellatif Ait boudad2015-07-011-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
| | * | | Merge branch '2.6' into 2.7Nicolas Grekas2015-07-011-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.6] Towards 100% HHVM compat [Security/Http] Fix test [Stopwatch] Fix test Minor fixes Towards 100% HHVM compat unify default AccessDeniedExeption message trigger event with right user (add test) [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser [Form] Fixed: Data mappers always receive forms indexed by their names Conflicts: src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Component/VarDumper/Tests/CliDumperTest.php src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
| | | * | unify default AccessDeniedExeption messageChristian Flothmann2015-06-291-1/+1
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-06-191-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [2.8] Silence newest deprecations [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer [VarDumper] Fix dump output for better readability [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php src/Symfony/Bundle/TwigBundle/Tests/Extension/LegacyAssetsExtensionTest.php src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php src/Symfony/Component/Console/Tests/ApplicationTest.php src/Symfony/Component/Console/Tests/Command/CommandTest.php src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php src/Symfony/Component/Console/Tests/Input/StringInputTest.php src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php src/Symfony/Component/DependencyInjection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php src/Symfony/Component/DependencyInjection/Tests/LegacyDefinitionTest.php src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php src/Symfony/Component/EventDispatcher/Tests/EventTest.php src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php src/Symfony/Component/HttpKernel/Tests/KernelTest.php src/Symfony/Component/Locale/Tests/LocaleTest.php src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php src/Symfony/Component/Routing/Tests/RouteTest.php src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php src/Symfony/Component/Templating/Tests/Helper/LegacyCoreAssetsHelperTest.php src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php src/Symfony/Component/Yaml/Tests/YamlTest.php
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-06-191-2/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer [VarDumper] Fix dump output for better readability [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy
| | * | | [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new ↵Nicolas Grekas2015-06-181-2/+0
| | | | | | | | | | | | | | | | | | | | policy
* | | | | Merge branch '2.8'Nicolas Grekas2015-06-1816-32/+600
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (42 commits) [DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader [Serializer] Fixed typo in comment [Form] Fixed: Filter non-integers when selecting entities by int ID [Form] [EventListener] fixed sending non array data on submit to ResizeListener Fix merge Fix merge Add test for HHVM FatalErrors [2.6][Debug] Fix fatal-errors handling on HHVM [Debug] Fix log level of stacked errors [Form] Deprecated "cascade_validation" [Form] Add "prototype_data" option to collection type [VarDumper] Fix uninitialized id in HtmlDumper [Form] Added the 'range' FormType Fixed fluent interface [Console] Fix tests on Windows [2.7] Fix unsilenced deprecation notices [2.3][Debug] Fix fatal-errors handling on HHVM [Debug] fix debug class loader case test on windows Standardize the name of the exception variables [Debug+VarDumper] Fix handling of PHP7 exception/error model ... Conflicts: CHANGELOG-2.7.md UPGRADE-2.7.md UPGRADE-2.8.md src/Symfony/Bridge/Twig/AppVariable.php src/Symfony/Component/Console/Helper/DialogHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php src/Symfony/Component/Form/AbstractType.php src/Symfony/Component/Form/AbstractTypeExtension.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php src/Symfony/Component/HttpKernel/Tests/Logger.php src/Symfony/Component/PropertyAccess/Exception/UnexpectedTypeException.php src/Symfony/Component/Routing/Route.php
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-06-1816-32/+600
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: (36 commits) [DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader [Serializer] Fixed typo in comment [Form] Fixed: Filter non-integers when selecting entities by int ID Fix merge Fix merge Add test for HHVM FatalErrors [2.6][Debug] Fix fatal-errors handling on HHVM [Debug] Fix log level of stacked errors [VarDumper] Fix uninitialized id in HtmlDumper Fixed fluent interface [Console] Fix tests on Windows [2.7] Fix unsilenced deprecation notices [2.3][Debug] Fix fatal-errors handling on HHVM [Debug] fix debug class loader case test on windows Standardize the name of the exception variables [Debug+VarDumper] Fix handling of PHP7 exception/error model Do not trigger deprecation error in ResolveParameterPlaceHoldersPass [2.3] Static Code Analysis for Components Added a small Upgrade note regarding security.context added missing deprecation in CHANGELOG ... Conflicts: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig src/Symfony/Component/HttpKernel/Kernel.php
| | * | | Merge branch '2.6' into 2.7Nicolas Grekas2015-06-183-17/+17
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Add test for HHVM FatalErrors [2.6][Debug] Fix fatal-errors handling on HHVM [2.3][Debug] Fix fatal-errors handling on HHVM Standardize the name of the exception variables [2.3] Static Code Analysis for Components Remove duplicated paths Conflicts: src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php src/Symfony/Component/Security/Http/Firewall/ContextListener.php src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
| | | * | Merge branch '2.3' into 2.6Nicolas Grekas2015-06-183-17/+17
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [2.3][Debug] Fix fatal-errors handling on HHVM Standardize the name of the exception variables [2.3] Static Code Analysis for Components Remove duplicated paths Conflicts: src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php src/Symfony/Component/Security/Acl/Dbal/AclProvider.php src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
| | | | * Standardize the name of the exception variablesJavier Eguiluz2015-06-153-17/+17
| | | | |
| | * | | Merge branch '2.6' into 2.7Nicolas Grekas2015-06-1813-15/+583
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [Debug] Fix log level of stacked errors [VarDumper] Fix uninitialized id in HtmlDumper Fixed fluent interface [Debug] fix debug class loader case test on windows [Debug+VarDumper] Fix handling of PHP7 exception/error model [2.6][Security][Translation] #14920 update translations [VarDumper] Cherry-pick code style fixes from 2.7 Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property Conflicts: src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php src/Symfony/Component/VarDumper/Caster/DOMCaster.php src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php src/Symfony/Component/VarDumper/Caster/PdoCaster.php src/Symfony/Component/VarDumper/Caster/SplCaster.php
| | | * | [2.6][Security][Translation] #14920 update translationsVincent AUBERT2015-06-1413-15/+583
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-06-112-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (36 commits) Fix test name fixed CS Allow new lines in Messages translated with transchoice() (replacement for #14867) [Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one [2.3] Fix tests on Windows [Yaml] remove partial deprecation annotation [HttpFoundation] Postpone setting the date header on a Response [Console] SymfonyStyle : Fix blocks wordwrapping [Console] SymfonyStyle : Fix blocks output is broken on windows cmd [toolbar] Merged colored icons in toolbar [Validator] remove partial deprecation annotation Updated UPGRADE-2.4.md added missing " Silence invasive deprecation warnings, opt-in for warnings [Form] Support DateTimeImmutable in transform() Show the FormType and FormTypeExtension in case of deprecated use of setDefaultOptions Removed route name from the debugbar. [FrameworkBundle] Document form.csrf_provider service deprecation [Form] add test to avoid regression of #14891 without this change allways the legacy code get called ... Conflicts: UPGRADE-2.4.md UPGRADE-2.7.md src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Monolog/Logger.php src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php src/Symfony/Bridge/Twig/AppVariable.php src/Symfony/Bridge/Twig/Extension/AssetExtension.php src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingAssetHelperPass.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/Debug/TimedTwigEngine.php src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php src/Symfony/Bundle/TwigBundle/TwigDefaultEscapingStrategy.php src/Symfony/Bundle/TwigBundle/TwigEngine.php src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php src/Symfony/Component/ClassLoader/DebugClassLoader.php src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Helper/DialogHelper.php src/Symfony/Component/Console/Helper/HelperSet.php src/Symfony/Component/Console/Helper/ProgressBar.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/Console/Input/StringInput.php src/Symfony/Component/Debug/DebugClassLoader.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Debug/Exception/DummyException.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php src/Symfony/Component/DependencyInjection/SimpleXMLElement.php src/Symfony/Component/EventDispatcher/Event.php src/Symfony/Component/Filesystem/Filesystem.php src/Symfony/Component/Form/Deprecated/FormEvents.php src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php src/Symfony/Component/Form/ResolvedFormType.php src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php src/Symfony/Component/HttpKernel/EventListener/EsiListener.php src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php src/Symfony/Component/HttpKernel/EventListener/RouterListener.php src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php src/Symfony/Component/HttpKernel/Exception/FlattenException.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/HttpKernel/HttpCache/Esi.php src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Log/NullLogger.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Locale/Exception/MethodArgumentNotImplementedException.php src/Symfony/Component/Locale/Exception/MethodArgumentValueNotImplementedException.php src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php src/Symfony/Component/Locale/Exception/NotImplementedException.php src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/Stub/DateFormat/AmPmTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/DayOfWeekTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/DayOfYearTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/DayTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/Hour1200Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/Hour1201Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/Hour2400Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/Hour2401Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/HourTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/MinuteTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/QuarterTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/SecondTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/YearTransformer.php src/Symfony/Component/Locale/Stub/StubCollator.php src/Symfony/Component/Locale/Stub/StubIntl.php src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php src/Symfony/Component/Locale/Stub/StubLocale.php src/Symfony/Component/Locale/Stub/StubNumberFormatter.php src/Symfony/Component/OptionsResolver/OptionsResolver.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Process/ProcessUtils.php src/Symfony/Component/PropertyAccess/PropertyAccess.php src/Symfony/Component/Routing/Annotation/Route.php src/Symfony/Component/Routing/Loader/XmlFileLoader.php src/Symfony/Component/Routing/Loader/YamlFileLoader.php src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php src/Symfony/Component/Routing/Route.php src/Symfony/Component/Serializer/Encoder/JsonDecode.php src/Symfony/Component/Serializer/Encoder/JsonEncode.php src/Symfony/Component/Serializer/Encoder/JsonEncoder.php src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php src/Symfony/Component/Templating/Asset/Package.php src/Symfony/Component/Templating/Asset/PackageInterface.php src/Symfony/Component/Templating/Asset/PathPackage.php src/Symfony/Component/Templating/Asset/UrlPackage.php src/Symfony/Component/Templating/Helper/AssetsHelper.php src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php src/Symfony/Component/Templating/Loader/Loader.php src/Symfony/Component/Translation/Translator.php src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php src/Symfony/Component/VarDumper/Cloner/Data.php src/Symfony/Component/Yaml/Yaml.php
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-06-112-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Fix test name fixed CS Allow new lines in Messages translated with transchoice() (replacement for #14867) [Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one [2.3] Fix tests on Windows [Yaml] remove partial deprecation annotation Silence invasive deprecation warnings, opt-in for warnings Documenting how to keep option value BC - see #14377 Conflicts: src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Twig/composer.json
| | * | | Silence invasive deprecation warnings, opt-in for warningsv2.7.1reecefowell2015-06-082-2/+2
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-06-042-13/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: (100 commits) [DependencyInjection] provide better error message when using deprecated configuration options [console][TableCell] get cell width without decoration. Improve the config validation in TwigBundle [VarDumper] Changed tooltip to expand-all keybinding in OS X [Bridge\PhpUnit] Fix composer installed phpunit detection [VarDumper] Fix generic casters calling order [2.7][SecurityBundle] Remove SecurityContext from Compile [WebProfilerBundle][logger] added missing deprecation message. Fix profiler CSS [Security][Acl] enforce string identifiers [FrameworkBundle] make `templating.helper.router` service available again for BC reasons [BrowserKit] Fix bug when uri starts with http. bumped Symfony version to 2.7.1 updated VERSION for 2.7.0 updated CHANGELOG for 2.7.0 bumped Symfony version to 2.6.10 updated VERSION for 2.6.9 updated CHANGELOG for 2.6.9 fixed tests bumped Symfony version to 2.3.31 ... Conflicts: CHANGELOG-2.3.md CHANGELOG-2.6.md CHANGELOG-2.7.md UPGRADE-2.7.md UPGRADE-3.0.md src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php src/Symfony/Bridge/Twig/Extension/AssetExtension.php src/Symfony/Bridge/Twig/Tests/Extension/AssetExtensionTest.php src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services6.xml src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services6.yml src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php src/Symfony/Component/Form/CHANGELOG.md src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php src/Symfony/Component/Routing/Loader/XmlFileLoader.php src/Symfony/Component/Routing/Loader/YamlFileLoader.php