Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 29, 2012
  1. Fabien Potencier

    updated VERSION for 2.1.4

    fabpot authored
  2. Fabien Potencier

    updated CHANGELOG for 2.1.4

    fabpot authored
  3. Fabien Potencier

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [HttpFoundation] reverted variable rename
    
    Conflicts:
    	src/Symfony/Component/HttpFoundation/Request.php
  4. Fabien Potencier
  5. Fabien Potencier

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      replaced magic strings by proper constants
      refactored tests for Request
      fixed the logic in Request::isSecure() (if the information comes from a source that we trust, don't check other ones)
      added a way to configure the X-Forwarded-XXX header names and a way to disable trusting them
      fixed algorithm used to determine the trusted client IP
      removed the non-standard Client-IP HTTP header
    
    Conflicts:
    	src/Symfony/Component/HttpFoundation/Request.php
    	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
  6. Fabien Potencier
  7. Fabien Potencier

    refactored tests for Request

    fabpot authored
  8. Fabien Potencier

    fixed the logic in Request::isSecure() (if the information comes from…

    fabpot authored
    … a source that we trust, don't check other ones)
  9. Fabien Potencier
  10. Fabien Potencier
  11. Fabien Potencier
  12. Fabien Potencier

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      [DependencyInjection] fixed composer.json
      [Form] Updated checks for the ICU version from 4.5+ to 4.7+ due to test failures with ICU 4.6
      fixed CS
      small fix of #5984 when the container param is not set
      fixed CS
      Use better default ports in urlRedirectAction
      Add tests for urlRedirectAction
      Update src/Symfony/Component/DomCrawler/Tests/FormTest.php
      Update src/Symfony/Component/DomCrawler/Form.php
      [Security] remove escape charters from username provided by Digest DigestAuthenticationListener
      [Security] added test extra for digest authentication
      fixed CS
      [Security] Fixed digest authentication
      [Security] Fixed digest authentication
      [SecurityBundle] Convert Http method to uppercase in the config
      Use Norm Data instead of Data
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php
    	src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
    	src/Symfony/Component/DependencyInjection/composer.json
Commits on Nov 27, 2012
  1. Fabien Potencier
Commits on Nov 26, 2012
  1. Fabien Potencier

    merged branch rybakit/validator_messages (PR #6114)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    31c32c5 [Validator] Fix typos in validators.ru.xlf
    
    Discussion
    ----------
    
    [Validator] Fix typos in validators.ru.xlf
    
    This PR fixes PR #6106 as it still [contains some issues](#6106 (comment)).  I also removed the word "файла" ([L119](https://github.com/rybakit/symfony/blob/31c32c551fc2a4a9d5140c5ac554fa65874f3321/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf#L119)), as it is not necessary and there is no such addition in the other messages (e.g. [L167](https://github.com/symfony/symfony/blob/2.1/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf#L167), [L171](https://github.com/symfony/symfony/blob/2.1/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf#L171), ...).
Commits on Nov 25, 2012
  1. Eugene Leonovich
  2. Fabien Potencier

    merged branch andremaha/validator_russian_translation (PR #6106)

    fabpot authored
    This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #6106).
    
    Commits
    -------
    
    e628c26 [Validator] Edited some minor grammar and style errors in russian validation file
    
    Discussion
    ----------
    
    [Validator] Edited some minor grammar and style errors in russian validation file
    
    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:
  3. Andrey Esaulov Fabien Potencier
  4. Fabien Potencier

    merged branch bicpi/add_hasser_hint (PR #6110)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    06ee53b [Form] improve error message with a "hasser" hint for PropertyAccessDeniedException
    
    Discussion
    ----------
    
    [Form] improve error msg w/ a "hasser" hint for PropertyAccessDeniedException
    
    "Hasser" support was added under the 2.1 branch of the Form component
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: no, but fails exactly the same as without this fix
    Fixes the following tickets: -
    Todo: -
    License of the code: MIT
    Documentation PR: symfony/symfony-docs#1958
  5. Fabien Potencier

    merged branch RoumenMe/translation-2.1 (PR #6112)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    7cba683 Updated Bulgarian translation
    
    Discussion
    ----------
    
    [Validator][Form] Updated Bulgarian translation
    
    Added Bulgarian translation for form component.
    Updated Bulgarian translation for validator messages.
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/RoumenMe/symfony.png?branch=translation-2.1)](https://travis-ci.org/RoumenMe/symfony)
    Fixes the following tickets: -
    Todo: -
    License of the code: MIT
    Documentation PR: -
  6. Fabien Potencier

    merged branch bschussek/icu-check-update (PR #6107)

    fabpot authored
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    ac77c5b [Form] Updated checks for the ICU version from 4.5+ to 4.7+ due to test failures with ICU 4.6
    
    Discussion
    ----------
    
    [Form] Updated checks for the ICU version from 4.5+ to 4.7+
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    License of the code: MIT
    Documentation PR: -
Commits on Nov 24, 2012
  1. Roumen Damianoff

    Updated Bulgarian translation

    RoumenDamianoff authored
    Added Bulgarian translation for form component.
    Updated Bulgarian translation for validator messages.
  2. Philipp Rieber

    [Form] improve error message with a "hasser" hint for PropertyAccessD…

    bicpi authored
    …eniedException
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: no, but fails exactly the same as without this fix
    Fixes the following tickets: -
    Todo: -
    License of the code: MIT
    Documentation PR: symfony/symfony-docs#1958
  3. Bernhard Schussek
  4. Fabien Potencier
  5. Fabien Potencier

    merged branch stfalcon/patch-1 (PR #5028)

    fabpot authored
    This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5028).
    
    Commits
    -------
    
    5bfe757 Update src/Symfony/Component/Form/Extension/Core/Type/FileType.php
    
    Discussion
    ----------
    
    Update src/Symfony/Component/Form/Extension/Core/Type/FileType.php
    
    fixed dustin10/VichUploaderBundle#27
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-07-24T12:44:11Z
    
    Thank you for the PR! Could you please add a test case?
    
    ---------------------------------------------------------------------------
    
    by stfalcon at 2012-07-25T13:53:24Z
    
    > Could you please add a test case?
    
    And what to check? I added one static option :)
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-07-25T14:22:40Z
    
    Whatever was the reason for adding the option ;) The test should fail when the option is not added and succeed when the option is there.
    
    Probably it is sufficient to create a new field of type "file" in the test which comes prefilled with a `File` object.
    
    ```
    $file = $this->getMock('Symfony\Component\HttpFoundation\File\File');
    $this->factory->create('file', $file)
    ```
    
    ---------------------------------------------------------------------------
    
    by stfalcon at 2012-11-15T12:32:01Z
    
    sorry, it's bug in VichUploaderBundle
    
    ---------------------------------------------------------------------------
    
    by stfalcon at 2012-11-21T17:00:59Z
    
    or not :)
    
    ---------------------------------------------------------------------------
    
    by stfalcon at 2012-11-22T19:47:34Z
    
    @bschussek done! it was really a bug with FileType
    
    ---------------------------------------------------------------------------
    
    by stfalcon at 2012-11-22T22:15:18Z
    
    @stof who can merge it? I want close this bug dustin10/VichUploaderBundle#27 :)
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-11-23T02:15:46Z
    
    @stfalcon the rule is that only @fabpot merges PRs on symfony.
    
    ---------------------------------------------------------------------------
    
    by stfalcon at 2012-11-23T10:12:05Z
    
    @fabpot do you have a minute :)? it's simple PR but many people wait for it
  6. Stepan Tanasiychuk Fabien Potencier
  7. Fabien Potencier

    merged branch armetiz/patch-9 (PR #6021)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    82334d2 Force loader to be null or a EntityLoaderInterface
    
    Discussion
    ----------
    
    Force loader to be null or a EntityLoaderInterface
  8. Fabien Potencier

    merged branch sterrien/patch-1 (PR #5842)

    fabpot authored
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    2d9a6fc Use Norm Data instead of Data
    
    Discussion
    ----------
    
    [Form] Use Norm Data instead of App Data
    
    This listener is triggered when normalized data are binded.
    
    We have to use $event->getForm()->getNormData() instead of $event->getForm()->getData().
    
    I have made a new FormType having 'entity' as parent and having a NormTransformer. I encountered a problem in MergeCollectionListener when the request is binded.
    
    My commit fix it.
  9. Fabien Potencier

    merged branch bamarni/preloaded-extension (PR #5479)

    fabpot authored
    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    84635bd [Form] allowed no type guesser to be registered
    
    Discussion
    ----------
    
    [Form] made the factory builder pass null when no type guesser registered
    
    reopened #5422 against 2.1 as it's a bug fix
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-10-13T21:23:34Z
    
    @fabpot anything left for this PR ?
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-10-14T09:41:29Z
    
    @bamarni Can you add some unit tests and also update the FormExtensionInterface interface phpdoc as `getTypeGuesser` can now return `null`? Thanks. ping @bschussek
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-10-14T17:10:27Z
    
    I've added a few tests covering this.
    
    @fabpot : the phpdoc is already correct, it currently can return null, this only occurs with this convenient class.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-10-16T07:43:41Z
    
    This PR breaks FormFactory::createBuilderForProperty(), which expects a guesser to be present. Can you check the component for other uses of the guesser and add a null-check there?
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-10-16T10:57:54Z
    
    I cannot find other places than the factory (searching for 'getTypeGuesser').
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-11-08T16:58:37Z
    
    You should also adapt `FormRegistry::getTypeGuesser()` not to build a `FormTypeGuesserChain` if the array of guessers is empty. In that case it will return now `null` (adapt the doc block). We also need a different was of checking if the type guessers have already been parsed in FormRegistry. Otherwise the first if condition in `FormRegistry::getTypeGuesser()` will never become false. You could for example initialize the property `$guesser` to `false` and only set it to `null` after the first run of `getTypeGuesser()`.
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-11-08T18:40:00Z
    
    good catch I had missed it! I've applied your suggestion in the latest commit. Do you see anything else before I squash?
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-11-08T18:45:15Z
    
    A test for `FormRegistry::getTypeGuesser()` would of course be awesome.
    
    ---------------------------------------------------------------------------
    
    by bamarni at 2012-11-08T18:52:13Z
    
    Then it was already awesome! (see https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Form/Tests/FormRegistryTest.php#L252)
    
    I've also added one for the null case if it's what you meant.
  10. Fabien Potencier

    fixed CS

    fabpot authored
  11. Fabien Potencier

    merged branch Tobion/patch-8 (PR #6071)

    fabpot authored
    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    29bfa13 small fix of #5984 when the container param is not set
    
    Discussion
    ----------
    
    small fix of #5984 when the container param is not set
    
     this can happen when the config for the router is unset, but this method does not need to depend on routing. reading an unset config would raise an exception.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-11-19T20:44:31Z
    
    Ops, I guess it's wrong. Travis will probably confirm this in a moment.
    I will correct that.
    
    ---------------------------------------------------------------------------
    
    by flojon at 2012-11-20T22:40:07Z
    
    Yeah you changed the logic...
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-11-21T14:42:48Z
    
    ok it's fixed.
Commits on Nov 21, 2012
  1. Fabien Potencier

    merged branch xkobal/2.1 (PR #6079)

    fabpot authored
    This PR was squashed before being merged into the 2.1 branch (closes #6079).
    
    Commits
    -------
    
    bbeff54 Xliff with other node than source or target are ignored
    
    Discussion
    ----------
    
    Xliff with other node than source or target are ignored
    
    Referring to the xliff XSD, the format can allow other nodes like <note>. Check only count is dangerous if others nodes are present, and we aren't sure that nodes are the two we wan't (source and target)
    
    And the real problem if that if there is other node in translation, the translation is silently ignored.
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2012-11-20T17:44:47Z
    
    You should add test that covers this, as well as #6078 should be closed (branch `2.1` is merged from time to time to `master`).
    
    ---------------------------------------------------------------------------
    
    by xkobal at 2012-11-21T11:13:32Z
    
    I have added a new node to xliff fixtures and edit test to be sure node isn't ignored.
  2. Fabien Potencier

    Xliff with other node than source or target are ignored

    Xavier HAUSHERR authored fabpot committed
  3. Tobias Schultze

    small fix of #5984 when the container param is not set

    Tobion authored
    this can happen when the config for the router is unset, but this method
    does not need to depend on routing. reading an unset config would raise an exception.
Commits on Nov 20, 2012
  1. Fabien Potencier

    merged branch malaney/FilesystemMirrorSymlinkFix (PR #6073)

    fabpot authored
    This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #6073).
    
    Commits
    -------
    
    c1c822b Filesystem Component mirror symlinked directory fix
    
    Discussion
    ----------
    
    Filesystem Component mirror symlinked directory fix
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets:#6070
    Todo:
    License of the code: MIT
    Documentation PR:
    
    Because of the order in which file types (i.e. dir, link, file) are checked in the Filesystem component, symlinked directories get treated as directories instead of symlinks.  As a result symlinked directories are not truly mirrored when performing a php app/console assets:install.  This PR checks that a file is a symlink BEFORE checking that its a directory and properly symlinks as necessary.
Something went wrong with that request. Please try again.