Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Feb 23, 2013
  1. @fabpot

    updated VERSION for 2.1.8

    fabpot authored
  2. @fabpot

    updated CHANGELOG for 2.1.8

    fabpot authored
  3. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [Form] Fixed "label" option to accept the value "0"
      [DomCrawler] lowered parsed protocol string (fixes #6986)
    
    Conflicts:
    	src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
    	tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php
  4. @fabpot

    merged branch guilhermeblanco/patch-14 (PR #7161)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    06ebb0d Defined stable version point of Doctrine.
    
    Discussion
    ----------
    
    Defined stable version point of Doctrine.
    
    As per @stof suggestion, updated 2.1 branch to define the stable version point for Doctrine libraries. @fabpot it's all yours! =)
    
    ```
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    ```
Commits on Feb 22, 2013
  1. @guilhermeblanco
  2. @fabpot

    merged branch cloppy/2.1 (PR #7153)

    fabpot authored
    This PR was squashed before being merged into the 2.1 branch (closes #7153).
    
    Commits
    -------
    
    b2080c4 [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)
    
    Discussion
    ----------
    
    [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #6750
    | License       | MIT
    | Doc PR        |
  3. @JohannesKlauss @fabpot
  4. @fabpot

    merged branch bschussek/issue6153 (PR #7155)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    b7bd630 [Form] Fixed TimeType not to render a "size" attribute in select tags
    
    Discussion
    ----------
    
    [Form] Fixed TimeType not to render a "size" attribute in select tags
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #6153
    | License       | MIT
    | Doc PR        | -
  5. @fabpot

    merged branch guilhermeblanco/patch-13 (PR #7160)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    f0704aa Update composer.json
    
    Discussion
    ----------
    
    Update composer.json
    
    Bump doctrine common dependency for symfony 2.1 users
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-02-22T17:32:25Z
    
    @guilhermeblanco what about using ``~2.2`` as Doctrine keeps BC between minor versions ?
  6. @guilhermeblanco

    Update composer.json

    guilhermeblanco authored
    Bump doctrine common dependency for symfony 2.1 users
  7. @webmozart
  8. @fabpot

    merged branch bschussek/issue6862 (PR #7154)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    00fbb7e [Form] Added test for "label" option to accept the value "0"
    
    Discussion
    ----------
    
    [Form] Added test for "label" option to accept the value "0"
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #6862
    | License       | MIT
    | Doc PR        | -
  9. @webmozart
  10. @fabpot

    merged branch TrackIF/master (PR #7149)

    fabpot authored
    This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7149).
    
    Commits
    -------
    
    0c25d41 Expanded fault-tolerance for unusual cookie dates
    
    Discussion
    ----------
    
    Expanded fault-tolerance for unusual cookie dates
    
    Building on pull #1793, this resolves situations where the Cookie's date field uses a numeric month. Also, expanding on the 7 most typical formats we fall-back to date_create() before throwing an exception.
    
    ---------------------------------------------------------------------------
    
    by vicb at 2013-02-21T17:30:28Z
    
    Please add some unit tests for the new formats.
    
    ---------------------------------------------------------------------------
    
    by ecaron at 2013-02-21T18:06:46Z
    
    Sorry for neglecting the unit tests, they've been updated (2 matching new common date formats, 1 uncommon date format, and changing the existing bad-date check to be more realistically bad.)
    
    I also changed from strtotime to date_create to match the existing DateTime::createFromFormat check (although in my cookiejar analysis leading to this pull requests, all the cookies I'd encountered had timezones in them.) I'm using date_create vs. constructing a DateTime so I can immediately rely on the return value.
    
    ---------------------------------------------------------------------------
    
    by ecaron at 2013-02-21T18:21:03Z
    
    @vicb The two Travis failures are against the master branch unrelated to my changes. Should I retarget this pull against 2.3, or what would you advise to get this pull accepted?
    
    ---------------------------------------------------------------------------
    
    by vicb at 2013-02-21T19:40:59Z
    
    The Travis failure come for a bug in PHPUnit (there is a Sf issue for that).
    
    There is no 2.3 branch yet (devs happen in master).
    
    @fabpot will decide wether this should be considered a a fix (and merge to former releases) or an enhancement which will be merged to 2.3.
    
    _(Could you please update the PR header which still refers to strtotime, thanks)_
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2013-02-21T21:37:15Z
    
    This should probably go into 2.0. Also, do you have a reference where those 7 formats are explained/described?
    
    ---------------------------------------------------------------------------
    
    by ecaron at 2013-02-21T23:10:38Z
    
    @fabpot I couldn't find a reference because the cookies that we're addressing are ones that are behaving outside the spec (at least what I understand from http://curl.haxx.se/rfc/cookie_spec.html), as pull #1793 began to address and this continues. The cases that I've added are ones that I have encountered over the weeks of using BrowserKit and Goutte.
  11. @ecaron @fabpot

    Expanded fault-tolerance for unusual cookie dates

    ecaron authored fabpot committed
  12. @fabpot

    merged branch Maks3w/patch-5 (PR #7151)

    fabpot authored
    This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7151).
    
    Commits
    -------
    
    766e987 Fix docblock type
    
    Discussion
    ----------
    
    Fix docblock type
  13. @Maks3w @fabpot

    Fix docblock type

    Maks3w authored fabpot committed
Commits on Feb 21, 2013
  1. @fabpot

    merged branch bschussek/issue6862 (PR #7150)

    fabpot authored
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    f8812b2 [Form] Fixed "label" option to accept the value "0"
    
    Discussion
    ----------
    
    [Form] Fixed "label" option to accept the value "0"
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #6862
    | License       | MIT
    | Doc PR        | -
    
    @fabpot: This commit will cause troubles when merging 2.0 into 2.1 and up. Tell me if you need help upon conflict resolution.
  2. @webmozart
Commits on Feb 20, 2013
  1. @fabpot

    merged branch jfcixmedia/2.1 (PR #5838)

    fabpot authored
    This PR was squashed before being merged into the master branch (closes #5838).
    
    Commits
    -------
    
    201f3e6 [Form] Fixed cannot unset string offsets in CsrfValidationListener
    
    Discussion
    ----------
    
    [Form] Fixed cannot unset string offsets in CsrfValidationListener
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    License of the code: MIT
    Documentation PR: -
    
    A php fatal error is happening when someone rewrite the entire form data for an object with a single input.
    ```
    Fatal error: Cannot unset string offsets in vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php on line 72
    ```
    
    Example:
    
    ```html
    <form action="/app_dev.php/post/create" method="post" >
        <div id="posttype">
            <div>
                <label for="posttype_name" class="required">Name</label>
                <input type="text" id="posttype_name" name="posttype[name]" required="required" maxlength="255" />
            </div>
            <div>
                <label for="posttype_text" class="required">Text</label>
                <textarea id="posttype_text" name="posttype[text]" required="required"></textarea>
            </div>
            <input type="hidden" id="posttype__token" name="posttype[_token]" value="83a1617c694fbdea43c2527f1a55c7419ce82a42" /></div>
            <p>
                <button type="submit">Create</button>
            </p>
    </form>
    ```
    
    If someone alters the html to add a simple input at the bottom of the form like this one:
    ```html
    <input type="text" id="posttype" name="posttype" value="test123" />
    ```
    
    The result will be a php fatal error.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-10-26T09:49:05Z
    
    Thank you for the pull request! Could you please reference the pull request in the test?
    
    ```php
    // #5838
    public function testStringFormData()
    {
        ...
    ```
    
    ---------------------------------------------------------------------------
    
    by jfcixmedia at 2012-10-26T10:21:29Z
    
    @bschussek  Added, thanks.
Commits on Feb 19, 2013
  1. @fabpot

    merged branch cloppy/Dom-Crawler-fix (PR #7127)

    fabpot authored
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    cb03074 [DomCrawler] lowered parsed protocol string (fixes #6986)
    
    Discussion
    ----------
    
    [DomCrawler] lowered parsed protocol string (fixes #6986)
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #6986
    | License       | MIT
    | Doc PR        | symfony/symfony-docs#123
    
    Are UTs needed for this?
  2. @JohannesKlauss
  3. @fabpot

    merged branch fabpot/locale-fix (PR #7099)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    3e40c17 [HttpKernel] fixed locale management when exiting sub-requests
    
    Discussion
    ----------
    
    [HttpKernel] fixed locale management when exiting sub-requests
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #7063
    | License       | MIT
    | Doc PR        | n/a
    
    This fix is temporary as #7007 will fix it properly in Symfony 2.3.
    
    ---------------------------------------------------------------------------
    
    by vicb at 2013-02-17T20:17:44Z
    
    changelog ?
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2013-02-17T20:27:22Z
    
    The changelogs are updated when we release a new version only.
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-02-17T20:41:00Z
    
    @fabpot the intl locale should be reset to the right value too
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-02-17T20:42:31Z
    
    hmm sorry, I missed the fact that you are changing the locale in the Request again, which will set the intl one
  4. @fabpot

    [HttpKernel] fixed locale management when exiting sub-requests

    fabpot authored
    This fix is temporary as #7007 will fix it properly in Symfony 2.3.
Commits on Feb 18, 2013
  1. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [Process] Fix regression introduced in #6620 / 880da01, fixes #7082
  2. @fabpot

    merged branch Seldaek/regressionfix (PR #7102)

    fabpot authored
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    179cd58 [Process] Fix regression introduced in #6620 / 880da01, fixes #7082
    
    Discussion
    ----------
    
    [Process][2.0] getcwd failure fix
    
    Fix regression introduced in #6620
    Fixes #7082
    
    For reference, here is the current behavior I saw:
    
    PHP 5.4.11, windows:
    
    ```
    5.4.11\php.exe -r "chdir('c:\\'); var_dump(getcwd()); $p = proc_open('pwd', [['pipe', 'r'], ['pipe', 'w'], ['pipe', 'w']], $pipes, null); var_dump(stream_get_contents($pipes[1]));"
    string(3) "C:\\"
    string(14) "/c/Users/seld\n"
    ```
    
    (I use pwd which is a unix util so it dumps a funny path, but don't look at that)
    
    PHP 5.5alpha4, windows (seems fixed):
    
    ```
    5.5.0a4\php.exe  -r "chdir('c:\\'); var_dump(getcwd()); $p = proc_open('pwd', [['pipe', 'r'], ['pipe', 'w'], ['pipe', 'w']], $pipes, null); var_dump(stream_get_contents($pipes[1]));"
    string(3) "C:\"
    string(3) "/c\n"
    ```
    
    PHP 5.3.10, ubuntu:
    
    ```
    php -r "chdir('/'); var_dump(getcwd()); \$p = proc_open('pwd', array(array('pipe', 'r'), array('p
    ipe', 'w'), array('pipe', 'w')), \$pipes, null); var_dump(stream_get_contents(\$pipes[1]));"
    string(1) "/"
    string(2) "/\n"
    ```
    
    Since the permission issue that #6620 originally was fixing is most likely not gonna happen on windows, this seems like a safe enough compromise. Ideally a check for PHP<5.5 should be introduced, but I would like to be sure it's been fixed and is not just a lucky coincidence (/cc @PierreJoye)
    
    I would recommend merging fast and maybe adding the version check later, since it breaks composer create-project on windows. The workaround being: cd in the dir and run `composer install` again to finalize the project setup.
    
    ---------------------------------------------------------------------------
    
    by vicb at 2013-02-17T20:12:17Z
    
    Thanks @Seldaek !
    
    Would you mind creating an issue for the version check so that it doesn't get lost ?
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2013-02-18T10:43:56Z
    
    @vicb done.
    
    ---------------------------------------------------------------------------
    
    by vicb at 2013-02-18T11:45:16Z
    
    thanks !
Commits on Feb 17, 2013
  1. @Seldaek
  2. @fabpot

    merged branch 1ed/ref-dumper-tweak-2.1 (PR #7097)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    18b139d [FrameworkBundle] tweaked reference dumper command (see #7093)
    
    Discussion
    ----------
    
    [FrameworkBundle] tweaked reference dumper command (see #7093)
    
    The same as #7093 just for 2.1.
  3. @1ed
  4. @fabpot
  5. @fabpot

    merged branch mweimerskirch/patch-12 (PR #7092)

    fabpot authored
    This PR was submitted for the 2.2 branch but it was merged into the 2.1 branch instead (closes #7092).
    
    Commits
    -------
    
    187645f Fix REMOTE_ADDR for cached subrequests
    
    Discussion
    ----------
    
    [HttpKernel/HttpCache] Fix "REMOTE_ADDR" for cached subrequests
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | none that I know of
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | 7091
    | License       | MIT
    
    I moved the code that modifies the REMOTE_ADDR variable further up the chain so that cached subrequests also receive the local IP address. Before, only new subrequests received the local IP address and cached ones received the original IP, which made "validateRequest" in FragmentListener fail.
    
    Please review. I'm not sure about side-effects of this patch, including possible security issues.
    
    Fixes #7091
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2013-02-16T11:49:27Z
    
    @fabpot rejected setting this on the master request, so you should do it on the ```forward()``` method instead.
    
    ---------------------------------------------------------------------------
    
    by mweimerskirch at 2013-02-16T12:13:46Z
    
    @bamarni @fabpot done
  6. @mweimerskirch @fabpot

    Fix REMOTE_ADDR for cached subrequests

    mweimerskirch authored fabpot committed
    Fixes #7091
Commits on Feb 14, 2013
  1. @fabpot

    merged branch Seldaek/proctemp (PR #7066)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    5e8d844 [Process] Warn user with a useful message when tmpfile() failed
    
    Discussion
    ----------
    
    [Process] Warn user with a useful message when tmpfile() failed
    
    Simple warning so users know what's going on instead of getting a proc_open error, see composer/composer#1581.
    
    Can't get the PR template since ~~symfony.com~~ my dns resolver is dead :)
  2. @Seldaek
Commits on Feb 11, 2013
  1. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [DependencyInjection] fixed tests (refs #7017)
Something went wrong with that request. Please try again.