Permalink
Commits on Feb 24, 2017
  1. Merge branch '2.8' into 3.2

    * 2.8:
      Revamped the README file
      Fix missing namespace in AddConstraintValidatorPassTest
      [ExpressionLanguage] Registering functions after calling evaluate(), compile() or parse() is not supported
    fabpot committed Feb 24, 2017
  2. Merge branch '2.7' into 2.8

    * 2.7:
      Revamped the README file
      Fix missing namespace in AddConstraintValidatorPassTest
      [ExpressionLanguage] Registering functions after calling evaluate(), compile() or parse() is not supported
    fabpot committed Feb 24, 2017
  3. minor #21744 Revamped the README file (javiereguiluz)

    This PR was squashed before being merged into the 2.7 branch (closes #21744).
    
    Discussion
    ----------
    
    Revamped the README file
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #21235
    | License       | MIT
    | Doc PR        |
    
    Here is a before/after comparison image:
    
    ![before-after-readme](https://cloud.githubusercontent.com/assets/73419/23294444/cb001e9a-fa6b-11e6-88f2-a8449470fb4e.png)
    
    Commits
    -------
    
    c7d30ca Revamped the README file
    fabpot committed Feb 24, 2017
  4. Revamped the README file

    javiereguiluz committed with fabpot Feb 23, 2017
Commits on Feb 23, 2017
  1. minor #21740 Fix missing namespace in test (chalasr)

    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    Fix missing namespace in test
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Tests pass?   | yes
    
    Commits
    -------
    
    1e9ca7b Fix missing namespace in AddConstraintValidatorPassTest
    nicolas-grekas committed Feb 23, 2017
  2. Fix missing namespace in AddConstraintValidatorPassTest

    chalasr committed Feb 23, 2017
  3. minor #21709 [SecurityBundle] simplified code (fabpot)

    This PR was merged into the 3.2 branch.
    
    Discussion
    ----------
    
    [SecurityBundle] simplified code
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.2
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Simplified code for 3.2 (followup to #21679)
    
    Commits
    -------
    
    512742b [SecurityBundle] simplified code
    fabpot committed Feb 23, 2017
  4. [SecurityBundle] simplified code

    fabpot committed Feb 22, 2017
Commits on Feb 22, 2017
  1. bug #21722 [ExpressionLanguage] Registering functions after calling e…

    …valuate(), compile() or parse() is not supported (maidmaid)
    
    This PR was squashed before being merged into the 2.7 branch (closes #21722).
    
    Discussion
    ----------
    
    [ExpressionLanguage] Registering functions after calling evaluate(), compile() or parse() is not supported
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    If we add expr. function after first eval/compile like this:
    
    ```php
    $el = new ExpressionLanguage();
    $el->evaluate('1 + 1');
    $el->addFunction(new ExpressionFunction('fn', function () {}, function () {}));
    $el->evaluate('fn()');
    ```
    A ``SyntaxError`` is thrown that says ``The function "fn" does not exist around position 1.``. It's the same bug with ``$el->compile('fn()')``.
    
    This PR fixes this (duplicate of #21098 that was closed).
    
    Commits
    -------
    
    e305369 [ExpressionLanguage] Registering functions after calling evaluate(), compile() or parse() is not supported
    fabpot committed Feb 22, 2017
  2. [ExpressionLanguage] Registering functions after calling evaluate(), …

    …compile() or parse() is not supported
    maidmaid committed with fabpot Dec 29, 2016
  3. fixed bad merge

    fabpot committed Feb 22, 2017
  4. Merge branch '2.8' into 3.2

    * 2.8:
      fix priority ordering of security voters
    fabpot committed Feb 22, 2017
  5. Merge branch '2.7' into 2.8

    * 2.7:
      fix priority ordering of security voters
    fabpot committed Feb 22, 2017
  6. bug #21679 [SecurityBundle] fix priority ordering of security voters …

    …(xabbuh)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [SecurityBundle] fix priority ordering of security voters
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #21660
    | License       | MIT
    | Doc PR        |
    
    Could be updated in the `3.2` branch to make use of the `PriorityTaggedServiceTrait `.
    
    Commits
    -------
    
    dcd19f3 fix priority ordering of security voters
    fabpot committed Feb 22, 2017
Commits on Feb 21, 2017
  1. fix phpunit bridge tests

    nicolas-grekas committed Feb 21, 2017
  2. fix deps

    nicolas-grekas committed Feb 21, 2017
  3. Merge branch '2.8' into 3.2

    * 2.8:
      fix deps
    nicolas-grekas committed Feb 21, 2017
  4. fix deps

    nicolas-grekas committed Feb 21, 2017
  5. bug #21656 [DoctrineBridge] Fixed validating custom doctrine type col…

    …umns (dmaicher)
    
    This PR was merged into the 3.2 branch.
    
    Discussion
    ----------
    
    [DoctrineBridge] Fixed validating custom doctrine type columns
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.1
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #21619
    | License       | MIT
    | Doc PR        | -
    
    This fixes #21619 by not assuming the invalid `$value` is a Doctrine entity if its an object
    
    Commits
    -------
    
    ad59370 [DoctrineBridge] Fixed validating custom doctrine type columns
    fabpot committed Feb 21, 2017
  6. Merge branch '2.8' into 3.2

    * 2.8:
      Use PHPUnit 6.0 on PHP 7.* test lines
    nicolas-grekas committed Feb 21, 2017
  7. Merge branch '2.7' into 2.8

    * 2.7:
      Use PHPUnit 6.0 on PHP 7.* test lines
    nicolas-grekas committed Feb 21, 2017
  8. minor #21698 Use PHPUnit 6.0 on PHP 7.* test lines (nicolas-grekas)

    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    Use PHPUnit 6.0 on PHP 7.* test lines
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | need #21694 first
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    96ecd3c Use PHPUnit 6.0 on PHP 7.* test lines
    nicolas-grekas committed Feb 21, 2017
  9. Use PHPUnit 6.0 on PHP 7.* test lines

    nicolas-grekas committed Feb 21, 2017
  10. minor #21696 Refactored other PHPUnit method calls to work with names…

    …paced PHPUnit 6 (peterrehm)
    
    This PR was squashed before being merged into the 3.2 branch (closes #21696).
    
    Discussion
    ----------
    
    Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.2
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | no
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Continued work to make Symfony PHPUnit 6 compatible.
    
    Commits
    -------
    
    9eeec8d Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
    nicolas-grekas committed Feb 21, 2017
  11. Merge branch '2.8' into 3.2

    * 2.8:
      Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
      Further refactorings to PHPUnit namespaces
      resolve parameters in definition classes
    nicolas-grekas committed Feb 21, 2017
  12. minor #21695 Refactored other PHPUnit method calls to work with names…

    …paced PHPUnit 6 (peterrehm)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.8
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | no
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Continued work to make Symfony PHPUnit 6 compatible.
    
    Commits
    -------
    
    dbe8898 Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
    nicolas-grekas committed Feb 21, 2017
  13. Refactored other PHPUnit method calls to work with namespaced PHPUnit 6

    peterrehm committed Feb 21, 2017
  14. Merge branch '2.7' into 2.8

    * 2.7:
      Further refactorings to PHPUnit namespaces
      resolve parameters in definition classes
    nicolas-grekas committed Feb 21, 2017
  15. minor #21688 Further refactorings to PHPUnit namespaces (peterrehm)

    This PR was squashed before being merged into the 2.7 branch (closes #21688).
    
    Discussion
    ----------
    
    Further refactorings to PHPUnit namespaces
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | no
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Continued work to make Symfony PHPUnit 6 compatible
    
    Commits
    -------
    
    de8106f Further refactorings to PHPUnit namespaces
    nicolas-grekas committed Feb 21, 2017
Commits on Feb 20, 2017
  1. minor #21680 [FrameworkBundle] resolve parameters in definition class…

    …es (xabbuh)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [FrameworkBundle] resolve parameters in definition classes
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #21637 (comment)
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    37ce682 resolve parameters in definition classes
    fabpot committed Feb 20, 2017
  2. minor #21686 Updated PHPUnit namespaces (peterrehm)

    This PR was merged into the 3.2 branch.
    
    Discussion
    ----------
    
    Updated PHPUnit namespaces
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.2
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Follow Up of #21663
    
    Commits
    -------
    
    c2e80e3 Updated PHPUnit namespaces
    nicolas-grekas committed Feb 20, 2017
  3. Merge branch '2.8' into 3.2

    * 2.8:
      Add missing conflict rules for phpunit
    nicolas-grekas committed Feb 20, 2017
  4. Merge branch '2.7' into 2.8

    * 2.7:
      Add missing conflict rules for phpunit
    nicolas-grekas committed Feb 20, 2017