Permalink
Commits on Dec 24, 2011
  1. merged branch willdurand/filesystem-component (PR #2949)

    fabpot committed Dec 24, 2011
    Commits
    -------
    
    4afc6ac Updated CHANGELOG-2.1
    3d3239c Added Filesystem Component mention in composer.json
    5775a0a Added composer.json
    b26ae4a Added README
    fbe9507 Added LICENSE
    818a332 [Component] Moved Filesystem class to its own component
    
    Discussion
    ----------
    
    Filesystem component
    
    Related to #2946
    
    William
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/22 10:58:25 -0800
    
    you need to add the new component in the ``replace``  section of the main composer.json, and you also need to add it as a dependency for FrameworkBundle as it defines a service using it.
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/22 10:59:34 -0800
    
    and you need to update the changelog file
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2011/12/22 11:06:04 -0800
    
    @stof thanks. Is it ok ?
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/22 11:13:31 -0800
    
    mentioning the move only once in the changelog would probably be enough (and it is especially not needed in the FrameworkBundle section IMO) but otherwise it's fine
  2. merged branch stloyd/profile_simplify (PR #2950)

    fabpot committed Dec 24, 2011
    Commits
    -------
    
    9daa2a6 [Profiler] Add function to get parent token directly
    
    Discussion
    ----------
    
    [Profiler] Add function to get parent token directly
    
    ```
    Bug fix: no
    Feature addition: kinda
    Backwards compatibility break: no
    Symfony2 tests pass: yes
Commits on Dec 23, 2011
  1. fixed merge

    fabpot committed Dec 23, 2011
  2. merged 2.0

    fabpot committed Dec 23, 2011
  3. [TwigBridge] simplified code

    fabpot committed Dec 23, 2011
Commits on Dec 22, 2011
  1. Updated CHANGELOG-2.1

    willdurand committed Dec 22, 2011
  2. Added Filesystem Component mention in composer.json

    willdurand committed Dec 22, 2011
    - In the global Symfony2 composer.json file as a replacement
    - In the FrameworkBundle composer.json file as a requirement
  3. Added composer.json

    willdurand committed Dec 22, 2011
  4. Added README

    willdurand committed Dec 22, 2011
  5. Added LICENSE

    willdurand committed Dec 22, 2011
  6. merged branch stof/entity_provider_registry (PR #2928)

    fabpot committed Dec 22, 2011
    Commits
    -------
    
    373ab4c Fixed tests added from 2.0
    9653be6 Moved the EntityFactory to the bridge
    caa105f Removed useless use statement
    24319bb [DoctrineBridge] Made it possible to change the manager used by the provider
    
    Discussion
    ----------
    
    [DoctrineBridge] Made it possible to change the manager used by the provider
    
    This improves the support of several entity managers by allowing using a non-default one for the provider.
    
    It is BC for the user as the default value for the name is ``null`` which means using the default one.
    
    I'm preparing the PR for DoctrineBundle too
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/19 14:16:38 -0800
    
    I'm wondering if the EntityFactory used to integrate the bundles with SecurityBundle should be moved to the bridge or not. Moving it (making the key and the abstract service id configurable) would allow reusing it in all Doctrine bundles instead of copy-pasting it (see the CouchDBBundle pull request linked above).
    The bridge was initially meant to integrate third party libraries with the components and this class is about the SecurityBundle, not the component. But on the other hand, we already share the abstract DI extension between the bundles using the bridge.
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/19 14:17:48 -0800
    
    @fabpot @beberlei thoughts ?
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/21 04:43:50 -0800
    
    @fabpot @beberlei what do you thing about moving the EntityFactory to the bridge ?
    
    ---------------------------------------------------------------------------
    
    by henrikbjorn at 2011/12/21 05:10:56 -0800
    
    Missing mongodb bundle
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/21 05:52:06 -0800
    
    @henrikbjorn I was planning to send the PR for mongodb too but the namespace change was not merged yet yesterday. And now, you want to wait for the answer to know if I need to copy-paste the factory to the mongodb bundle too or if I move it to the bridge
    
    ---------------------------------------------------------------------------
    
    by beberlei at 2011/12/21 15:14:17 -0800
    
    I think moving it to the Bridge makes sense if we can re-use across all the bundles then. Also it is really about integrating security with doctrine, so its a bridge topic.
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/22 08:39:52 -0800
    
    I updated the PR to move the factory to the bridge. The DoctrineBundle and DoctrineCouchDBBundle PRs are updated too.
    
    @fabpot the PR should be ready to be merged
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/12/22 08:53:02 -0800
    
    Tests do not pass for me:
    
        ...E
    
        Time: 0 seconds, Memory: 14.75Mb
    
        There was 1 error:
    
        1) Symfony\Tests\Bridge\Doctrine\Security\User\EntityUserProviderTest::testSupportProxy
        Argument 1 passed to Symfony\Bridge\Doctrine\Security\User\EntityUserProvider::__construct() must implement interface Doctrine\Common\Persistence\ManagerRegistry, instance of Doctrine\ORM\EntityManager given, called in tests/Symfony/Tests/Bridge/Doctrine/Security/User/EntityUserProviderTest.php on line 89 and defined
    
        src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php:35
        tests/Symfony/Tests/Bridge/Doctrine/Security/User/EntityUserProviderTest.php:89
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/22 08:56:33 -0800
    
    @fabpot I fixed it before your comment (thanks travis ^^). It was the test added in my other PR to 2.0 and so not updated in the original commit. I forgot it when rebasing
  7. Fixed tests added from 2.0

    stof committed Dec 22, 2011
  8. merged branch Burgov/doctrine_choice_with_proxy_object_fix (PR #2944)

    fabpot committed Dec 22, 2011
    Commits
    -------
    
    0a9ea26 fixed the display of the current value in a doctrine entity type, when the current value is for example an instance of Doctrine\Orm\Proxy\Proxy and is not yet initialized
    
    Discussion
    ----------
    
    fixed the display of the current value in a doctrine entity type
    
     when the current value is an instance of Doctrine\Orm\Proxy\Proxy
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    
    Arguably, this is a Doctrine issue rather than a Symfony one, but when the current value in the entity type is a proxy instance, no item is selected, because "$this->reflFields[$this->identifier[0]]->getValue($entity);" (in ClassMetadata) always returns null unless the entity is loaded
    
    ---------------------------------------------------------------------------
    
    by Gregwar at 2011/12/22 07:07:34 -0800
    
    +1 for this
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/22 08:30:44 -0800
    
    @fabpot this is good for the merge now
  9. fixed the display of the current value in a doctrine entity type, whe…

    Burgov committed Dec 22, 2011
    …n the current value is for example an instance of Doctrine\Orm\Proxy\Proxy and is not yet initialized
  10. Removed useless use statement

    stof committed Dec 19, 2011
  11. merged branch Burgov/fix_entity_choice_list (PR #2942)

    fabpot committed Dec 22, 2011
    Commits
    -------
    
    c60f036 fixed typo
    231e79c fixed entity choice list BC break
    
    Discussion
    ----------
    
    fixed EntityChoiceList BC break
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: fixes a BC break
    Symfony2 tests pass: yes
    
    This PR resolves a serious BC break introduced in commit b919d92
    Prior to this commit, it was possible to use the entity shorthand notation in the EntityChoiceList constructor, but it broke because the EntityChoiceList now expects the second argument to be the actual class name
    
    There is another issue at hand here, but I'm not sure how to fix it:
    
    The EntityChoiceManager expects an Doctrine\Common\Persistence\ObjectManager instance, then the ClassMetadata is fetched from it and the method getIdentifierFieldNames is called on it. Yet, according to the docblock, getClassMetadata of the ObjectManager returns an instance of Doctrine\Common\Persistence\Mapping\ClassMetadata, which doesn't have a getIdentifierFieldNames() method.
    
    So either the EntityChoiceList should expect an instance of EntityManager, or it should be rewritten to not use getIdentifierFieldNames() anymore.
    
    Any ideas?
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/12/22 03:48:49 -0800
    
    ping @beberlei
    
    ---------------------------------------------------------------------------
    
    by beberlei at 2011/12/22 04:02:30 -0800
    
    The fix is valid
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/12/22 04:54:53 -0800
    
    @beberlei getIdentifierFieldNames should probably be added in the interface too. Currently, we only have isIdentifier in it.
    
    This methods needs to be implemented in the MongoDB ODM though (simply returning ``array($this->getIdentifier())``
  12. fixed typo

    Burgov committed Dec 22, 2011
  13. fixed entity choice list BC break

    Burgov committed Dec 22, 2011
  14. merged branch kriswallsmith/http/apache-request (PR #2940)

    fabpot committed Dec 22, 2011
    Commits
    -------
    
    1b4aaa2 [HttpFoundation] fixed ApacheRequest
    
    Discussion
    ----------
    
    [HttpFoundation] fixed ApacheRequest
    
    Pathinfo was incorrect when using mod_rewrite.
    Added better test coverage.
Commits on Dec 21, 2011
  1. [HttpFoundation] fixed ApacheRequest

    kriswallsmith committed Dec 21, 2011
    Pathinfo was incorrect when using mod_rewrite.
    Added better test coverage.
  2. merged branch marekkalnik/upload-flash (PR #2938)

    fabpot committed Dec 21, 2011
    Commits
    -------
    
    8235848 [HttpFoundation][File] Add flv file default extension
    
    Discussion
    ----------
    
    [HttpFoundation][File] Add flv file default extension
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes (doesn't affect tests)
    Fixes the following tickets: -
    Todo: -
    
    This commit adds default extension for video/x-flv mime-type, which is a Flash Video file. Lack of this definition causes File::guessExtension() return null for this type of file, which breaks uploaded file in some user cases.
  3. merged branch mdemirci/2.0 (PR #2937)

    fabpot committed Dec 21, 2011
    Commits
    -------
    
    5a6c989 FrameworkBundle: Adding test-attribute in xsd-schema to write functional-tests if using xml-configurations
    
    Discussion
    ----------
    
    [FrameworkBundle] Adding test-attribute in xsd-schema
    
     to write functional-tests if using xml-configurations
  4. FrameworkBundle: Adding test-attribute in xsd-schema to write functio…

    mdemirci committed Dec 21, 2011
    …nal-tests if using xml-configurations
  5. Merge branch '2.0'

    fabpot committed Dec 21, 2011
    * 2.0:
      [HttpKernel] fixed unit tests that can fail randomly
  6. merged branch stloyd/missingClientTransformer (PR #2421)

    fabpot committed Dec 21, 2011
    Commits
    -------
    
    49d2685 [Form] Add default validation to TextType field (and related)
    
    Discussion
    ----------
    
    [Form] Add default transformer to TextType field (and related)
    
    Bug fix: yes&no (?)
    Feature addition: yes (?)
    BC break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #1962.
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2011/12/19 03:43:37 -0800
    
    @fabpot ping ;-)
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/12/19 10:58:20 -0800
    
    Is it really needed? I have a feeling that it enforces unneeded constraints, but I can be wrong of course.
    
    ---------------------------------------------------------------------------
    
    by hlecorche at 2011/12/20 02:31:03 -0800
    
    It's needed because with TextType field, and without the ValueToStringTransformer, the user data (when sending the form) can be an array !!!
    
    For example:
    - if there is a TextType field
    - and if there is a MaxLengthValidator
    - and if the user data (when sending the form) is an array
    So the exception "Expected argument of type string, array given in src\Symfony\Component\Validator\Constraints\MaxLengthValidator.php at line 40" is thrown
Commits on Dec 20, 2011
  1. merged 2.0

    fabpot committed Dec 20, 2011