Skip to content
Commits on Jul 1, 2016
  1. @fabpot

    feature #18510 Added a SecurityUserValueResolver for controllers (iltar)

    This PR was merged into the 3.2-dev branch.
    
    Discussion
    ----------
    
    Added a SecurityUserValueResolver for controllers
    
    | Q             | A
    | ------------- | ---
    | Branch?       | master
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | yes
    | Tests pass?   | yes
    | Fixed tickets | ~
    | License       | MIT
    | Doc PR        | ~
    
    This PR uses the new `ArgumentResolver` to inject a security user when the signature implies so. This is based on the [docs code example](symfony/symfony-docs#6438 (comment)) and [existing pr on the SFEB](sensiolabs/SensioFrameworkExtraBundle#327).
    
    With the new example you can do the following:
    ```php
    // when a User is mandatory, e.g. behind firewall
    public function fooAction(UserInterface $user)
    
    // when a User is optional, e.g. where it can be anonymous
    public function barAction(UserInterface $user = null)
    ```
    This deprecates the `Controller::getUser()` method.
    
    I have added it on a priority of 40 so it falls just under the `RequestValueResolver`. This is because it's already used and the initial performance is less of an impact.
    
    There was a comment asking if the `controller_argument.value_resolver` tag name wasn't too long. If decided this tag should change before 3.1 is released, I will update it in here.
    
    *`RequestValueResolver` contains a small codestyle consistency fix.*
    
    Commits
    -------
    
    d341889 Added a SecurityUserValueResolver for controllers
    fabpot committed Jul 1, 2016
  2. @fabpot

    feature #19203 [Bridge/Doctrine] Reset the EM lazy-proxy instead of t…

    …he EM service (nicolas-grekas)
    
    This PR was merged into the 3.2-dev branch.
    
    Discussion
    ----------
    
    [Bridge/Doctrine] Reset the EM lazy-proxy instead of the EM service
    
    | Q             | A
    | ------------- | ---
    | Branch?       | master
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | yes
    | Tests pass?   | no
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    This makes the entity manager resettable by resetting its proxy, which should be more robust than resetting its service.
    See first comments in #19192
    Ping @stof
    
    Commits
    -------
    
    c581cd4 [Bridge/Doctrine] Reset the EM lazy-proxy instead of the EM service
    fabpot committed Jul 1, 2016
  3. @nicolas-grekas
  4. @iltar
  5. @fabpot

    feature #19236 [FrameworkBundle] Deprecate the service serializer.map…

    …ping.cache.doctrine.apc (Ener-Getick)
    
    This PR was merged into the 3.2-dev branch.
    
    Discussion
    ----------
    
    [FrameworkBundle] Deprecate the service serializer.mapping.cache.doctrine.apc
    
    | Q             | A
    | ------------- | ---
    | Branch?       | master
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | yes
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        |
    
    This PR deprecates the service `serializer.mapping.cache.doctrine.apc` introduced in 3.1 as the cache component is now the recommended way.
    This PR contains #19235.
    
    Commits
    -------
    
    2a0c19c [FrameworkBundle] Deprecate the service serializer.mapping.cache.doctrine.apc
    fabpot committed Jul 1, 2016
Commits on Jun 30, 2016
  1. @Ener-Getick
  2. @nicolas-grekas

    Merge branch '3.1'

    * 3.1:
      [FrameworkBundle] Update the UPGRADING files Advise to not use the service `serializer.mapping.cache.apc` anymore
      [travis] fix
    nicolas-grekas committed Jun 30, 2016
  3. @nicolas-grekas

    Merge branch '3.0' into 3.1

    * 3.0:
      [travis] fix
    nicolas-grekas committed Jun 30, 2016
  4. @nicolas-grekas

    Merge branch '2.8' into 3.0

    * 2.8:
      [travis] fix
    
    Conflicts:
    	.github/travis.php
    nicolas-grekas committed Jun 30, 2016
  5. @nicolas-grekas

    Merge branch '2.7' into 2.8

    * 2.7:
      [travis] fix
    nicolas-grekas committed Jun 30, 2016
  6. @nicolas-grekas

    minor #19244 [travis] fix (nicolas-grekas)

    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [travis] fix
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    8712d54 [travis] fix
    nicolas-grekas committed Jun 30, 2016
  7. @fabpot

    minor #19235 [FrameworkBundle] Advise to not use the serializer servi…

    …ces related to the cache (Ener-Getick)
    
    This PR was merged into the 3.1 branch.
    
    Discussion
    ----------
    
    [FrameworkBundle] Advise to not use the serializer services related to the cache
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.1
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        |
    
    Advise to not use the serializer services related to the cache.
    
    Commits
    -------
    
    16358d4 [FrameworkBundle] Update the UPGRADING files Advise to not use the service `serializer.mapping.cache.apc` anymore
    fabpot committed Jun 30, 2016
  8. @Ener-Getick

    [FrameworkBundle] Update the UPGRADING files

    Advise to not use the service `serializer.mapping.cache.apc` anymore
    Ener-Getick committed Jun 29, 2016
  9. @fabpot

    Merge branch '3.1'

    * 3.1:
      Fixed BC Layer in DoctrineChoiceLoader
      [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
      [HttpKernel] Move conflicting origin IPs handling to catch block
      [travis] Fix deps=low/high patching
      Fixed some issues of the AccessDecisionManager profiler
      [DoctrineBridge] fixed default parameter value in UniqueEntityValidator
    fabpot committed Jun 30, 2016
  10. @fabpot

    Merge branch '3.0' into 3.1

    * 3.0:
      [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
      [HttpKernel] Move conflicting origin IPs handling to catch block
      [travis] Fix deps=low/high patching
    fabpot committed Jun 30, 2016
  11. @fabpot

    Merge branch '2.8' into 3.0

    * 2.8:
      [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
      [HttpKernel] Move conflicting origin IPs handling to catch block
      [travis] Fix deps=low/high patching
    fabpot committed Jun 30, 2016
  12. @fabpot

    Merge branch '2.7' into 2.8

    * 2.7:
      [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
      [HttpKernel] Move conflicting origin IPs handling to catch block
      [travis] Fix deps=low/high patching
    fabpot committed Jun 30, 2016
  13. @fabpot

    minor #19233 [HttpKernel] Move handling of conflicting origin IPs to …

    …catch block (magnusnordlander, nicolas-grekas)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [HttpKernel] Move handling of conflicting origin IPs to catch block
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #19217
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    db84101 [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
    1f00b55 [HttpKernel] Move conflicting origin IPs handling to catch block
    fabpot committed Jun 30, 2016
  14. @nicolas-grekas

    [travis] fix

    nicolas-grekas committed Jun 30, 2016
  15. @fabpot

    fixed CS

    fabpot committed Jun 30, 2016
  16. @fabpot

    minor #19169 Add test for Definition with exeption InvalidArgument (I…

    …vanMenshykov)
    
    This PR was squashed before being merged into the 3.2-dev branch (closes #19169).
    
    Discussion
    ----------
    
    Add test for Definition with exeption InvalidArgument
    
    Add test for Definition with exeption InvalidArgument
    
    | Q             | A
    | ------------- | ---
    | Branch?       | "master" for new features / 2.7, 2.8, 3.0 or 3.1 for fixes
    | Bug fix?      | no
    | New feature?  | no
    | Deprecations? | no
    | Tests pass?   | yes
    | License       | MIT
    
    Commits
    -------
    
    91072e6 Add test for Definition with exeption InvalidArgument
    fabpot committed Jun 30, 2016
  17. @IvanMenshykov @fabpot
  18. @fabpot

    feature #19174 [FrameworkBundle] Show server:run logs by default (nic…

    …olas-grekas)
    
    This PR was merged into the 3.2-dev branch.
    
    Discussion
    ----------
    
    [FrameworkBundle] Show server:run logs by default
    
    | Q             | A
    | ------------- | ---
    | Branch?       | master
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    I propose to change the default for the `server:run` command and show `php -S` logs by default.
    I really miss them otherwise. The `-vvv` mode is not suited here, because it adds a useless ` ERR ` red prefix.
    I do this through a tty when available, so that the output remains colored.
    
    Ping @javiereguiluz @weaverryan since this is mostly a DX issue.
    
    Commits
    -------
    
    7cc6161 [FrameworkBundle] Show server:run logs by default
    fabpot committed Jun 30, 2016
  19. @fabpot

    bug #19227 [DoctrineBridge] fixed default parameter value in UniqueEn…

    …tityValidator (HeahDude)
    
    This PR was merged into the 3.1 branch.
    
    Discussion
    ----------
    
    [DoctrineBridge] fixed default parameter value in UniqueEntityValidator
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.1
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #19209
    | License       | MIT
    | Doc PR        | ~
    
    Commits
    -------
    
    40c0c52 [DoctrineBridge] fixed default parameter value in UniqueEntityValidator
    fabpot committed Jun 30, 2016
  20. @Rootie @fabpot

    Fixed BC Layer in DoctrineChoiceLoader

    in the case when the BC Layer is used $idReader is not set to the right value.
    Rootie committed with fabpot Jun 30, 2016
  21. @fabpot

    bug #19241 Fixed BC Layer in DoctrineChoiceLoader (Rootie)

    This PR was merged into the 3.2-dev branch.
    
    Discussion
    ----------
    
    Fixed BC Layer in DoctrineChoiceLoader
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.1
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        |
    
    in the case when the BC Layer is used $idReader is not set to the right value.
    
    Commits
    -------
    
    c44d71c Fixed BC Layer in DoctrineChoiceLoader
    fabpot committed Jun 30, 2016
  22. @Rootie

    Fixed BC Layer in DoctrineChoiceLoader

    in the case when the BC Layer is used $idReader is not set to the right value.
    Rootie committed on GitHub Jun 30, 2016
  23. @magnusnordlander @nicolas-grekas
  24. @nicolas-grekas
  25. @nicolas-grekas

    minor #19240 [travis] Fix deps=low/high patching (nicolas-grekas)

    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [travis] Fix deps=low/high patching
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Deps=low/high are broken since we added depth=1 to the git checkout on travis...
    This fixes the situation and ensures it won't happen again by adding a missing error check.
    
    Commits
    -------
    
    5ec92e8 [travis] Fix deps=low/high patching
    nicolas-grekas committed Jun 30, 2016
  26. @nicolas-grekas
Commits on Jun 29, 2016
  1. @nicolas-grekas

    minor #19234 [Console] fix input stream related tests (xabbuh)

    This PR was merged into the 3.2-dev branch.
    
    Discussion
    ----------
    
    [Console] fix input stream related tests
    
    | Q             | A
    | ------------- | ---
    | Branch?       | master
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    1cca740 [Console] fix input stream related tests
    nicolas-grekas committed Jun 29, 2016
  2. @xabbuh
  3. @nicolas-grekas

    minor #19230 Fix merge issues (nicolas-grekas)

    This PR was merged into the 3.2-dev branch.
    
    Discussion
    ----------
    
    Fix merge issues
    
    | Q             | A
    | ------------- | ---
    | Branch?       | master
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    7701fea Fix merge issues
    nicolas-grekas committed Jun 29, 2016
  4. @nicolas-grekas

    Fix merge issues

    nicolas-grekas committed Jun 29, 2016
Something went wrong with that request. Please try again.