Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Oct 30, 2012
  1. @fabpot

    updated VERSION for 2.1.3

    fabpot authored
Commits on Oct 29, 2012
  1. @fabpot

    merged branch jakzal/yamlDoubleQuotesDumperFix (PR #4320)

    fabpot authored
    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
Commits on Oct 27, 2012
  1. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [ClassLoader] fixed unbracketed namespaces (closes #5747)
    
    Conflicts:
    	src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
    	tests/Symfony/Tests/Component/ClassLoader/ClassCollectionLoaderTest.php
  2. @fabpot
  3. @fabpot

    merged branch Burgov/doctrine_orm_type_guesser_tests (PR #5793)

    fabpot authored
    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
Commits on Oct 26, 2012
  1. @Tobion
Commits on Oct 25, 2012
  1. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 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
  2. @fabpot
  3. @fabpot

    updated VERSION for 2.0.18

    fabpot authored
  4. @x0rr0r @fabpot

    Add to DateFormats 'D M d H:i:s Y T' (closes #5830)

    x0rr0r authored fabpot committed
    DateFormat seen on the web
Commits on Oct 24, 2012
  1. @fabpot

    merged branch bamarni/patch-10 (PR #5783)

    fabpot authored
    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).
  2. @fabpot

    merged branch nomack84/code_cleanup (PR #5818)

    fabpot authored
    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.
  3. @Sorien @fabpot

    added missing use statment (closes #5825)

    Sorien authored fabpot committed
Commits on Oct 22, 2012
  1. @fabpot

    merged branch stof/timeline_panel (PR #5801)

    fabpot authored
    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
  2. @nomack84

    Code cleanup

    nomack84 authored
Commits on Oct 21, 2012
  1. @stof
Commits on Oct 20, 2012
  1. @Burgov
  2. @umpirsky @fabpot

    Removed unused use statements.

    umpirsky authored fabpot committed
  3. @fabpot

    Nsdocblocks

    Drak authored fabpot committed
Commits on Oct 19, 2012
  1. @webmozart
  2. @bamarni
  3. @pkraeutli @fabpot

    fixed fallback locale

    pkraeutli authored fabpot committed
  4. @spike31 @fabpot

    UniqueValidatorTest, Change message on assertions

    spike31 authored fabpot committed
Commits on Oct 18, 2012
  1. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [Form] Fixed creation of multiple money fields with different currencies
      Fixed IPv6 Check in RequestMatcher
      fixed DomCrwaler/Form to handle <button> when submitted
    
    Conflicts:
    	tests/Symfony/Tests/Component/DomCrawler/FormTest.php
    	tests/Symfony/Tests/Component/Form/Extension/Core/Type/MoneyTypeTest.php
  2. @ErikSaunier @fabpot

    Delete use of CreationExeption

    ErikSaunier authored fabpot committed
    CreationException not used
  3. @fabpot

    merged branch bschussek/issue5388 (PR #5778)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    bda29b3 [Form] Fixed error message in PropertyPath to not advice to use a non-existing feature
    
    Discussion
    ----------
    
    [Form] Fixed error message in PropertyPath to not advice to use a non-existing feature
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #5388
    Todo: -
    License of the code: MIT
    Documentation PR: -
  4. @webmozart
  5. @webmozart
  6. @webmozart
Commits on Oct 16, 2012
  1. @umpirsky @fabpot

    Fixed Serbian plural translations.

    umpirsky authored fabpot committed
  2. @yohang @fabpot

    Fixed IPv6 Check in RequestMatcher

    yohang authored fabpot committed
    Added a fallback check for ipv6 support even if sockets extension is not available
  3. @greg0ire @fabpot

    change what I think is a typo

    greg0ire authored fabpot committed
Commits on Oct 15, 2012
  1. @Seldaek
  2. @fabpot
Commits on Oct 14, 2012
  1. @fabpot
Something went wrong with that request. Please try again.