Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 17, 2013
  1. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [Yaml] fixed unneeded BC break
      [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
      [Yaml] fixed typo
      updated VERSION for 2.0.22
      update CONTRIBUTORS for 2.0.22
      updated CHANGELOG for 2.0.22
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
  2. @fabpot

    [Yaml] fixed unneeded BC break

    fabpot authored
  3. @fabpot

    [DependencyInjection] fixed a bug in the YAML dumper where references…

    fabpot authored
    … where not converted to the @ notation
  4. @fabpot

    [Yaml] fixed typo

    fabpot authored
  5. @fabpot

    updated VERSION for 2.1.7

    fabpot authored
  6. @fabpot

    updated CHANGELOG for 2.1.7

    fabpot authored
  7. @fabpot

    updated VERSION for 2.0.22

    fabpot authored
  8. @fabpot

    update CONTRIBUTORS for 2.0.22

    fabpot authored
  9. @fabpot

    updated CHANGELOG for 2.0.22

    fabpot authored
  10. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [Yaml] fixed default value
      Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
      added a way to enable/disable object support when parsing/dumping
      added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
      [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
    
    Conflicts:
    	src/Symfony/Component/Yaml/Dumper.php
    	src/Symfony/Component/Yaml/Parser.php
    	src/Symfony/Component/Yaml/Tests/DumperTest.php
    	src/Symfony/Component/Yaml/Tests/ParserTest.php
    	src/Symfony/Component/Yaml/Yaml.php
  11. @fabpot

    [Yaml] fixed default value

    fabpot authored
  12. @sun @fabpot

    Added Yaml\Dumper::setIndentation() method to allow a custom indentat…

    sun authored fabpot committed
    …ion level of nested nodes.
    
    YAML does not specify an absolute indentation level, but a consistent indentation of nested nodes only: http://www.yaml.org/spec/1.2/spec.html#space/indentation/
    
    Projects that are generally using 2 spaces for indentation should be able to retain consistency with their coding standards by supplying a custom value for the new $indent parameter added to Yaml::dump(), or the new Dumper::setIndentation() method.
    
    The new parameter is a backwards-compatible API addition and defaults to the previous default of 4 (which was changed from 2 via PR #2242 only recently).
    
    Conflicts:
    	src/Symfony/Component/Yaml/Dumper.php
    	src/Symfony/Component/Yaml/Yaml.php
  13. @fabpot

    added a way to enable/disable object support when parsing/dumping

    fabpot authored
    By default, object support is disabled, and instead of throwing an
    exception when an object is handled, null is returned.
    
    If you do need object support, enable it via:
    
        Yaml::dump($data, false, true);
    
    If you want an exception to be thrown in case an invalid type is handled
    (a PHP resource or a PHP object), pass true as the second argument:
    
        Yaml::dump($data, true, true);
    
    The same can be done when parsing:
    
        Yaml::parse($data, 2, false, true);
  14. @fabpot

    added a way to enable/disable PHP support when parsing a YAML input v…

    fabpot authored
    …ia Yaml::parse()
    
    PHP support when parsing a file has been disabled by default.
    If you do need PHP support when parsing a YAML file, enable it via:
    
        Yaml::setPhpParsing(true);
    
    As of Symfony 2.1, PHP support is disabled by default, and support will
    be removed in Symfony 2.3.
Commits on Jan 16, 2013
  1. @fabpot

    fixed CS

    fabpot authored
  2. @fabpot

    merged branch stloyd/bugfix/process_phpdocs (PR #6626)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    a62e04f [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
    
    Discussion
    ----------
    
    [2.1][Process] Fix docblocks, remove `return` from `PhpProcess#start()`
Commits on Jan 12, 2013
  1. @fabpot

    merged branch schmittjoh/exFix (PR #6716)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    785d365 fixes a bug when output/error output contains a % character
    
    Discussion
    ----------
    
    fixes a bug when output/error output contains a % character
  2. @stloyd

    [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as…

    stloyd authored
    … parent returns nothing, cleaned up `ExecutableFinder`
  3. @schmittjoh
Commits on Jan 11, 2013
  1. @fabpot
  2. @fabpot

    merged branch LawnGnome/PHP-5.5-compat (PR #6647)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    4991607 Fix version_compare() calls for PHP 5.5.
    34def9f Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
    
    Discussion
    ----------
    
    [Form] [Locale] PHP 5.5 compatibility fixes
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: N/A
    Todo: None
    License of the code: MIT
    Documentation PR: N/A
    
    IntlDateFormatter::setTimeZoneId() is deprecated in PHP 5.5, which results in E_DEPRECATED errors when using the date form type. This PR works around that.
    
    Furthermore, the version_compare() tests used in locale to detect PHP 5.5 are broken with snapshot and Git builds of PHP. I've also committed a fix for those tests in this PR.
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-01-10T08:24:15Z
    
    shouldn't it even be done in 2.0 as it is a bugfix ?
    
    ---------------------------------------------------------------------------
    
    by LawnGnome at 2013-01-11T00:49:11Z
    
    Possibly — I don't know enough about Symfony's release management to know whether this is appropriate for 2.0, and I was mostly scratching my own itch, honestly.
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-01-11T01:51:35Z
    
    well, it is a bugfix and 2.0 is also impacted, so it should be done in it.
    
    ---------------------------------------------------------------------------
    
    by LawnGnome at 2013-01-11T02:52:21Z
    
    The diff for 2.0 looks like it'll be just the StubIntlDateFormatter.php changes — the deprecated method isn't called in DateType on that branch, and there aren't any StubIntlDateFormatter tests on 2.0. How do you want that submitted — as a separate PR against 2.0?
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2013-01-11T07:20:18Z
    
    @LawnGnome A separate pull request would be good. Thanks.
    
    ---------------------------------------------------------------------------
    
    by LawnGnome at 2013-01-11T08:29:48Z
    
    2.0 PR added as #6699.
  3. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      Fix version_compare() calls for PHP 5.5.
      [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
    
    Conflicts:
    	src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php
  4. @fabpot

    merged branch LawnGnome/PHP-5.5-compat-2.0 (PR #6699)

    fabpot authored
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    c7bfce9 Fix version_compare() calls for PHP 5.5.
    
    Discussion
    ----------
    
    [2.0] [Form] [Locale] PHP 5.5 compatibility fixes
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: unknown, can't run the test suite on 2.0 due to `Doctrine\DBAL\Logging\DebugStack` not being found
    Fixes the following tickets: N/A
    Todo: None
    License of the code: MIT
    Documentation PR: N/A
    
    A backport of #6647 to the Symfony 2.0 branch, as requested. This affects a couple of files that aren't affected on 2.1.
  5. @fabpot

    merged branch stephpy/redis_profiler_sort (PR #6703)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    9257b03 [Profiler] [Redis] Fix sort of profiler rows.
    
    Discussion
    ----------
    
    [Profiler] [Redis] Fix sort of redis storage profiler rows.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    License of the code: MIT
    
    Redis profiler rows are not sorted as expected.
    
    We have in redis:
    
    ```
    - 2011-01-01 ...
    - 2011-01-02 ...
    - 2011-01-03 ...
    ```
    
    If we limit to 2, we'll have:
    
    ```
    - 2011-01-02 ...
    - 2011-01-01 ...
    ```
    
    Fixed this bug by reversing array.
  6. @stephpy
  7. @LawnGnome

    Fix version_compare() calls for PHP 5.5.

    LawnGnome authored
    Until PHP 5.5 hits beta, the version number for Git builds is still 5.5.0-dev,
    which is less than 5.5.0alpha1 according to version_compare(). This means that
    the branches for 5.5 aren't being executed on 5.5 snapshots at present.
  8. @fabpot

    merged branch jakzal/no-underscored-methods-in-tests-2.1 (PR #6695)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    8024262 Removed underscores from test method names to be consistent with other components.
    
    Discussion
    ----------
    
    Removed underscores from test method names to be consistent with other components
    
    This is just a cosmetic change. It is more common (in Symfony) to use fully camel-cased names for test methods. Only some of the test methods contain underscores. To avoid confusion it is better to be consistent.
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Fixes the following tickets: -
    Todo: -
    License of the code: MIT
    Documentation PR: -
  9. @jakzal

    Removed underscores from test method names to be consistent with othe…

    jakzal authored
    …r components.
    
    It is more common to use fully camel-cased names for test methods. Only some of the test methods are called with underscore notation. To avoid confusion it is better to be consistent.
Commits on Jan 10, 2013
  1. @fabpot

    merged branch stloyd/bugfix/process_cwd (PR #6620)

    fabpot authored
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    880da01 [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
    
    Discussion
    ----------
    
    [2.0][Process] In edge cases `getcwd()` can return `false`
    
    Bug fix: yes
    Feature addition: no
    BC break: no
    Symfony2 tests pass: yes
    
    In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process).
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2013-01-08T12:43:40Z
    
    I guess that this could be related to #6496, as error code `267` at Windows means:
    [`ERROR_DIRECTORY - The directory name is invalid.`](http://msdn.microsoft.com/en-us/library/ms681382%28v=vs.85%29.aspx#error_directory)
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2013-01-08T12:57:38Z
    
    If null already uses the current working directory, what's the point of calling getcwd() at all?
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2013-01-08T13:03:06Z
    
    @Seldaek TBH. I don't have idea =) It seems that it's there _from the beginning_, but yeah, I was a bit confused by usage of it too...
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2013-01-09T08:13:24Z
    
    What about removing the code altogether?
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2013-01-09T08:22:55Z
    
    @fabpot I'm ok with that, just not sure it will not be an BC break...
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2013-01-09T08:24:57Z
    
    php.net says `or NULL if you want to use the default value (the working
    dir of the current PHP process)` which sounds like getcwd() to me.
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2013-01-09T08:26:32Z
    
    For full BC though, `getWorkingDirectory` should `return $this->cwd ?:
    getcwd();` Then at least if that call fails the whole process isn't
    failing. I don't see why anyone would use that getter though.
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2013-01-10T12:43:59Z
    
    @fabpot @Seldaek What do you think about this now?
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2013-01-10T12:58:39Z
    
    :+1:
  2. @stloyd

    [Process] In edge cases `getcwd()` can return `false`, then `proc_ope…

    stloyd authored
    …n()` should get `null` to use default value (the working dir of the current PHP process)
  3. @LawnGnome

    Fix version_compare() calls for PHP 5.5.

    LawnGnome authored
    Until PHP 5.5 hits beta, the version number for Git builds is still 5.5.0-dev,
    which is less than 5.5.0alpha1 according to version_compare(). This means that
    the branches for 5.5 aren't being executed on 5.5 snapshots at present.
  4. @LawnGnome

    Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.

    LawnGnome authored
    Optionally use the new IntlDateFormatter::setTimeZone() method if it exists.
Commits on Jan 9, 2013
  1. @fabpot
  2. @fabpot

    merged branch igorw/exception-listener-comment (PR #6611)

    fabpot authored
    This PR was squashed before being merged into the 2.1 branch (closes #6611).
    
    Commits
    -------
    
    bde5a7f [HttpKernel] Clarify misleading comment in ExceptionListener
    
    Discussion
    ----------
    
    [HttpKernel] Clarify misleading comment in ExceptionListener
    
    Regression from 295860d.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2013-01-08T09:02:53Z
    
    The comment is right. Returning without a Response will re-throw the exception (in HttpKernel).
    
    ---------------------------------------------------------------------------
    
    by staabm at 2013-01-08T11:00:36Z
    
    so the comment should point out, that the httpkernel will rethrow the exception in that case?
    
    ---------------------------------------------------------------------------
    
    by igorw at 2013-01-08T13:38:43Z
    
    I missed that on the commit I linked. I've updated the patch to re-introduce the comment but clarify that `throw` is in HttpKernel.
  3. @igorw @fabpot
Something went wrong with that request. Please try again.