Skip to content
Commits on Aug 7, 2012
  1. @jmikola

    Merge branch '2.0'

    Conflicts:
    	composer.json
    jmikola committed Aug 7, 2012
  2. @jmikola
  3. @jmikola

    Merge branch '2.0'

    jmikola committed Aug 7, 2012
  4. @jmikola
  5. @jmikola

    Merge branch '2.0'

    Conflicts:
    	Command/LoadDataFixturesDoctrineODMCommand.php
    jmikola committed Aug 7, 2012
  6. @jmikola
  7. @jmikola

    Merge pull request #142 from doctrine/2.0-data-fixtures-dep

    Check for data fixtures dependency in command
    jmikola committed Aug 7, 2012
  8. @jmikola

    Check for data fixtures dependency in command

    See: doctrine/DoctrineMongoDBBundle#133 and 3f0f563 for the equivalent 2.1 commit.
    jmikola committed Aug 7, 2012
Commits on Jul 31, 2012
  1. @stof

    Merge pull request #139 from khepin/patch-1

    Update Form/DoctrineMongoDBTypeGuesser.php
    stof committed Jul 31, 2012
  2. @khepin

    Update Form/DoctrineMongoDBTypeGuesser.php

    The option 'em' cannot be set after #129 has been merged. Here's how things are happening:
    
    Following #129, there is a check that an 'em' option already exists or not on a given form.
    
    Everything works fine if I write my form like:
    
    
    
    
        public function buildForm(FormBuilderInterface $builder, array $options)
        {
            $builder
                ->add('pizza', 'document', ['class' => 'Restaurant\PizzaBundle\Document\Pizza'])
                ->add(// other things )
            ;
        }
    
    
    
    
    But if I only write:
    
    
    
    
        public function buildForm(FormBuilderInterface $builder, array $options)
        {
            $builder
                ->add('pizza')
                ->add(// other things )
            ;
        }
    
    
    
    
    Then I get an exception thrown by the DocumentType at https://github.com/doctrine/DoctrineMongoDBBundle/blob/master/Form/Type/DocumentType.php#L57
    
    
    
    
    Because the MongoDBTypeGuesser does set the 'em' option at 
    https://github.com/doctrine/DoctrineMongoDBBundle/blob/master/Form/DoctrineMongoDBTypeGuesser.php#L58
    khepin committed Jul 31, 2012
Commits on Jul 30, 2012
  1. @stof

    Merge pull request #137 from web-dev/type-guesser-exception

    Changed the Type Guesser to catch the common MappingException.
    stof committed Jul 30, 2012
Commits on Jul 27, 2012
  1. @Josiah

    Changed the Type Guesser to catch the common MappingException. This m…

    …akes the type guesser compatible with doctrine/mongodb-odm@6220a23
    Josiah committed Jul 27, 2012
Commits on Jul 24, 2012
  1. @jmikola

    Merge branch '2.0'

    jmikola committed Jul 24, 2012
  2. @jmikola
  3. @jmikola

    Merge branch '2.0'

    Conflicts:
    	Tests/bootstrap.php
    jmikola committed Jul 24, 2012
  4. @jmikola
  5. @jmikola

    Update test suite driver to 1.2.12

    Also remove suppression of deprecation notices, which was added for the 1.2.11 driver.
    jmikola committed Jul 24, 2012
  6. @stof

    Merge pull request #133 from henrikbjorn/fixtures-command

    Add DataFixtures library as dev dependency and as a suggested package.
    stof committed Jul 24, 2012
  7. @henrikbjorn

    Add DataFixtures library as dev dependency and as a suggested package.

    Disable the LoadDataFixturesDoctrineODMCommand when DataFixtures cannot
    be found (incl Tests). This only works for 2.1+
    henrikbjorn committed Jul 24, 2012
Commits on Jul 23, 2012
  1. @jmikola

    Merge pull request #85 from stof/proxy_autoload

    Added an autoloader for proxies
    jmikola committed Jul 23, 2012
  2. @stof

    Merge pull request #131 from henrikbjorn/forms

    Fix defaults also to work with parent
    stof committed Jul 23, 2012
  3. @henrikbjorn
  4. @stof
  5. @stof

    Merge pull request #129 from henrikbjorn/forms

    Update to match new OptionsResolver for Form types.
    stof committed Jul 23, 2012
  6. @henrikbjorn
  7. @henrikbjorn
Commits on Jul 20, 2012
  1. @jmikola

    Revert "Account for AbstractDoctrineExtension's assumptions about ORM…

    … mapping drivers"
    
    This reverts commit f4dab7c, which was intended only for the 2.0 branch.
    jmikola committed Jul 20, 2012
  2. @jmikola

    Merge branch '2.0'

    Conflicts:
    	Mapping/Driver/XmlDriver.php
    	Mapping/Driver/YamlDriver.php
    	Tests/ContainerTest.php
    	Tests/Mapping/Driver/XmlDriverTest.php
    	Tests/Mapping/Driver/YamlDriverTest.php
    	Tests/bootstrap.php
    jmikola committed Jul 20, 2012
  3. @jmikola

    Merge pull request #124 from doctrine/2.0-common-mapping

    Utilize Doctrine common for mappings
    jmikola committed Jul 20, 2012
  4. @jmikola

    Account for AbstractDoctrineExtension's assumptions about ORM mapping…

    … drivers
    
    Since the ODM is using Doctrine Common's mapping drivers for Symfony 2.0, we need to remove the setNamespacePrefixes() method call and instead pass its argument to the driver constructor.
    
    See: symfony/symfony@3ca1ccb for some historical context.
    jmikola committed Jul 20, 2012
  5. @jmikola
Commits on Jul 19, 2012
  1. @jmikola
  2. @stof @jmikola

    Fixed the exception name

    stof committed with jmikola Jul 19, 2012
  3. @stof @jmikola

    Updated the mapping drivers to the new implementation

    This goes with the changes done in doctrine/mongodb-odm#350
    stof committed with jmikola Jul 7, 2012
  4. @jmikola
Something went wrong with that request. Please try again.