Permalink
Commits on Dec 21, 2012
  1. updated VERSION for 2.0.21

    fabpot committed Dec 21, 2012
  2. updated CHANGELOG for 2.0.21

    fabpot committed Dec 21, 2012
Commits on Dec 20, 2012
  1. fixed typo

    fabpot committed Dec 20, 2012
  2. updated VERSION for 2.0.20

    fabpot committed Dec 20, 2012
  3. update CONTRIBUTORS for 2.0.20

    fabpot committed Dec 20, 2012
  4. updated CHANGELOG for 2.0.20

    fabpot committed Dec 20, 2012
  5. [FrameworkBundle] restricted the type of controllers that can be exec…

    …uted by InternalController
    fabpot committed Dec 19, 2012
  6. merged branch Tobion/fix-double-encoding (PR #6363)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    8b2c17f fix double-decoding in the routing system
    
    Discussion
    ----------
    
    fix double-decoding in the routing system
    
    @fabpot @vicb This should fix it. You know what ;) Don't want to leak more information.
    And the good thing, it's no hack nor does it break BC.
    fabpot committed Dec 20, 2012
Commits on Dec 16, 2012
  1. merged branch drak/contributing (PR #6378)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    df0623f Making it easier to grab the PR template.
    
    Discussion
    ----------
    
    Making it easier to grab the PR template.
    fabpot committed Dec 16, 2012
Commits on Dec 15, 2012
  1. Making it easier to grab the PR template.

    Drak committed Dec 15, 2012
  2. merged branch bamarni/2.0 (PR #6154)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    f0743b1 Merge pull request #1 from pylebecq/2.0
    555e777 [FrameworkBundle] Added tests for trusted_proxies configuration.
    a0e2391 [FrameworkBundle] used the new method for trusted proxies
    
    Discussion
    ----------
    
    [FrameworkBundle] used the new method for trusted proxies
    
    This makes the framework bundle using the new method from the request class.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-12-05T10:38:20Z
    
    As this is a sensitive issue, can you add some tests? Thanks.
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-12-06T13:00:24Z
    
    Well I don't know why it fails on travis, I can't run the full test suite locally because of a segfault but ```phpunit src/Symfony/Bundle/``` marks all the tests as passing.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-12-06T13:08:11Z
    
    But it looks like the failing tests come from what you've changed.
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-12-06T13:29:33Z
    
    Yes, I'm not saying it's not my fault but I can't reproduce this as locally it tells me they pass, I'll try to fix this this evening.
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-12-06T17:49:28Z
    
    Apparently it fails only when running the whole testsuite, looking at other travis builds I can see this one on 2.0 : https://travis-ci.org/symfony/symfony/jobs/3495511 which fails in a similar way than here (https://travis-ci.org/symfony/symfony/jobs/3530928). Because of a place trying to access an undefined $_SERVER key : ```PHP Notice:  Undefined index: SCRIPT_NAME ...``` but I can't find where, and the stack trace references some phpunit classes.
    
    I'd be happy if someone could give me some pointers in here as I don't have any clue about how to fix this..
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-12-06T18:00:57Z
    
    As a consulsion I'd say I can't run the whole testsuite locally (it fails even when I revert my commit), so there is no reliable way for me to fix this, if anyone is up for continuing this feel free.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-12-11T09:47:48Z
    
    @bamarni Can you just update this PR with the code change and no tests at all? I will then finish the PR. Thanks.
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-12-11T16:58:17Z
    
    @fabpot: thanks for helping me out on this, hope you won't run into the same issue!
    fabpot committed Dec 15, 2012
Commits on Dec 14, 2012
  1. merged branch francisbesset/check_mime_type (PR #6345)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    d3f5f3a Added comment
    773d818 [FrameworkBundle] Added a check on file mime type for CodeHelper::fileExcerpt()
    
    Discussion
    ----------
    
    [FrameworkBundle] Added a check on file mime type for CodeHelper::fileExcerpt()
    
    Fixed a bug on `CodeHelper::fileExcerpt()`.
    
    I add a check on the file mime type because I use a phar of phpunit and when a exception throwed in a test, Symfony build a page with the stack trace of the exception.
    
    The phpunit.phar path is in the stack trace and Symfony call `highlight_file()` function on this file path.
    `highlight_file()` cannot parse the phar file and warnings are displayed.
    
    This PR add a check on the file mime type.
    **This PR can be applied on 2.0, 2.1 and master branches.**
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes (The broken test seems to be unrelated to this change)
    Fixes the following tickets: -
    License of the code: MIT
    fabpot committed Dec 14, 2012
  2. Merge pull request #1 from pylebecq/2.0

    [FrameworkBundle] Added tests for trusted_proxies configuration.
    bamarni committed Dec 14, 2012
  3. Added comment

    Francis Besset committed Dec 14, 2012
  4. [FrameworkBundle] Added a check on file mime type for CodeHelper::fil…

    …eExcerpt()
    Francis Besset committed Dec 14, 2012
Commits on Dec 12, 2012
  1. merged branch bamarni/patch-14 (PR #6273)

    This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #6273).
    
    Commits
    -------
    
    9273b62 [HttpKernel] checked for a potentially missing key
    
    Discussion
    ----------
    
    [HttpKernel] checked for a potentially missing key
    fabpot committed Dec 12, 2012
  2. checked for a potentially missing key

    The 'function' key isn't always available in the trace. This was
    causing me a notice.
    bamarni committed with fabpot Dec 11, 2012
Commits on Dec 11, 2012
  1. merged branch Burgov/patch-2 (PR #6263)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    e6bb156 remove realpath call
    
    Discussion
    ----------
    
    [HttpKernel] remove realpath call
    
    I'm trying to create an executable phar archive from a Symfony application, but when I run the phar, it fails to find any commands because of this php bug/feature:
    
    https://bugs.php.net/bug.php?id=52769
    
    After this change, my archive works just like a normal app/console call
    fabpot committed Dec 11, 2012
  2. fixed CS

    fabpot committed Dec 11, 2012
  3. remove realpath call

    I'm trying to create an executable phar archive from a Symfony application, but when I run the phar, it fails to find any commands because of this php bug/feature:
    
    https://bugs.php.net/bug.php?id=52769
    
    After this change, my archive works just like a normal app/console call
    Burgov committed Dec 11, 2012
Commits on Dec 10, 2012
  1. merged branch hason/config_import (PR #6226)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    8bb3208 [Config] Loader::import must return imported data
    
    Discussion
    ----------
    
    [2.0][2.1][2.2] [Config] Loader::import must return imported data
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    License of the code: MIT
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-12-07T13:40:58Z
    
    why?
    
    ---------------------------------------------------------------------------
    
    by hason at 2012-12-07T20:57:06Z
    
    We should support both approaches to importing. The first case assumes shared object accross all the loaders (loading DI configuration) and the second case requires returning of imported object (merging route collections).
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-12-07T21:38:42Z
    
    @fabpot As ``load`` can have a return value, this PR makes sense IMO
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-12-10T12:44:09Z
    
    This change should be done in master then.
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-12-10T14:43:18Z
    
    @fabpot I would consider it as a bugfix. The routing loaders are simply broken (as of 2.0) if the loader does not extend from FileLoader (which overwrites the ``import`` method and takes care to return the value). the routing loaders expect to receive the loaded data when importing instead of loosing the imported data entirely: https://github.com/symfony/Routing/blob/2.0/Loader/XmlFileLoader.php#L80
    fabpot committed Dec 10, 2012
Commits on Dec 7, 2012
  1. merged branch fabpot/move-uploaded-file-2_0 (PR #6221)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    447ff91 [HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes #5878, closes #6185)
    
    Discussion
    ----------
    
    [HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes #5878, closes #6185)
    
    An alternative for #5878 and it fixes #6185.
    fabpot committed Dec 7, 2012
  2. [HttpFoundation] changed UploadedFile::move() to use move_uploaded_fi…

    …le() when possible (closes #5878, closes #6185)
    fabpot committed Dec 7, 2012
  3. merged branch fabpot/host-check (PR #6209)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    0489799 [HttpFoundation] added a check for the host header value
    
    Discussion
    ----------
    
    [HttpFoundation] added a check for the host header value
    
    alternative for #3865
    fabpot committed Dec 7, 2012