Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 27, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8:
      [Console] ProgressBarTest::testAnsiColorsAndEmojis() requires extension mbstring
      [SecurityBundle] Skip SetAclCommandTest when sqlite is not available
      [VarDumper] Windows compat for SplCasterTest
      [Translation][Xliff loader] fixed check target node.
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      [Console] ProgressBarTest::testAnsiColorsAndEmojis() requires extension mbstring
  3. @nicolas-grekas
  4. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      [SecurityBundle] Skip SetAclCommandTest when sqlite is not available
  5. @nicolas-grekas

    minor #15631 [SecurityBundle] Skip SetAclCommandTest when sqlite is n…

    nicolas-grekas authored
    …ot available (nicolas-grekas)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [SecurityBundle] Skip SetAclCommandTest when sqlite is not available
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    95961a5 [SecurityBundle] Skip SetAclCommandTest when sqlite is not available
  6. @nicolas-grekas

    minor #15632 [VarDumper] Windows compat for SplCasterTest (nicolas-gr…

    nicolas-grekas authored
    …ekas)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [VarDumper] Windows compat for SplCasterTest
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    d4a5ecb [VarDumper] Windows compat for SplCasterTest
  7. @nicolas-grekas
  8. @nicolas-grekas
  9. @nicolas-grekas

    minor #15629 [Translation][Xliff loader] fixed check target node. (ai…

    nicolas-grekas authored
    …tboudad)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [Translation][Xliff loader] fixed check target node.
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | related to #15604
    | License       | MIT
    | Doc PR        |  ~
    
    Commits
    -------
    
    09e88dc [Translation][Xliff loader] fixed check target node.
  10. @aitboudad
  11. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (21 commits)
      Fix merge
      Fix typo
      Various fixes esp. on Windows
      Fix the validation of form resources to register the default theme
      Fix the retrieval of the value with property path when using a loader
      [appveyor] minor enhancements
      [Process] Disable failing tests on Windows
      [Translation] Fix the string casting in the XliffFileLoader
      Windows and Intl fixes
      Add appveyor.yml for C.I. on Windows
      [VarDumper] fixed HtmlDumper to target specific the head tag
      [travis] merge php: nightly and deps=high test-matrix lines
      consistently use str_replace to unify directory separators
      Support omitting the <target> node in an .xlf file.
      Fix the handling of values for multiple choice types
      moved PHP nightly to PHP 7.0
      fixed tests using deprecation features
      [Form] made deprecation notice more precise
      fixed CS
      Fix BC break after split of ACL from core
      ...
    
    Conflicts:
    	.travis.yml
    	composer.json
    	src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
    	src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
    	src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
    	src/Symfony/Component/Locale/Tests/LocaleTest.php
  12. @nicolas-grekas

    Fix merge

    nicolas-grekas authored
  13. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      Fix typo
  14. @nicolas-grekas

    Fix typo

    nicolas-grekas authored
  15. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      Various fixes esp. on Windows
      Fix the validation of form resources to register the default theme
      Fix the retrieval of the value with property path when using a loader
      [appveyor] minor enhancements
      [Process] Disable failing tests on Windows
      [Translation] Fix the string casting in the XliffFileLoader
      Windows and Intl fixes
      Add appveyor.yml for C.I. on Windows
      [VarDumper] fixed HtmlDumper to target specific the head tag
      [travis] merge php: nightly and deps=high test-matrix lines
      consistently use str_replace to unify directory separators
      Support omitting the <target> node in an .xlf file.
      Fix the handling of values for multiple choice types
      moved PHP nightly to PHP 7.0
      [Security] Add missing docblock in PreAuthenticatedToken
    
    Conflicts:
    	.travis.yml
  16. @nicolas-grekas

    bug #15625 Various fixes esp. on Windows (nicolas-grekas)

    nicolas-grekas authored
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    Various fixes esp. on Windows
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #15622
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    464a1b3 Various fixes esp. on Windows
  17. @nicolas-grekas
Commits on Aug 26, 2015
  1. @Tobion

    Merge branch '2.3' into 2.7

    Tobion authored
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php
  2. @Tobion

    bug #15428 Fix the validation of form resources to register the defau…

    Tobion authored
    …lt theme (stof)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Fix the validation of form resources to register the default theme
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    #14173 made some wrong changes, changing the behavior of the code. This reverts to the right behavior in affected places
    
    Commits
    -------
    
    ea92610 Fix the validation of form resources to register the default theme
  3. @Tobion

    bug #15623 Fix the retrieval of the value with property path when usi…

    Tobion authored
    …ng a loader (stof)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    Fix the retrieval of the value with property path when using a loader
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    the ChoiceType is transforming the form data to its value in case of non-expanded fields.
    
    When creating the choice list from choices, this works fine when using a property path for the choice_value, because it has a safeguard against values which are not object or arrays (a typical case being ``null`` because nothing is selected yet).
    However, when loading from a ChoiceLoader, the generated closure was missing the same safeguard, breaking the usage of ChoiceLoader with property path.
    This went unnoticed because the only usage of choice_loader in core is for the doctrine type, and this one uses its own logic to get the choice value
    
    I added test on the PropertyAccessDecorator directly, to have fast tests. We could imagine adding tests in the ChoiceTypeTest using a ChoiceLoader too, matching all existing tests for other ways to specify arguments, but I'm not sure it is worth it.
    
    Commits
    -------
    
    5df64dc Fix the retrieval of the value with property path when using a loader
  4. @stof
  5. @stof
  6. @fabpot

    minor #15614 consistently use str_replace to unify directory separato…

    fabpot authored
    …rs (Tobion)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    consistently use str_replace to unify directory separators
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        | -
    
    We used a mix of `str_replace` and `strtr` for the same thing. `str_replace` is faster as [I tested myself](https://3v4l.org/MNrgC) which is logical since strtr adds logic we don't need here.
    
    Commits
    -------
    
    b9760ef consistently use str_replace to unify directory separators
  7. @nicolas-grekas

    Merge branch '2.3' into 2.7

    nicolas-grekas authored
    * 2.3:
      [appveyor] minor enhancements
  8. @nicolas-grekas

    minor #15621 [appveyor] minor enhancements (nicolas-grekas)

    nicolas-grekas authored
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [appveyor] minor enhancements
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    ea9780e [appveyor] minor enhancements
  9. @nicolas-grekas
  10. @nicolas-grekas
  11. @nicolas-grekas

    Merge branch '2.3' into 2.7

    nicolas-grekas authored
    * 2.3:
      [Translation] Fix the string casting in the XliffFileLoader
    
    Conflicts:
    	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
  12. @nicolas-grekas

    Merge branch '2.3' into 2.7

    nicolas-grekas authored
    * 2.3:
      Windows and Intl fixes
      Add appveyor.yml for C.I. on Windows
      [travis] merge php: nightly and deps=high test-matrix lines
      [Security] Add missing docblock in PreAuthenticatedToken
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/HttpFoundation/JsonResponse.php
    	src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
  13. @aitboudad

    bug #15619 [Translation] Fix the string casting in the XliffFileLoade…

    aitboudad authored
    …r (stof)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Translation] Fix the string casting in the XliffFileLoader
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    #15611 broke the usage of Xliff translation files (and so all Symfony projects as they are used in core) because it stores SimpleXmlElement instances in the MessageCatalogue, which breaks when loading the cache:
    
    ```
    PHP Fatal error:  Call to undefined method SimpleXMLElement::__set_state() in .../app/cache/test/translations/catalogue.en.1cd7e874b24ab41081c7781e4161053bf515fc91.php on line 9
    ```
    
    this is how the cache looks like (truncated a lot of course):
    
    ```php
    
    $catalogue = new MessageCatalogue('en', array (
      'validators' =>
      array (
        'This value should be false.' =>
        SimpleXMLElement::__set_state(array(
           0 => 'This value should be false.',
        )),
      ),
    ));
    ```
    
    This is a critical bug in the 2.3 and 2.7 branches
    
    Commits
    -------
    
    b856f62 [Translation] Fix the string casting in the XliffFileLoader
  14. @stof
  15. @fabpot

    minor #15484 [Security] Add missing docblock in PreAuthenticatedToken…

    fabpot authored
    … (tgalopin)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Security] Add missing docblock in PreAuthenticatedToken
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    I noticed the `PreAuthenticatedToken` does not provide any dockblock about its constructor parameters so PHPStorm uses the `AbstractToken` parameters and think I'm using `PreAuthenticatedToken` badly.
    
    This fix it by adding the missing docblock and I also added the string[] possibility for roles in `AbstractToken` as it's present in the code and the exception message.
    
    Commits
    -------
    
    1dda0a6 [Security] Add missing docblock in PreAuthenticatedToken
  16. @fabpot

    minor #15510 [travis] merge php-nightly and deps=high test-matrix lin…

    fabpot authored
    …es (nicolas-grekas)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [travis] merge php-nightly and deps=high test-matrix lines
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    b4b930d [travis] merge php: nightly and deps=high test-matrix lines
  17. @fabpot

    bug #15575 Add appveyor.yml for C.I. on Windows (nicolas-grekas)

    fabpot authored
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Add appveyor.yml for C.I. on Windows
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | YES, both on Travis (Linux) and on Appveyor (Windows)!
    | Fixed tickets | #13934, #15049, #14259, #15045, #15444
    | License       | MIT
    | Doc PR        | symfony/symfony-docs#5654
    
    - testing two matrix lines:
      - one without mbtring nor fileinfo nor intl
      - one with these ext enables, intl version 51.2 so that almost no test is skipped on our Intl component
    - bug fixes thanks to these harder testing conditions
    - some display bug on appveyor, [reported here](http://help.appveyor.com/discussions/suggestions/197-support-ansi-color-codes).
    
    Commits
    -------
    
    ea5d656 Windows and Intl fixes
    8bbd8d9 Add appveyor.yml for C.I. on Windows
  18. @fabpot

    minor #15592 Fix BC break after split of ACL from core (WouterJ)

    fabpot authored
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    Fix BC break after split of ACL from core
    
    Rebased version of #15520
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    7e9991e Fix BC break after split of ACL from core
Something went wrong with that request. Please try again.