Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 20, 2012
  1. @fabpot

    updated VERSION for 2.1.5

    fabpot authored
  2. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      bumped Symfony version to 2.0.21-DEV
      [FrameworkBundle] fixed trusted_proxies configuration for some edge cases
      [FrameworkBundle] fixed XSD for the trusted-proxies setting
      updated VERSION for 2.0.20
      update CONTRIBUTORS for 2.0.20
      updated CHANGELOG for 2.0.20
    
    Conflicts:
    	CONTRIBUTORS.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
    	src/Symfony/Component/HttpKernel/Kernel.php
  3. @fabpot

    updated CHANGELOG for 2.1.5

    fabpot authored
  4. @fabpot
  5. @fabpot
  6. @fabpot
  7. @fabpot

    updated VERSION for 2.0.20

    fabpot authored
  8. @fabpot

    update CONTRIBUTORS for 2.0.20

    fabpot authored
  9. @fabpot

    updated CHANGELOG for 2.0.20

    fabpot authored
  10. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [FrameworkBundle] added support for URIs as an argument to HttpKernel::render()
      [FrameworkBundle] restricted the type of controllers that can be executed by InternalController
      Making it easier to grab the PR template.
      fix double-decoding in the routing system
    
    Conflicts:
    	README.md
    	src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php
    	src/Symfony/Component/Security/Http/HttpUtils.php
  11. @fabpot
  12. @fabpot

    [FrameworkBundle] restricted the type of controllers that can be exec…

    fabpot authored
    …uted by InternalController
  13. @fabpot

    merged branch Tobion/fix-double-encoding (PR #6363)

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

    merged branch cup-of-giraf/phpprocess_allow_non_blocking (PR #6411)

    fabpot authored
    This PR was squashed before being merged into the 2.1 branch (closes #6411).
    
    Commits
    -------
    
    2cd43da [Process] Allow non-blocking start with PhpProcess
    
    Discussion
    ----------
    
    [Process] Allow non-blocking start with PhpProcess
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #6410
    Todo: -
    License of the code: MIT
    Documentation PR: -
  2. @krichprollsch @fabpot

    [Process] Allow non-blocking start with PhpProcess

    krichprollsch authored fabpot committed
Commits on Dec 16, 2012
  1. @fabpot

    merged branch drak/contributing (PR #6378)

    fabpot authored
    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.
Commits on Dec 15, 2012
  1. Making it easier to grab the PR template.

    Drak authored
  2. @fabpot

    [Locale] fixed a test

    fabpot authored
  3. @webmozart @fabpot

    Fixed failing test

    webmozart authored fabpot committed
  4. @fabpot
  5. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      Added comment
      [FrameworkBundle] Added tests for trusted_proxies configuration.
      [FrameworkBundle] Added a check on file mime type for CodeHelper::fileExcerpt()
      checked for a potentially missing key
      [FrameworkBundle] used the new method for trusted proxies
      remove realpath call
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
  6. @fabpot

    merged branch bamarni/2.0 (PR #6154)

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

    merged branch drak/frameworktestsession (PR #6369)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    54d3f81 [FrameworkBundle] Fixed logic under test environment.
    
    Discussion
    ----------
    
    [FrameworkBundle] Fixed logic under test environment.
    
    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: -
    
    Please note the travis build failed on some Forms stuff which is nothing to do with this PR.
  8. @fabpot

    merged branch baldurrensch/testlistener_fix (PR #6362)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    098b593 [Session] Added exception to save method
    6b9ee87 [Session] Fixed a bug with the TestListener
    
    Discussion
    ----------
    
    [Session] Fixed bug with TestListener
    
    Fixed a bug where an unstarted mock session would be emptied with a save. Here are the steps to reproduce:
    
    Use the test client from Symfony\Bundle\FrameworkBundle\Test\WebTestCase::createClient(), and add something to its session. (I actually had it authenticate against a firewall).
    Take the cookies of this first test client and add them to a second test client
    Have the second test client request a URL that results in a 404
    Since the 404 does not need to start the session, hence when save is called (automatically), the mock session is overwritten with an empty array. This does not happen with the other session handlers.
    The added unit test in this PR shows this problem. If this PR gets accepted, will it also get merged into the 2.1.x-dev branch?
    
    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: -
    Todo: -
    License of the code: MIT
    Documentation PR: -
    
    This is a follow up PR since my original one (#6342) was against the wrong upstream branch.
Commits on Dec 14, 2012
  1. @Tobion
  2. @baldurrensch

    [Session] Added exception to save method

    baldurrensch authored
    A RuntimeException is thrown if there is an attempt to save the session
    without it being started, or if it has already been closed.
  3. @fabpot

    merged branch bschussek/bugfix (PR #6353)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    ad29df5 [Form] Fixed DateTimeToStringTransformer parsing on PHP < 5.3.8
    
    Discussion
    ----------
    
    [Form] Fixed DateTimeToStringTransformer parsing on PHP < 5.3.8
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #6351, see comments in b20c5ca
    Todo: -
    License of the code: MIT
    Documentation PR: -
  4. @baldurrensch

    [Session] Fixed a bug with the TestListener

    baldurrensch authored
    When the session is not started, the test listener would still save the
    session causing the session data to be emptied.
  5. @webmozart
  6. @fabpot

    merged branch francisbesset/check_mime_type (PR #6345)

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

    Merge pull request #1 from pylebecq/2.0

    bamarni authored
    [FrameworkBundle] Added tests for trusted_proxies configuration.
  8. Added comment

    Francis Besset authored
  9. @pylebecq
  10. [FrameworkBundle] Added a check on file mime type for CodeHelper::fil…

    Francis Besset authored
    …eExcerpt()
Something went wrong with that request. Please try again.