Permalink
Commits on Oct 30, 2012
  1. updated VERSION for 2.1.3

    fabpot committed Oct 30, 2012
  2. update CONTRIBUTORS for 2.1.3

    fabpot committed Oct 30, 2012
  3. updated CHANGELOG for 2.1.3

    fabpot committed Oct 30, 2012
Commits on Oct 29, 2012
  1. merged branch jakzal/yamlDoubleQuotesDumperFix (PR #4320)

    Commits
    -------
    
    b631073 [Yaml] Fixed double quotes escaping in Dumper.
    
    Discussion
    ----------
    
    [Yaml] Fixed double quotes escaping in Dumper
    
    Issue #4308 is caused by Dumper::escapeWithDoubleQuotes() which uses [str_replace()](http://php.net/str_replace).
    
    From the php docs:
    
    > Because str_replace() replaces left to right, it might replace a previously inserted value when doing multiple replacements.
    
    We should be very careful in deciding about the order of elements in $escapees array. I'd really appreciate if someone reviewed my fix. Tests say I didn't break anything but I'm not sure what percentage of Yaml specification is covered by tests.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: not that I know
    Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/jakzal/symfony.png?branch=yamlDoubleQuotesDumperFix)](http://travis-ci.org/jakzal/symfony)
    Fixes the following tickets: #4308
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-18T08:53:51Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1364279) (merged 5192722c into a04acc8).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-18T23:19:49Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1371539) (merged ecaa1aab into fc3c609).
    
    ---------------------------------------------------------------------------
    
    by dinamic at 2012-05-19T07:35:21Z
    
    Something is really wrong with this method. You can see clearly that multiple characters would fail proper escaping.
    
    Here's an example:
    ```
    $value = '\\\\"some value\n \"some quoted string\" and \'some single quotes one\'"';
    var_dump(Escaper::escapeWithDoubleQuotes($value));
    string(72) ""\\\"some value\n \\some quoted string\\ and 'some single quotes one'\"""
    ```
    
    To begin with the backslash - in the initial value you have 2 (escaped ones), that after escaping should result in 4, not in 1 (escaped). I guess this behavior has to be verified with the importer, but imho it does not seem right.
    
    Does anyone know why this escaping wasn't done using a regular expression in first place?
    
    ---------------------------------------------------------------------------
    
    by clemens-tolboom at 2012-05-19T10:18:58Z
    
    Searching for https://duckduckgo.com/?q=what+is+\xc2\x85 the table on http://stackoverflow.com/questions/6609895/efficiently-replace-bad-characters is interesting enough to decide we need way more documentation on this file.
    
    \xc2\x85 seems to be triple dot (ellipses)
    \xe2\x80\xa9 seems to be paragraph separator see http://drupal.org/node/914360#comment-3468550
    
    Conflicts:
    	src/Symfony/Component/Yaml/Escaper.php
    fabpot committed Jun 9, 2012
Commits on Oct 27, 2012
  1. Merge branch '2.0' into 2.1

    * 2.0:
      [ClassLoader] fixed unbracketed namespaces (closes #5747)
    
    Conflicts:
    	src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
    	tests/Symfony/Tests/Component/ClassLoader/ClassCollectionLoaderTest.php
    fabpot committed Oct 27, 2012
  2. merged branch Burgov/doctrine_orm_type_guesser_tests (PR #5793)

    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    5d2525b [Form] Created test for DoctrineOrmTypeGuesser see #5790
    b844d6b [Form] Fixed DoctrineOrmTypeGuesser to guess the "required" option for to-one associations
    
    Discussion
    ----------
    
    [Form] Doctrine orm type guesser tests
    
    This PR adds tests to #5790
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-10-20T10:53:56Z
    
    Using real test entities would be better IMO. Using mocks ties it pretty much to the implementation.
    
    ---------------------------------------------------------------------------
    
    by sstok at 2012-10-21T10:38:53Z
    
    @Tobion thats true, but Doctrine Class meta data takes quite some coding to set-up.
    For instance you need the EntityManager to get even get the meta data set!
    
    So you'd end having more code to set-up then your actually testing.
    
    ---------------------------------------------------------------------------
    
    by Burgov at 2012-10-21T12:58:58Z
    
    I wasn't sure whether do use a test entity manager, or do it the way I finally did it.
    
    @sstok true, it's quite some work to set it up, but on the other hand there's the base OrmTestCase class which does it for you, so it'd actually mean I'd only have to create one entity for all the cases: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php
    
    @Tobion on the other hand I tend to use a test EM only when I actually need to test persisting and loading, while this test case here is so isolated that I didn't really feel it would be necessary.
    
    I'd like to know which method is preferred though, I'll change it if necessary, and other tests can be added to test the rest of this specific class
    fabpot committed Oct 27, 2012
Commits on Oct 26, 2012
  1. merged branch Tobion/patch-2 (PR #5843)

    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    7447ef7 slight refactoring in UrlMatcher
    
    Discussion
    ----------
    
    slight refactoring in UrlMatcher
    
    bc break: no
    bug fix: no
    feature addition: no
    
    saving a variable
    fabpot committed Oct 26, 2012
Commits on Oct 25, 2012
  1. Merge branch '2.0' into 2.1

    * 2.0:
      bumped Symfony version to 2.0.19-DEV
      updated VERSION for 2.0.18
      update CONTRIBUTORS for 2.0.18
      updated CHANGELOG for 2.0.18
      updated vendors for 2.0.18
      Add to DateFormats 'D M d H:i:s Y T' (closes #5830)
    
    Conflicts:
    	CONTRIBUTORS.md
    	src/Symfony/Component/HttpKernel/Kernel.php
    	tests/Symfony/Tests/Bridge/Monolog/Processor/WebProcessorTest.php
    	vendors.php
    fabpot committed Oct 25, 2012
  2. merged branch greg0ire/fix_upgrade_prototype_name_option (PR #5833)

    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    6fb4a1b Remove § about prototype_name customization in 2.0
    8a347fd fix option name
    
    Discussion
    ----------
    
    Fix upgrade prototype name option
    fabpot committed Oct 25, 2012
  3. updated VERSION for 2.0.18

    fabpot committed Oct 25, 2012
  4. update CONTRIBUTORS for 2.0.18

    fabpot committed Oct 25, 2012
  5. updated CHANGELOG for 2.0.18

    fabpot committed Oct 25, 2012
  6. updated vendors for 2.0.18

    fabpot committed Oct 25, 2012
  7. Remove § about prototype_name customization in 2.0

    I don't think this was even possible in 2.0
    greg0ire committed Oct 25, 2012
  8. fix option name

    greg0ire committed Oct 25, 2012
  9. Add to DateFormats 'D M d H:i:s Y T' (closes #5830)

    DateFormat seen on the web
    x0rr0r committed with fabpot Oct 25, 2012
Commits on Oct 24, 2012
  1. merged branch bamarni/patch-10 (PR #5783)

    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    3553276 [ConfigDumpReference] avoid notice for variable nodes
    
    Discussion
    ----------
    
    [ConfigDumpReference] avoid notice for variable nodes
    
    When a variable node has an array as default value, a notice occurs later on because of an "array to string conversion", which is turned to an exception in debug mode (mandatory in order to run this command).
    fabpot committed Oct 24, 2012
  2. merged branch nomack84/code_cleanup (PR #5818)

    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    f06432b Code cleanup
    
    Discussion
    ----------
    
    Code cleanup
    
    Not sure at the end if this good or not. If it is useless, just close it.
    fabpot committed Oct 24, 2012
Commits on Oct 22, 2012
  1. merged branch stof/timeline_panel (PR #5801)

    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    039bdfd [WebProfilerBundle] Fixed the use of nested macros
    
    Discussion
    ----------
    
    [WebProfilerBundle] Fixed the use of nested macros
    
    Closes #5800
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-10-22T20:03:10Z
    
    @fabpot ping. this regression is quite annoying as I like the profiler
    fabpot committed Oct 22, 2012
  2. Code cleanup

    alvarezmario committed Oct 22, 2012
Commits on Oct 21, 2012
Commits on Oct 20, 2012
  1. merged branch umpirsky/minor-use-fixes (PR #5786)

    This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5786).
    
    Commits
    -------
    
    199a593 Removed unused use statements.
    
    Discussion
    ----------
    
    Removed unused use statements.
    fabpot committed Oct 20, 2012
  2. Removed unused use statements.

    umpirsky committed with fabpot Oct 19, 2012
  3. merged branch drak/nsdocblocks (PR #5789)

    This PR was squashed before being merged into the 2.1 branch (closes #5789).
    
    Commits
    -------
    
    788cc2c Nsdocblocks
    
    Discussion
    ----------
    
    Nsdocblocks
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    License of the code: MIT
    Documentation PR: -
    fabpot committed Oct 20, 2012
  4. Nsdocblocks

    Drak committed with fabpot Oct 19, 2012
Commits on Oct 19, 2012
  1. merged branch astina/fallback-locale-fix (PR #5746)

    This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5746).
    
    Commits
    -------
    
    96d87ad [Locale] fixed fallback locale
    
    Discussion
    ----------
    
    [Locale] fixed fallback locale
    
    The `getFallbackLocale()` method in `Symfony\Component\Locale\Locale` did not return a fallback locale if the current locale (`Locale::getDefault()`) was a 5-char locale like de_CH.
    
    `LocaleTest` failed when the locale was set to de_CH before running (see changes in LocaleTest).
    
    (second attempt after messing up PR#5641)
    
    ---------------------------------------------------------------------------
    
    by eriksencosta at 2012-10-15T05:08:25Z
    
    Original PR: #5641.
    fabpot committed Oct 19, 2012
  2. fixed fallback locale

    pkraeutli committed with fabpot Oct 14, 2012
  3. merged branch pkruithof/patch-5 (PR #5781)

    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    3e15d44 Documented removed _form_is_choice_group function
    
    Discussion
    ----------
    
    Documented removed `_form_is_choice_group` function
    
    Also changed for-loop variables to match the current `form_div_layout.html.twig` code.
    fabpot committed Oct 19, 2012