Permalink
Commits on Jan 19, 2013
  1. @beberlei
  2. @beberlei

    Merge pull request #543 from carlosbuenosvinos/master

    Make doctrine a Light-weight distribution package in Composer
    beberlei committed Jan 19, 2013
Commits on Jan 14, 2013
  1. @guilhermeblanco

    Merge pull request #549 from FabioBatSilva/DDC-1376

    [DDC-1376] Support for order by association when using findBy
    guilhermeblanco committed Jan 14, 2013
  2. @FabioBatSilva

    Fix DDC-1376

    FabioBatSilva committed Jan 14, 2013
Commits on Jan 12, 2013
  1. @beberlei

    Merge branch 'DDC-2231'

    beberlei committed Jan 12, 2013
  2. @beberlei

    DDC-2231 - Simplify test

    beberlei committed Jan 12, 2013
Commits on Jan 10, 2013
  1. @guilhermeblanco

    Merge pull request #548 from nemekzg/DDC-2203

    Fix for DDC-2203
    guilhermeblanco committed Jan 10, 2013
  2. @nemekzg

    Fix for DDC-2203

    nemekzg committed Jan 10, 2013
  3. @stefankleff

    Added test

    stefankleff committed Jan 10, 2013
  4. @stefankleff

    fixed indentation

    Restored old way of injection to just inject it during a refresh
    Added injection for initialized proxies
    stefankleff committed Jan 10, 2013
  5. @stefankleff

    The EntityManager was not injected in uninitialized proxys which are …

    …ObjectManagerAware.
    
    I ran into that problem while I had two objects in the identitymap while hydrating a collection: one was new a "real" entity and the other one was an uninitialized proxy. For "real" entities the em is injected in line 2427, for new entities it is injected in 2436->2364, but for proxies this is missing. According to the comment "inject ObjectManager into just loaded proxies." the code in line 2427 should do this, but in fact it is just used if it is a "real" entity or an already initialized proxy. Moving the injection to outside of the condition in line 2411 (if the entity is an unitialized proxy) solves this.
    stefankleff committed Jan 10, 2013
Commits on Jan 6, 2013
  1. @beberlei
  2. @beberlei

    Merge branch 'DDC-2173'

    beberlei committed Jan 6, 2013
  3. @beberlei
  4. @frosas @beberlei

    No huge if clause

    frosas committed with beberlei Jul 22, 2012
  5. @frosas @beberlei
  6. @beberlei
  7. @beberlei
  8. @beberlei

    DDC-2192 - Prevent using append flag in case of where and having to a…

    …void user confusion, because this is not allowed.
    beberlei committed Jan 6, 2013
  9. @beberlei
Commits on Dec 29, 2012
  1. Update .gitattributes

    Fix TYPO
    Carlos Buenosvinos committed Dec 29, 2012
Commits on Dec 28, 2012
  1. XSD, license and upgrade should be distributed

    Carlos Buenosvinos committed Dec 28, 2012
  2. Make doctrine light-weight for composer

    Carlos Buenosvinos committed Dec 28, 2012
Commits on Dec 24, 2012
  1. @beberlei
  2. @beberlei

    Merge branch 'DDC-2175'

    beberlei committed Dec 24, 2012
  3. @beberlei
  4. @beberlei

    Merge pull request #538 from FabioBatSilva/identity-composite-key

    IDENTITY() Support composite primary key
    beberlei committed Dec 24, 2012
  5. @beberlei

    Merge branch 'DDC-2187'

    beberlei committed Dec 24, 2012
  6. @docteurklein @beberlei

    use base events

    docteurklein committed with beberlei Dec 5, 2012
Commits on Dec 23, 2012
  1. @beberlei

    Merge pull request #528 from BenMorel/master

    Documentation fixes
    beberlei committed Dec 23, 2012
Commits on Dec 22, 2012
  1. @FabioBatSilva

    fix PHPDoc

    FabioBatSilva committed Dec 17, 2012
  2. @FabioBatSilva

    Fix CS

    FabioBatSilva committed Dec 17, 2012
  3. @FabioBatSilva
  4. @beberlei

    Merge pull request #540 from FabioBatSilva/DDC-2208

    [DDC-2208] Fix DDC-2208
    beberlei committed Dec 22, 2012