Permalink
Commits on May 1, 2012
  1. merged branch shieldo/fix_exception_message (PR #4173)

    Commits
    -------
    
    69e0451 [Security] fixed English grammar in exception message
    
    Discussion
    ----------
    
    [Security] fixed English grammar in exception message
    fabpot committed May 1, 2012
  2. [HttpKernel] fixed typo

    fabpot committed May 1, 2012
  3. merged branch willdurand/fix-components (PR #4155)

    Commits
    -------
    
    c195957 [Components] Tests/Autoloading fixes
    
    Discussion
    ----------
    
    Fix components
    
    See #4141
    
    ----
    This PR:
    
    * configures each component to use composer to manage "dev" dependencies instead of env variables;
    * adds phpunit configuration file on Filesystem component;
    * fixes READMEs.
    
    It's mergeable without any problems, but I would recommend to wait a fix in Composer in order to use `self.version` in `require`/`require-dev` sections.
    
    Note: I kept `suggest` sections because it makes sense but this PR doesn't aim to provide useful explanations for each entry. It could be another PR, not that one.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-04-30T20:43:13Z
    
    @fabpot I reviewed each component, one by one. Now `phpunit` always works, even if tests are skipped. A simple `composer install --dev` allows to run the complete test suite. Each commit is well separated from the others. I guess, everything is ok now.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-30T20:47:00Z
    
    Please squash, as it makes no sense to have the same commit for each component.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-01T14:26:11Z
    
    Can you squash your commits before I merge? Thanks.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-05-01T14:29:38Z
    
    done
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-01T15:48:25Z
    
    It does not seem that the commits are squashed.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-05-01T15:54:08Z
    
    done
    fabpot committed May 1, 2012
  4. [Components] Tests/Autoloading fixes

    * Switched to Composer to manage "dev" dependencies
    * Fixed READMEs
    * Excluded vendor in phpunit.xml.dist files
    * Fixed message in bootstrap.php files
    * Added autoloader for the component itself
    willdurand committed Apr 27, 2012
  5. merged branch pulzarraider/httpfoundation_changelog_fix (PR #4169)

    Commits
    -------
    
    ea3f8c5 [HttpFoundation] added native Redis session handler to CHANGELOG
    
    Discussion
    ----------
    
    [HttpFoundation] Added native Redis session handler to CHANGELOG
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    fabpot committed May 1, 2012
  6. fixed CS

    fabpot committed May 1, 2012
  7. merged branch 1ed/hungarian-validator-messages (PR #4154)

    Commits
    -------
    
    fa45f0e [FrameworkBundle] updated hungarian validator messages
    
    Discussion
    ----------
    
    [FrameworkBundle] updated hungarian validator messages
    fabpot committed May 1, 2012
Commits on Apr 30, 2012
  1. merged branch pulzarraider/redis_const_profiler_fix (PR #4164)

    Commits
    -------
    
    991474b [HttpKernel] RedisProfilerStorage - Fix falling unit tests when Redis extension is not available
    
    Discussion
    ----------
    
    [HttpKernel] RedisProfilerStorage - Fix falling unit tests when Redis extension is not available
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    
    Fix error of my PR #4150
    
    Unit tests were falling if Redis extension was not available. It was caused by using Redis constants.
    fabpot committed Apr 30, 2012
  2. [HttpKernel] RedisProfilerStorage - Fix falling unit tests when Redis…

    … extension is not available
    pulzarraider committed Apr 30, 2012
  3. merged branch pulzarraider/memcache_profiler_update (PR #4150)

    Commits
    -------
    
    1f6c8d5 [HttpKernel] Added mock objects for Memcache(d) and Redis
    e17217b [HttpKernel] Remove destructive flush() from memcache(d) storage profilers
    
    Discussion
    ----------
    
    [HttpKernel] Memcache and Redis profiler storage update
    
    Bug fix: no
    Feature addition: yes
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    
    Changes of this PR:
    
    - change ```purge()``` method of memcache(d) profiler storage to delete only required items and be less destructive,
    - mock objects for Redis and Memcache(d) storages were added to make unit tests independent from memcache(d)/redis extensions and memcache(d)/redis servers running on localhost.
    fabpot committed Apr 30, 2012
  4. merged branch adanlobato/master (PR #4130)

    Commits
    -------
    
    42a73f4 Typo fix
    
    Discussion
    ----------
    
    [Typo] Removed extra 's'
    fabpot committed Apr 30, 2012
Commits on Apr 29, 2012
  1. merged branch iambrosi/spelling (PR #4147)

    Commits
    -------
    
    7dfd410 Fixes typos
    
    Discussion
    ----------
    
    Fixed typos
    fabpot committed Apr 29, 2012
Commits on Apr 28, 2012
  1. Fixes typos

    iambrosi committed Apr 28, 2012
Commits on Apr 27, 2012
  1. Revert "merged branch Tobion/patch-3 (PR #4136)"

    This reverts commit 606ddf4, reversing
    changes made to 00e7a94.
    fabpot committed Apr 27, 2012
  2. Revert "merged branch Seldaek/master (PR #4133)"

    This reverts commit 00e7a94, reversing
    changes made to a01dec0.
    fabpot committed Apr 27, 2012
  3. merged branch bschussek/issue3994 (PR #4046)

    Commits
    -------
    
    246c885 [Form] Fixed: Default value of 'error_bubbling' is now determined by the 'single_control' option
    d3bb4d0 [Form] Renamed option 'primitive' to 'single_control'
    167e64f [Form] Fixed: Field attributes are not rendered in the label anymore. Label attributes are now passed in "label_attr"
    68018a1 [Form] Dropped useless test that is guaranteed by OptionsParser tests and that needs to be adapted very often
    649752c [Form] Fixed: CSRF token was not displayed on empty complex forms
    c623fcf [Form] Fixed: CSRF protection did not run if token was missing
    eb75ab1 [Form] Fixed results of the FieldType+FormType merge.
    
    Discussion
    ----------
    
    [Form] Fixed errors introduced in the FieldType+FormType merge
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: yes
    Symfony2 tests pass: yes
    Fixes the following tickets: #3994, #4000, #2294, #4118
    Todo: -
    
    ![Travis Build Status](https://secure.travis-ci.org/bschussek/symfony.png?branch=issue3994)
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-22T15:39:20Z
    
    `primitive` is a pretty abstract option name. It depends on the person what he considers primitive. Maybe more explicit naming or better documentation what it means.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-22T15:47:29Z
    
    Better suggestions?
    
    The distinction here is between primitive and complex forms, where primitive forms are such forms that can be represented by a single HTML tag. This obviously needs to be documented.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-22T15:49:45Z
    
    Maybe `single_widget` or something like that.
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-04-23T13:09:43Z
    
    @Tobion @bschussek would `elementary` be better than `primitive` ?
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-04-23T13:17:04Z
    
    and `compound \ composite` better than `complex` ?
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-23T14:08:33Z
    
    @vicb I fail to see how elementary/compound is easier to understand than primitive/complex. Maybe single_widget, but what's the opposite of this case? multi_widget?
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-04-23T14:15:09Z
    
    Actually I am fine with anything... as long as it is documented.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-23T14:22:31Z
    
    Still I think that this unveals a more profound naming problem. How do we (also in the documentation) name forms with children (formerly "forms") and forms without children (formerly "fields")?
    
    Should we refer to them as
    
    * forms and fields?
    * complex and primitive forms?
    * ...
    
    We must first answer this question before we can find an intuitive option name. If the documentation always switches between different terminologies, neither will it be understandable nor will this option be easy to remember.
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-04-23T15:10:32Z
    
    > Still I think that this unveals a more profound naming problem. How do we (also in the documentation) name forms with children (formerly "forms") and forms without children (formerly "fields")?
    
    To make it clear, I would rather say forms that **can have** children and forms that **can not have** children (i.e. Empty collections have no children but they can have and this is reason why you have to introduce those options, right ? - that could be a good example for the doc).
    
    It will probably be better to refer to "complex" / "primitive" forms in the doc (and use the "form" / "field" terms to explain them).
    
    Note: I think @Tobion concern is that "primitive" / "complex" could be pejorative terms (this is why I have proposed "elementary" / "compound").
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-23T16:00:54Z
    
    1. primitive/complex is subjective (and could be pejorative too)
    2. elementary/compound is more explicit so probably better than primitive/complex
    3. I dislike this option in general. Does it make sense to change this option from a user perspective? I guess it's always the same as long as the widget structure stays the same. So it should be resolved at a higher level dynamically from the widget structure and not exposed to any configuration.
    4. In documentation I would use the terms forms and fields. Because all people with HTML knowledge will understand that fields cannot have sub-fields whereas forms can. But since this distinction is not findable in code, it should be mentioned that all these are implemented as a form hierarchy.
    
    ---------------------------------------------------------------------------
    
    by mvrhov at 2012-04-23T16:02:00Z
    
    how about simple and complex?
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-23T16:06:33Z
    
    @Tobion It does not make sense to change this option from the user perspective, still the overloading type has to propagate to FormType whether it is a form or a field, so that the default behaviour is correct.
    
    A second option how to implement this is to add a method `isField` to FormTypeInterface that can be overloaded and receives the options. I don't really like to introduce new methods here unless absolutely required.
    
    What about renaming the option "primitive" to "is_field"? The blocks in the template would then be named "form_widget_field" and "form_widget_form".
    
    ---------------------------------------------------------------------------
    
    by tristanbes at 2012-04-25T14:01:06Z
    
    Oh, I should've seen this before, i thought I was doing something wrong. (empty collections gets an input field bug)
    
    Please big :UP: on this. When will it be merged ? @bschussek
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-25T15:30:28Z
    
    +1 for "is_field" and "form_widget_field" but I would rather use "form_widget_compound" instead of "form_widget_form" which is quite strange.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-26T16:34:04Z
    
    @Tobion "simple" and "compound" then?
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-26T16:49:58Z
    
    no "field" and "compound"
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-26T17:17:02Z
    
    I don't like "field" for a simple reason: Consider the "date" type. We are typically speaking of the "date" field there. But technically, the "date" field is a compound field. So?
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-26T21:17:37Z
    
    I don't understand the open question. You proposed "is_field" and "form_widget_field" yourself. So calling the template block "form_widget_field" is a comprehensible consequence of "is_field". I wouldn't call the date type with multiple inputs a field.
    
    ---------------------------------------------------------------------------
    
    by tristanbes at 2012-04-26T21:52:39Z
    
    We should take a decision cause right here i got all my forms that are broken because of the empty collection rendering as input field :-).
    
    I guess we are many in that situation.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-27T08:28:16Z
    
    I renamed "primitive" to "single_control" now to match with the HTML specification which names all input elements (input, select etc.) "controls". The opposite is now "compound".
    
    Meanwhile, I added a fix for #4118.
    
    @fabpot This is ready for merge now.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-27T10:22:49Z
    
    Hm, I know naming things is hard and sometimes not really important. But since users need to know which block to override, it is essential to make it clear. I think there is still one issue.
    The block is named `form_widget_single_control` in order, as you said, to abstract away if it's an input, select etc. But in fact it can only render `input` and nothing else. So this is misleading.
    So you could also simply name it `form_widget_input`.
    Apart from that I agree with everything.
    fabpot committed Apr 27, 2012
  4. merged branch Tobion/patch-3 (PR #4136)

    Commits
    -------
    
    5a85c2a bump master branch to version 2.2
    
    Discussion
    ----------
    
    bump master branch to version 2.2
    fabpot committed Apr 27, 2012
  5. merged branch Seldaek/master (PR #4133)

    Commits
    -------
    
    00c4267 Update branch aliases
    
    Discussion
    ----------
    
    Update master branch alias to target 2.2
    fabpot committed Apr 27, 2012
  6. bump master branch to version 2.2

    Tobion committed Apr 27, 2012
  7. Update branch aliases

    Seldaek committed Apr 27, 2012
  8. [Form] Fixed: Default value of 'error_bubbling' is now determined by …

    …the 'single_control' option
    webmozart committed Apr 27, 2012
  9. Typo fix

    adanlobato committed Apr 27, 2012
  10. [Form] Fixed: Field attributes are not rendered in the label anymore.…

    … Label attributes are now passed in "label_attr"
    webmozart committed Apr 20, 2012
  11. [Form] Dropped useless test that is guaranteed by OptionsParser tests…

    … and that needs to be adapted very often
    webmozart committed Apr 20, 2012
  12. merged branch shieldo/patch-3 (PR #4128)

    Commits
    -------
    
    ca52348 [Validator] fixed grammar in exception message
    
    Discussion
    ----------
    
    [Validator] fixed grammar in exception message
    fabpot committed Apr 27, 2012