Permalink
Commits on Nov 30, 2015
  1. Merge branch '2.8'

    * 2.8:
      add subject variable to expression context
      [Process] Fix signaling/stopping logic on Windows
      Forward compatibility with AbstractLayout* 2.8 tests
      [Yaml] minor CS cleaning
      [Console] do not encode backslashes in console default description
    fabpot committed Nov 30, 2015
  2. Merge branch '2.7' into 2.8

    * 2.7:
      [Process] Fix signaling/stopping logic on Windows
      Forward compatibility with AbstractLayout* 2.8 tests
      [Yaml] minor CS cleaning
      [Console] do not encode backslashes in console default description
    fabpot committed Nov 30, 2015
  3. Merge branch '2.3' into 2.7

    * 2.3:
      [Process] Fix signaling/stopping logic on Windows
      [Yaml] minor CS cleaning
      [Console] do not encode backslashes in console default description
    fabpot committed Nov 30, 2015
  4. feature #16754 [Security] allow arbitrary types in VoterInterface::vo…

    …te() (xabbuh)
    
    This PR was merged into the 3.0-dev branch.
    
    Discussion
    ----------
    
    [Security] allow arbitrary types in VoterInterface::vote()
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | yes
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #16600
    | License       | MIT
    | Doc PR        | TODO
    
    Commits
    -------
    
    9054bdf allow arbitrary types in VoterInterface::vote()
    fabpot committed Nov 30, 2015
  5. bug #16753 [Process] Fix signaling/stopping logic on Windows (nicolas…

    …-grekas)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Process] Fix signaling/stopping logic on Windows
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    9afbea2 [Process] Fix signaling/stopping logic on Windows
    fabpot committed Nov 30, 2015
  6. feature #16755 [Security] add subject variable to expression context …

    …(xabbuh)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [Security] add subject variable to expression context
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | yes
    | Tests pass?   | yes
    | Fixed tickets | #16600
    | License       | MIT
    | Doc PR        | TODO
    
    Commits
    -------
    
    346943e add subject variable to expression context
    fabpot committed Nov 30, 2015
  7. Merge branch '2.8'

    * 2.8:
      [Yaml] look for colon in parsed inline string
      [DI][autowiring] throw exception when many services use the same class.
    fabpot committed Nov 30, 2015
  8. bug #16642 [DI][autowiring] throw exception when many services use th…

    …e same class. (aitboudad)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [DI][autowiring] throw exception when many services use the same class.
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Fixed tickets  | #16639
    | Tests pass?   | yes
    | License       | MIT
    
    Commits
    -------
    
    a21a016 [DI][autowiring] throw exception when many services use the same class.
    fabpot committed Nov 30, 2015
Commits on Nov 29, 2015
  1. minor #16749 [Form] Added getBlockPrefix() to ResolvedFormTypeInterfa…

    …ce (webmozart)
    
    This PR was merged into the 3.0-dev branch.
    
    Discussion
    ----------
    
    [Form] Added getBlockPrefix() to ResolvedFormTypeInterface
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    This is the follow-up PR to #16724.
    
    If you call `$form->getConfig()->getType()`, all the methods of FormType should be usable. In that sense, ResolvedFormType is the developer-facing version of FormType.
    
    It is true that the same could be achieved with `getInnerType()`, but that method should be used in edge cases only as it clutters the code and makes it confusing to read:
    
    ```php
    $blockPrefix = $form->getConfig()->getType()->getInnerType()->getBlockPrefix();
    ```
    
    Commits
    -------
    
    7e89345 [Form] Added getBlockPrefix() to ResolvedFormTypeInterface
    Tobion committed Nov 29, 2015
  2. bug #16745 [Yaml] look for colon in parsed inline string (xabbuh)

    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [Yaml] look for colon in parsed inline string
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #16562
    | License       | MIT
    | Doc PR        |
    
    Looking for a colon in an unquoted mapping value can lead to falsely
    reported parse errors (e.g. when a comment after the mapping value
    contains a colon).
    
    Commits
    -------
    
    2127058 [Yaml] look for colon in parsed inline string
    fabpot committed Nov 29, 2015
  3. [Yaml] look for colon in parsed inline string

    Looking for a colon in an unquoted mapping value can lead to falsely
    reported parse errors (e.g. when a comment after the mapping value
    contains a colon).
    xabbuh committed Nov 29, 2015
  4. minor #16744 Forward compatibility with AbstractLayout* 2.8 tests (ni…

    …colas-grekas)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    Forward compatibility with AbstractLayout* 2.8 tests
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Related to #16031
    
    Commits
    -------
    
    ef61e54 Forward compatibility with AbstractLayout* 2.8 tests
    nicolas-grekas committed Nov 29, 2015
  5. Merge branch '2.8'

    * 2.8:
      [Bridge/Doctrine+Ldap] Fix tests
      Marked the Ldap component as internal and removed Ldap constants polyfill
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
    nicolas-grekas committed Nov 29, 2015
  6. minor #16743 [Bridge/Doctrine+Ldap] Fix tests (nicolas-grekas)

    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [Bridge/Doctrine+Ldap] Fix tests
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Using "choice_list" is deprecated and thus can't work with 3.0 deps loaded. Test upgrades backported from #16725
    @csarrazi : the Ldap tests now require the ldap extension. Annotations added.
    
    Commits
    -------
    
    4819a70 [Bridge/Doctrine+Ldap] Fix tests
    nicolas-grekas committed Nov 29, 2015
  7. minor #16737 [Yaml] minor CS cleaning (mhujer)

    This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16737).
    
    Discussion
    ----------
    
    [Yaml] minor CS cleaning
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    PHPStorm reported different types of coding style suggestions along the Symfony codebase. I've fixed some of them in the Yaml compontent and I have two questions:
    1) What is the correct branch for such changes? Not all of them can be fixed in 2.3/2.8, for example `ParserTest`'s docblock is different there.
    2) Should I create similar PRs for other components or is there a plan to do all such fixes at once someday in the future (e.g. after 2.8/3.0 is released)?
    
    Commits
    -------
    
    613804d [Yaml] minor CS cleaning
    fabpot committed Nov 29, 2015
  8. [Yaml] minor CS cleaning

    mhujer committed with fabpot Nov 29, 2015
  9. bug #16733 [Console] do not encode backslashes in console default des…

    …cription (Tobion)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Console] do not encode backslashes in console default description
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #16420
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    873a541 [Console] do not encode backslashes in console default description
    fabpot committed Nov 29, 2015
  10. feature #16735 [WIP] [Ldap] Marked the Ldap component as internal (cs…

    …arrazi)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [WIP] [Ldap] Marked the Ldap component as internal
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | yes
    | Deprecations? | no
    | Tests pass?   | no
    | Fixed tickets | no
    | License       | MIT
    | Doc PR        | not yet
    
    As mentioned earlier, the LDAP component suffers from a few problems, addressed in PR #15994
    However, as raised by @Tobion, the component does not yet have tests (they can be added at a later time, though), and is not considered stable yet.
    
    Commits
    -------
    
    3f89b2c Marked the Ldap component as internal and removed Ldap constants polyfill
    fabpot committed Nov 29, 2015
  11. Merge branch '2.8'

    * 2.8:
      [Bridge/Twig] Fix lowest form dep
      [Bridge/Doctrine] Fix legacy tests
      Make sure security.role_hierarchy.roles always exists
      [Form] Fix tests and reference usage
      [SecurityBundle] Fix disabling of RoleHierarchyVoter when passing empty hierarchy
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListCompositeIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleAssociationToIntIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleIntIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleStringIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListCompositeIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleAssociationToIntIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleIntIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleStringIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListCompositeIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListCompositeIdWithQueryBuilderTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleAssociationToIntIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleAssociationToIntIdWithQueryBuilderTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdWithQueryBuilderTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleStringIdTest.php
    	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleStringIdWithQueryBuilderTest.php
    	src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
    	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
    nicolas-grekas committed Nov 29, 2015
  12. minor #16739 [Bridge/Doctrine] Fix legacy tests (nicolas-grekas)

    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [Bridge/Doctrine] Fix legacy tests
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | no fatal error anymore
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    7d92372 [Bridge/Doctrine] Fix legacy tests
    nicolas-grekas committed Nov 29, 2015
  13. Merge branch '2.7' into 2.8

    * 2.7:
      [Bridge/Twig] Fix lowest form dep
      [Form] Fix tests and reference usage
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    nicolas-grekas committed Nov 29, 2015
  14. minor #16729 [Form] Fix tests and reference usage (nicolas-grekas)

    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [Form] Fix tests and reference usage
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    6001644 [Form] Fix tests and reference usage
    nicolas-grekas committed Nov 29, 2015
  15. bug #16734 Make sure security.role_hierarchy.roles always exists (Wou…

    …terJ)
    
    This PR was squashed before being merged into the 2.8 branch (closes #16734).
    
    Discussion
    ----------
    
    Make sure security.role_hierarchy.roles always exists
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #16731
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    b272ab5 Make sure security.role_hierarchy.roles always exists
    fabpot committed Nov 29, 2015
Commits on Nov 28, 2015