Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 28, 2012
  1. @fabpot

    updated VERSION for 2.0.17

    fabpot authored
  2. @fabpot

    updated CHANGELOG for 2.0.17

    fabpot authored
  3. @fabpot

    updated vendors for 2.0.17

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

    refined previous commit

    fabpot authored
  8. @schmittjoh @fabpot

    prevents injection of malicious doc types

    schmittjoh authored fabpot committed
  9. @fabpot
  10. @stepotronic @fabpot

    Redirects are now absolute

    stepotronic authored fabpot committed
    According to w3c locations need to be absolute:
    http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.30
Commits on Aug 26, 2012
  1. @fabpot
  2. @fabpot

    merged branch bdmu/ticket_5343 (PR #5344)

    fabpot authored
    Commits
    -------
    
    f694615 [Process] fix ProcessTest::testProcessPipes hangs on Windows on branch 2.0
    
    Discussion
    ----------
    
    [Process] fix ProcessTest::testProcessPipes hangs on Windows on branch 2.0
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #5343
    Todo: -
    License of the code: MIT
    Documentation PR:
    Marked the test as skipped on Windows, exactly as it is done on master branch (kind of backport)
    
    ---------------------------------------------------------------------------
    
    by pborreli at 2012-08-25T20:06:58Z
    
    :+1:
  3. @fabpot

    merged branch bdmu/ticket_5341 (PR #5342)

    fabpot authored
    Commits
    -------
    
    9beffff [HttpKernel] KernelTest::testGetRootDir fails on Windows for branch 2.0
    
    Discussion
    ----------
    
    [HttpKernel] fix KernelTest::testGetRootDir fails on Windows for branch 2.0
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #5341
    Todo: -
    License of the code: MIT
    Documentation PR:
    replace
    $this->assertEquals(DIR, $kernel->getRootDir());
    with
    $this->assertEquals(DIR, realpath($kernel->getRootDir()));
    line 287
    
    ---------------------------------------------------------------------------
    
    by pborreli at 2012-08-25T20:23:34Z
    
    :+1:
Commits on Aug 25, 2012
  1. @bdmu
  2. @bdmu
Commits on Aug 19, 2012
  1. @fabpot

    merged branch Seldaek/monologbridge (PR #5297)

    fabpot authored
    Commits
    -------
    
    e49afde Update monolog compatibility
    832f8dd Add support for Monolog 1.2.0
    
    Discussion
    ----------
    
    Add support for Monolog 1.2.0
    
    It's BC just in case someone still uses an older monolog version
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2012-08-19T07:20:24Z
    
    IMO you should update `composer.json` too.
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2012-08-19T07:36:51Z
    
    1.* is still ok I think. Obviously the latest version is better, and if you update composer will pick the latest, but I don't think we need to force people to upgrade if there is no BC break.
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2012-08-19T07:46:31Z
    
    But adding support for version `1.2` without changing `composer.json` which actually is: `>=1.0,<1.2-dev` is useless IMO.
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2012-08-19T07:50:16Z
    
    Where do you see `>=1.0,<1.2-dev`?
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2012-08-19T07:55:36Z
    
    Here, in `2.0` branch: https://github.com/symfony/symfony/blob/2.0/composer.json#L21
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2012-08-19T07:58:28Z
    
    Ok fixed.. Everywhere else in the master branch it is required with `1.*` so I didn't get what you meant :)
  2. @Seldaek

    Update monolog compatibility

    Seldaek authored
Commits on Aug 18, 2012
  1. @Seldaek

    Add support for Monolog 1.2.0

    Seldaek authored
Commits on Aug 10, 2012
  1. @fabpot

    merged branch hidenorigoto/fix-di-phpdumper (PR #5194)

    fabpot authored
    Commits
    -------
    
    1a4a4ee [DependencyInjection] Fixed a frozen constructor of a container with no parameters
    2a124bc [DependencyInjection] Added a test for a frozen constructor of a container with no parameters
    
    Discussion
    ----------
    
    [DependencyInjection] Fix PHP Dumper for a constructor of a frozen container with no parameters
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets:
    Todo: -
    License of the code: MIT
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-06T16:51:20Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2049206) (merged 1a4a4ee into 3d32a0b).
  2. @fabpot

    merged branch kriswallsmith/graceful-invalid-session (PR #5210)

    fabpot authored
    Commits
    -------
    
    c51fc10 avoid fatal error on invalid session
    
    Discussion
    ----------
    
    [Security] avoid fatal error on invalid session
    
    If the session has something instead of a token there will be a fatal error when `$this->refreshUser($token)` is called because the argument on that method is strictly typed.
    
    ```
    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: ~
    ```
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-07T18:35:47Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2059743) (merged c51fc10 into 3d32a0b).
Commits on Aug 7, 2012
  1. @kriswallsmith
Commits on Aug 6, 2012
  1. @hidenorigoto
  2. @hidenorigoto
  3. @fabpot

    merged branch beberlei/ConfigFileLoaderTypeMissing (PR #5193)

    fabpot authored
    Commits
    -------
    
    b3cf36a [Config] Missing type argument passed to loader.
    
    Discussion
    ----------
    
    [Config] Missing type argument passed to loader.
    
    In FileLoader the $type is not passed to the child loader.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    License of the code: MIT
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-06T14:22:30Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2047982) (merged b3cf36a into 89dce2d).
  4. @beberlei

    [Config] Missing type argument passed to loader.

    beberlei authored
    In FileLoader the $type is not passed to the child loader.
Commits on Aug 3, 2012
  1. @fabpot

    merged branch SamsonIT/fix_broken_command_registration (PR #5169)

    fabpot authored
    Commits
    -------
    
    55a0b34 Fixes incorrect class used in src/Symfony/Bundle/FrameworkBundle/Console/Application.php
    79c547f [FrameworkBundle] added test for fix broken command registration
    
    Discussion
    ----------
    
    [FrameworkBundle] fix broken command registration
    
    fixed #5168, #5166
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-03T11:35:29Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2027699) (merged 39e964b8 into fee3f4e).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-03T11:45:14Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2027761) (merged 55a0b34 into fee3f4e).
    
    ---------------------------------------------------------------------------
    
    by xeross at 2012-08-03T11:45:45Z
    
    Duplicate of #5166
    
    ---------------------------------------------------------------------------
    
    by Burgov at 2012-08-03T11:47:54Z
    
    @xeross that PR was opened on master instead of 2.0
    
    ---------------------------------------------------------------------------
    
    by xeross at 2012-08-03T11:48:49Z
    
    @Burgov Ah sorry, I got confused and thought this was another dupe
  2. @fabpot

    merged branch lsmith77/container_builder_cosmetics (PR #5165)

    fabpot authored
    Commits
    -------
    
    4563397 corrected phpdoc
    
    Discussion
    ----------
    
    corrected phpdoc
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-03T09:37:07Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2026993) (merged 4563397 into fee3f4e).
  3. @smokeybear87 @Burgov

    Fixes incorrect class used in src/Symfony/Bundle/FrameworkBundle/Cons…

    smokeybear87 authored Burgov committed
    …ole/Application.php
    
    Issue must be related to commit 7a5f614 (merged 2.0), specifically this file src/Symfony/Bundle/FrameworkBundle/Console/Application.php, lines 86-88. 
    
    Presumably to do "instanceof Bundle" correct class has to be imported at the top of the file:
    
    instead of 
    use Symfony\Component\HttpKernel\Bundle;
    
    this should be
    use Symfony\Component\HttpKernel\Bundle\Bundle;
    Conflicts:
    
    	src/Symfony/Bundle/FrameworkBundle/Console/Application.php
  4. @Burgov
  5. @lsmith77

    corrected phpdoc

    lsmith77 authored
  6. @fabpot

    merged branch vicb/doctrine_logger (PR #5139)

    fabpot authored
    Commits
    -------
    
    a0709fc [DoctrineBridge] Fix log of non utf8 data
    
    Discussion
    ----------
    
    Doctrine logger - fix logging of binary data
    
    fix #5115
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-01T11:21:07Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/2008862) (merged a0709fc into 1da896d).
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-08-01T11:54:45Z
    
    I see a way to fix it in a far better way: instead of json_encoding the parameters and appending them to the SQL, we could pass them as context to the logger (the optional second argument) as Monolog already handles normalizing the context (and in a better way silencing the error).
    Btw, this would also make the log message better for rich logger as they would receive the array (for instance, the FirephpHandler is able to send the context as an array instead of a string as firebug is able to dump arrays)
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-08-01T12:19:06Z
    
    @stof you're right that would be much better. What about keeping this fix for 2.0 and use your suggestion for 2.1 (as the public `log` method prototype would change (to take the context as argument) ?
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-08-01T12:21:09Z
    
    @vicb as the method is public, it need to be done in 2.1 only indeed. The next question being "why is it public ?" :)
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-08-03T07:47:39Z
    
    So, what's the next step?
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-08-03T07:48:38Z
    
    I think this should be merged in 2.0 and then 2.1 should be updated with the suggestion from @stof
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-08-03T07:54:16Z
    
    Can you provide a PR for 2.1 so that I merge both at the same time?
  7. @fabpot

    merged branch lsmith77/container_builder_cosmetics (PR #5163)

    fabpot authored
    Commits
    -------
    
    3605c54 removed unused private property
    d4a78a2 fix phpdoc statement of getAlias()
    
    Discussion
    ----------
    
    Container builder cosmetics
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-03T08:39:00Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2026569) (merged 3605c54 into 13c60bd).
  8. @lsmith77
  9. @lsmith77
  10. @fabpot

    merged branch henrikbjorn/2.0 (PR #5137)

    fabpot authored
    Commits
    -------
    
    0b78fdf Only call registerCommand on bundles that is an instance of Bundle
    
    Discussion
    ----------
    
    Only call registerCommand on bundles that is an instance of Bundle
    
    Fixes GH-5133
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-08-01T09:41:05Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/2008252) (merged 0b78fdf into 1da896d).
    
    ---------------------------------------------------------------------------
    
    by henrikbjorn at 2012-08-01T10:05:00Z
    
    Build failed because of HTTP request error.
    
    ---------------------------------------------------------------------------
    
    by lsmith77 at 2012-08-01T11:31:08Z
    
    wondering if it would be good if you could include the commit from #5133 in this PR .. then we get the test and the fix at once.
Something went wrong with that request. Please try again.