Permalink
Commits on Jan 27, 2013
  1. Merge branch '2.1'

    fabpot committed Jan 27, 2013
    * 2.1:
      [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
      Fixed missing class argument when throwing exception
Commits on Jan 23, 2013
  1. Merge branch '2.1'

    fabpot committed Jan 23, 2013
    * 2.1:
      [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
      [Security] PHPDoc in SecurityEvents
      Fix typos in README
      Added an error message in the DebugClassLoader when using / instead of \.
      KNOWN_ISSUES with php 5.3.16
      [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
      [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
      [Yaml] fixed #6773
      [Yaml] fixed #6770
      bumped Symfony version to 2.1.8-DEV
      bumped Symfony version to 2.0.23-DEV
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Client.php
    	src/Symfony/Component/HttpKernel/Kernel.php
Commits on Jan 22, 2013
  1. Merge branch '2.0' into 2.1

    fabpot committed Jan 22, 2013
    * 2.0:
      [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
      [Security] PHPDoc in SecurityEvents
      [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
      [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
      [Yaml] fixed #6773
      [Yaml] fixed #6770
      bumped Symfony version to 2.0.23-DEV
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Yaml/Inline.php
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
Commits on Jan 18, 2013
  1. merged branch ezzatron/yaml-negative-integers (PR #6784)

    fabpot committed Jan 18, 2013
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    fea20b7 [Yaml] fixed #6770
    
    Discussion
    ----------
    
    [Yaml] fixed parsing of negative integers (2.0 branch)
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #6770
    | License       | MIT
    | Doc PR        | n/a
    
    Note that an unrelated test fixture for large integers had to be changed to work on systems with 64-bit integer support because of the change from `assertEquals()` to `assertSame()`. Please see the diff for clarification.
Commits on Jan 17, 2013
  1. [Yaml] fixed #6773

    ezzatron committed Jan 17, 2013
  2. [Yaml] fixed #6770

    ezzatron committed Jan 17, 2013
  3. Merge branch '2.1'

    fabpot committed Jan 17, 2013
    * 2.1:
      [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.1.7
      updated CHANGELOG for 2.1.7
      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
  4. Merge branch '2.0' into 2.1

    fabpot committed Jan 17, 2013
    * 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
  5. [Yaml] fixed unneeded BC break

    fabpot committed Jan 17, 2013
  6. [Yaml] fixed typo

    fabpot committed Jan 17, 2013
  7. Merge branch '2.1'

    fabpot committed Jan 17, 2013
    * 2.1:
      [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()
      fixed CS
      [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
      fixes a bug when output/error output contains a % character
      [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
      [Profiler] [Redis] Fix sort of profiler rows.
      Fix version_compare() calls for PHP 5.5.
      Removed underscores from test method names to be consistent with other components.
      [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)
      Fix version_compare() calls for PHP 5.5.
      Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
      removed the .gitattributes files (closes #6605, reverts #5674)
      [HttpKernel] Clarify misleading comment in ExceptionListener
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
    	src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
    	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
    	src/Symfony/Component/Process/Process.php
  8. Merge branch '2.0' into 2.1

    fabpot committed Jan 17, 2013
    * 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
  9. [Yaml] fixed default value

    fabpot committed Jan 17, 2013
  10. Added Yaml\Dumper::setIndentation() method to allow a custom indentat…

    sun committed with fabpot Aug 4, 2012
    …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
  11. added a way to enable/disable object support when parsing/dumping

    fabpot committed Jan 17, 2013
    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);
  12. added a way to enable/disable PHP support when parsing a YAML input v…

    fabpot committed Jan 17, 2013
    …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 9, 2013
Commits on Jan 5, 2013
Commits on Jan 4, 2013
  1. Merge branch '2.0' into 2.1

    fabpot committed Jan 4, 2013
    * 2.0:
      updated license year
      Update src/Symfony/Component/HttpFoundation/Response.php
      [Console] fixed unitialized properties (closes #5935)
      [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
      bumped Symfony version to 2.0.21-DEV
      updated VERSION for 2.0.21
      updated CHANGELOG for 2.0.21
    
    Conflicts:
    	src/Symfony/Bundle/SwiftmailerBundle/LICENSE
    	src/Symfony/Component/Filesystem/LICENSE
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpKernel/Kernel.php
  2. updated license year

    fabpot committed Jan 4, 2013
  3. updated license year

    fabpot committed Jan 4, 2013
Commits on Dec 19, 2012
Commits on Dec 15, 2012
Commits on Dec 14, 2012
  1. Fixed typos

    pborreli committed Dec 14, 2012
Commits on Dec 12, 2012
Commits on Dec 6, 2012
Commits on Nov 13, 2012
  1. Merge branch '2.1'

    fabpot committed Nov 13, 2012
    * 2.1: (24 commits)
      forced Travis to use source to workaround their not-up-to-date Composer on PHP 5.3.3
      [Routing] removed irrelevant string cast in Route
      Fixed typo
      Make YamlFileLoader and XmlFileLoader file loading extensible
      [HttpKernel] fix typo
      Fixed singularization of "prices"
      [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc.
      [HttpKernel] fixed Client when using StreamedResponses (closes #5370)
      fixed PDO session handler for Oracle (closes #5829)
      [HttpFoundation] fixed PDO session handler for Oracle (closes #5829)
      [Locale] removed a check that is done too early (and it is done twice anyways)
      Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
      Adding new localized strings for farsi validation.
      [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)
      [Form] Fixed forms not to be marked invalid if their children are already marked invalid
      [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
      added missing tests from previous merge
      [Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
      Fix export-ignore on Windows
      Show correct class name InputArgument in error message
      ...
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
Commits on Nov 9, 2012
Commits on Nov 8, 2012
  1. Fix export-ignore on Windows

    gajdaw committed Nov 8, 2012
Commits on Nov 4, 2012
  1. Merge branch '2.1'

    fabpot committed Nov 4, 2012
    * 2.1:
      removed unused use statements
      [Form] Adapted HTML5 format in DateTimeType as response to a closed ICU ticket
      [2.1][HttpFoundation] Fixed Php doc in Request::get
      bumped Symfony version to 2.1.4-DEV
      updated VERSION for 2.1.3
      update CONTRIBUTORS for 2.1.3
      updated CHANGELOG for 2.1.3
      merged branch jakzal/yamlDoubleQuotesDumperFix (PR #4320)
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
Commits on Oct 29, 2012
  1. merged branch jakzal/yamlDoubleQuotesDumperFix (PR #4320)

    fabpot committed Jun 9, 2012
    Commits
    -------
    
    b631073 [Yaml] Fixed double quotes escaping in Dumper.
    
    Discussion
    ----------
    
    [Yaml] Fixed double quotes escaping in Dumper
    
    Issue #4308 is caused by Dumper::escapeWithDoubleQuotes() which uses [str_replace()](http://php.net/str_replace).
    
    From the php docs:
    
    > Because str_replace() replaces left to right, it might replace a previously inserted value when doing multiple replacements.
    
    We should be very careful in deciding about the order of elements in $escapees array. I'd really appreciate if someone reviewed my fix. Tests say I didn't break anything but I'm not sure what percentage of Yaml specification is covered by tests.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: not that I know
    Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/jakzal/symfony.png?branch=yamlDoubleQuotesDumperFix)](http://travis-ci.org/jakzal/symfony)
    Fixes the following tickets: #4308
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-18T08:53:51Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1364279) (merged 5192722c into a04acc89).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-18T23:19:49Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1371539) (merged ecaa1aab into fc3c609b).
    
    ---------------------------------------------------------------------------
    
    by dinamic at 2012-05-19T07:35:21Z
    
    Something is really wrong with this method. You can see clearly that multiple characters would fail proper escaping.
    
    Here's an example:
    ```
    $value = '\\\\"some value\n \"some quoted string\" and \'some single quotes one\'"';
    var_dump(Escaper::escapeWithDoubleQuotes($value));
    string(72) ""\\\"some value\n \\some quoted string\\ and 'some single quotes one'\"""
    ```
    
    To begin with the backslash - in the initial value you have 2 (escaped ones), that after escaping should result in 4, not in 1 (escaped). I guess this behavior has to be verified with the importer, but imho it does not seem right.
    
    Does anyone know why this escaping wasn't done using a regular expression in first place?
    
    ---------------------------------------------------------------------------
    
    by clemens-tolboom at 2012-05-19T10:18:58Z
    
    Searching for https://duckduckgo.com/?q=what+is+\xc2\x85 the table on http://stackoverflow.com/questions/6609895/efficiently-replace-bad-characters is interesting enough to decide we need way more documentation on this file.
    
    \xc2\x85 seems to be triple dot (ellipses)
    \xe2\x80\xa9 seems to be paragraph separator see http://drupal.org/node/914360#comment-3468550
    
    Conflicts:
    	src/Symfony/Component/Yaml/Escaper.php
Commits on Oct 24, 2012
  1. Merge branch '2.1'

    fabpot committed Oct 24, 2012
    * 2.1:
      added missing use statment (closes #5825)
      Code cleanup
      [WebProfilerBundle] Fixed the use of nested macros
      Removed unused use statements.
      Nsdocblocks
      [ConfigDumpReference] avoid notice for variable nodes
      fixed fallback locale
      UniqueValidatorTest, Change message on assertions
      Documented removed _form_is_choice_group function
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
    	src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php