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
  5. bug #18934 Fixed some issues of the AccessDecisionManager profiler (j…

    …aviereguiluz)
    
    This PR was squashed before being merged into the 3.1 branch (closes #18934).
    
    Discussion
    ----------
    
    Fixed some issues of the AccessDecisionManager profiler
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.1
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #19022 symfony/symfony-standard#968 schmittjoh/JMSSecurityExtraBundle#207
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    082f1b5 Fixed some issues of the AccessDecisionManager profiler
    committed Jun 29, 2016
  6. @javiereguiluz
  7. @HeahDude
  8. @nicolas-grekas

    Merge branch '3.1'

    * 3.1:
      [Form] fixed ChoiceTypeTest after #17822
      [DoctrineBridge] fixed DoctrineChoiceLoaderTest by removing deprecated factory
      [ci] Upgrade phpunit wrapper deps
      [FrameworkBundle] Fix fixtures
      [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
      fixed HttpKernel dependencies after #18688
    nicolas-grekas committed Jun 29, 2016
  9. @nicolas-grekas

    Merge branch '3.0' into 3.1

    * 3.0:
      [Form] fixed ChoiceTypeTest after #17822
    nicolas-grekas committed Jun 29, 2016
  10. @nicolas-grekas

    minor #19226 [Form] fixed ChoiceTypeTest after #17822 (HeahDude)

    This PR was merged into the 3.0 branch.
    
    Discussion
    ----------
    
    [Form] fixed ChoiceTypeTest after #17822
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.0
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | ~
    | License       | MIT
    | Doc PR        | ~
    
    Commits
    -------
    
    777c193 [Form] fixed ChoiceTypeTest after #17822
    nicolas-grekas committed Jun 29, 2016
  11. @HeahDude
  12. @nicolas-grekas

    minor #19222 [DoctrineBridge] fixed DoctrineChoiceLoaderTest by remov…

    …ing deprecated factory (HeahDude)
    
    This PR was merged into the 3.1 branch.
    
    Discussion
    ----------
    
    [DoctrineBridge] fixed DoctrineChoiceLoaderTest by removing deprecated factory
    
    | 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        | ~
    
    Commits
    -------
    
    3f86eae [DoctrineBridge] fixed DoctrineChoiceLoaderTest by removing deprecated factory
    nicolas-grekas committed Jun 29, 2016
  13. @HeahDude
  14. @nicolas-grekas

    Merge branch '3.0' into 3.1

    * 3.0:
      [ci] Upgrade phpunit wrapper deps
    nicolas-grekas committed Jun 29, 2016
  15. @nicolas-grekas

    Merge branch '2.8' into 3.0

    * 2.8:
      [ci] Upgrade phpunit wrapper deps
    nicolas-grekas committed Jun 29, 2016
  16. @nicolas-grekas

    Merge branch '2.7' into 2.8

    * 2.7:
      [ci] Upgrade phpunit wrapper deps
    nicolas-grekas committed Jun 29, 2016
  17. @nicolas-grekas

    minor #19225 [ci] Upgrade phpunit wrapper deps (nicolas-grekas)

    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [ci] Upgrade phpunit wrapper deps
    
    | 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        | -
    
    To get sebastianbergmann/exporter#14 in.
    
    Commits
    -------
    
    9f916a8 [ci] Upgrade phpunit wrapper deps
    nicolas-grekas committed Jun 29, 2016
  18. @nicolas-grekas
  19. @nicolas-grekas

    Merge branch '3.0' into 3.1

    * 3.0:
      [FrameworkBundle] Fix fixtures
      [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
      fixed HttpKernel dependencies after #18688
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/HttpKernel.php
    	src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
    nicolas-grekas committed Jun 29, 2016
  20. @nicolas-grekas

    Merge branch '2.8' into 3.0

    * 2.8:
      [FrameworkBundle] Fix fixtures
      [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
      fixed HttpKernel dependencies after #18688
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/HttpKernel/composer.json
    nicolas-grekas committed Jun 29, 2016
  21. @nicolas-grekas

    minor #19223 [FrameworkBundle] Fix fixtures (nicolas-grekas)

    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [FrameworkBundle] Fix fixtures
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.8
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #19173 #19223
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    d175477 [FrameworkBundle] Fix fixtures
    nicolas-grekas committed Jun 29, 2016
  22. @nicolas-grekas
  23. @nicolas-grekas

    Merge branch '2.7' into 2.8

    * 2.7:
      [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
      fixed HttpKernel dependencies after #18688
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/composer.json
    nicolas-grekas committed Jun 29, 2016
  24. @nicolas-grekas

    bug #19217 [HttpKernel] Inline ValidateRequestListener logic into Htt…

    …pKernel (nicolas-grekas)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #18688 #19216
    | License       | MIT
    | Doc PR        | -
    
    I propose to inline the listener introduced in #18688 into HttpKernel.
    
    Commits
    -------
    
    9d3ae85 [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
    nicolas-grekas committed Jun 29, 2016
  25. @nicolas-grekas
  26. minor #19216 fixed HttpKernel dependencies after #18688 (HeahDude)

    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    fixed HttpKernel dependencies after #18688
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | ~
    | License       | MIT
    | Doc PR        | ~
    
    Commits
    -------
    
    f809f3e fixed HttpKernel dependencies after #18688
    committed Jun 29, 2016
  27. @HeahDude
  28. Merge branch '3.1'

    * 3.1:
      [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
      fixed test
      [Console] Decouple SymfonyStyle from TableCell
    committed Jun 29, 2016
  29. Merge branch '3.0' into 3.1

    * 3.0:
      [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
      fixed test
      [Console] Decouple SymfonyStyle from TableCell
    committed Jun 29, 2016
  30. Merge branch '2.8' into 3.0

    * 2.8:
      [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
      fixed test
      [Console] Decouple SymfonyStyle from TableCell
    committed Jun 29, 2016
  31. Merge branch '2.7' into 2.8

    * 2.7:
      [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
      [Console] Decouple SymfonyStyle from TableCell
    committed Jun 29, 2016
  32. bug #18688 [HttpFoundation] Warning when request has both Forwarded a…

    …nd X-Forwarded-For (magnusnordlander)
    
    This PR was squashed before being merged into the 2.7 branch (closes #18688).
    
    Discussion
    ----------
    
    [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        | symfony/symfony-docs#6526
    
    Emit a warning when a request has both a trusted Forwarded header and a trusted X-Forwarded-For header, as this is most likely a misconfiguration which causes security issues.
    
    Commits
    -------
    
    ee8842f [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
    committed Jun 29, 2016
  33. @magnusnordlander
  34. minor #19215 fixed test (fabpot)

    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    fixed test
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.8
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    bac531c fixed test
    committed Jun 29, 2016
  35. fixed test

    committed Jun 29, 2016