Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 26, 2015
  1. @fabpot

    Merge branch '2.8'

    fabpot authored
    * 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 symfony/symfony@b5990be#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
  2. @fabpot

    Merge branch '2.7' into 2.8

    fabpot authored
    * 2.7:
      [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.
      [Security] removed useless else condition in SwitchUserListener class.
      [travis] Tests deps=low with PHP 5.6
      [Console] Fix console output with closed stdout
  3. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [Yaml] throw a ParseException on invalid data type
      #15331 add infos about deprecated classes to UPGRADE-3.0
      [Security] removed useless else condition in SwitchUserListener class.
      [travis] Tests deps=low with PHP 5.6
      [Console] Fix console output with closed stdout
  4. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      #15331 add infos about deprecated classes to UPGRADE-3.0
      [Security] removed useless else condition in SwitchUserListener class.
      [travis] Tests deps=low with PHP 5.6
      [Console] Fix console output with closed stdout
Commits on Jul 24, 2015
  1. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      [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 symfony/symfony@b5990be#commitcomment-12301266
    
    Conflicts:
    	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
    	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
    	src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
  2. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [2.6] Static Code Analysis for Components
      [Security/Http] Fix test relying on a private property
Commits on Jul 22, 2015
  1. @nicolas-grekas
  2. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 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
  3. @fabpot

    feature #15131 [Security] Moved Simple{Form,Pre}AuthenticatorInterfac…

    fabpot authored
    …es to 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 symfony/symfony@6f57b7b
    
    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
  4. @WouterJ @fabpot
  5. @hhamon
  6. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 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
  7. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 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
  8. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 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
  9. @xabbuh
Commits on Jul 9, 2015
  1. @fabpot

    Merge branch '2.8'

    fabpot authored
    * 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
  2. @fabpot

    Merge branch '2.7' into 2.8

    fabpot authored
    * 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
  3. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 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
Commits on Jul 8, 2015
  1. @kalessil @fabpot

    [2.6] Static Code Analysis for Components and Bundles

    kalessil authored fabpot committed
Commits on Jul 2, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 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
Commits on Jul 1, 2015
  1. @fabpot

    feature #15141 [DX] [Security] Renamed Token#getKey() to getSecret() …

    fabpot authored
    …(WouterJ)
    
    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()
  2. @WouterJ @fabpot

    [DX] [Security] Renamed Token#getKey() to getSecret()

    WouterJ authored fabpot committed
  3. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 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
  4. @aitboudad

    Merge remote-tracking branch 'origin/2.7' into 2.8

    aitboudad authored
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
  5. @nicolas-grekas

    Fix merge

    nicolas-grekas authored
  6. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 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
Commits on Jun 30, 2015
  1. @nicolas-grekas
  2. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Minor fixes
      Towards 100% HHVM compat
      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/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Filesystem/Filesystem.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
Commits on Jun 29, 2015
  1. @xabbuh
Commits on Jun 28, 2015
  1. @xabbuh
  2. @Rvanlaak @xabbuh

    [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser

    Rvanlaak authored xabbuh committed
    The `SwitchUserEvent` is triggered in case an account is switched. This works okay while switching to the user, but on exit the `SwitchUserEvent` is triggered again with the original User. That User was not initialized by the provider yet.
    
    load user by UserInterface instead of username
  3. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Fix quoting style consistency.
      [DependencyInjection] Fail when dumping a Definition with no class nor factory
      Normalizing recursively - see #9096
      No change - the normalizeParams is a copy-and-paste of the earlier logic
      fixes issue with logging array of non-utf8 data
      fix validation for Maestro UK card numbers
  4. @ogizanagi
Commits on Jun 19, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 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
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 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
Something went wrong with that request. Please try again.