Benjamin Eberlei
6f572a61c7
Merge branch 'DDC-2231'
2013-01-12 10:29:20 +01:00
Benjamin Eberlei
3ccbbcb0b5
DDC-2231 - Simplify test
2013-01-12 10:29:11 +01:00
Guilherme Blanco
71efe2109a
Merge pull request #548 from nemekzg/DDC-2203
...
Fix for DDC-2203
2013-01-10 11:13:18 -08:00
nemekzg
cfd1b07ffe
Fix for DDC-2203
2013-01-10 16:52:19 +01:00
Stefan Kleff
6032e3efd8
Added test
2013-01-10 16:10:29 +01:00
Stefan Kleff
dc925cc9c5
fixed indentation
...
Restored old way of injection to just inject it during a refresh
Added injection for initialized proxies
2013-01-10 15:19:44 +01:00
Stefan Kleff
151192ae37
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.
2013-01-10 14:54:52 +01:00
Benjamin Eberlei
0b2d3d4f5d
DDC-2173 - Correct issue is about "postFlush" not "preFlush" and add test
2013-01-06 19:16:12 +01:00
Benjamin Eberlei
c20cfed6ae
Merge branch 'DDC-2173'
2013-01-06 19:12:02 +01:00
Benjamin Eberlei
512a001e8c
DDC-2173 - Add Test for new OnFlush or PreFlush behavior and update UPGRADE.md
2013-01-06 19:11:52 +01:00
Francesc Rosàs
1e669132c2
No huge if clause
2013-01-06 19:05:46 +01:00
Francesc Rosàs
9322ca7052
Ensure onFlush and postFlush events are always raised
2013-01-06 19:05:46 +01:00
Benjamin Eberlei
ce290bc99b
DDC-1698 - Allow autoload registration from a Configuration instance
2013-01-06 11:07:19 +01:00
Benjamin Eberlei
7dfe0cae08
DDC-1698 - Prepend autoloader to stack and fix CS
2013-01-06 11:03:58 +01:00
Benjamin Eberlei
4210969087
DDC-2192 - Prevent using append flag in case of where and having to avoid user confusion, because this is not allowed.
2013-01-06 10:33:57 +01:00
Benjamin Eberlei
32f4be83b1
Fix composer to only allow DBAL 2.4 DEV and larger
2013-01-06 10:06:03 +01:00
Guilherme Blanco
fbd1e7bc45
Merge pull request #147 from aaronmu/master
...
Fix syntax error in one of the orderBy examples.
2013-01-04 06:22:22 -08:00
Aaron Muylaert
b0a24c8baa
Update en/reference/query-builder.rst
...
Fix syntax error in one of the orderBy examples.
2013-01-04 11:29:34 +01:00
Carlos Buenosvinos
1b5d4316fe
Update .gitattributes
...
Fix TYPO
2012-12-29 21:08:21 +01:00
Carlos Buenosvinos
2eb4849a69
XSD, license and upgrade should be distributed
2012-12-28 16:55:49 +01:00
Carlos Buenosvinos
9354e70fd3
Make doctrine a light-weight package based in http://getcomposer.org/doc/02-libraries.md#light-weight-distribution-packages
2012-12-28 16:46:41 +01:00
Carlos Buenosvinos
0577f73ef5
Make doctrine light-weight for composer
2012-12-28 16:41:38 +01:00
Benjamin Eberlei
90b6d5e293
Merge branch 'master' of github.com:doctrine/doctrine2
2012-12-24 10:40:52 +01:00
Benjamin Eberlei
59ffbd5f8d
Merge branch 'DDC-2175'
2012-12-24 10:40:10 +01:00
Benjamin Eberlei
e2c1ff1a48
[DDC-2175] Fix bug in JoinedSubclassPersister
2012-12-24 10:39:23 +01:00
Benjamin Eberlei
904effcf4e
Merge pull request #538 from FabioBatSilva/identity-composite-key
...
IDENTITY() Support composite primary key
2012-12-24 01:19:05 -08:00
Benjamin Eberlei
7cf26950cc
Merge branch 'DDC-2187'
2012-12-24 10:15:47 +01:00
Klein Florian
8443eee628
use base events
2012-12-24 10:15:25 +01:00
Benjamin Eberlei
e319e34783
Merge pull request #528 from BenMorel/master
...
Documentation fixes
2012-12-23 12:22:09 -08:00
Benjamin Eberlei
d8b94b0527
Some text refactorings in tutorial
2012-12-23 13:05:54 +01:00
Fabio B. Silva
3d99711ac8
fix PHPDoc
2012-12-22 10:36:23 -02:00
Fabio B. Silva
99ab58febd
Fix CS
2012-12-22 10:36:23 -02:00
Fabio B. Silva
2e90cd9924
Identity function support composite primary key
2012-12-22 10:36:23 -02:00
Benjamin Eberlei
6f5948746e
Merge pull request #540 from FabioBatSilva/DDC-2208
...
[DDC-2208] Fix DDC-2208
2012-12-22 03:53:14 -08:00
Benjamin Eberlei
015771f10b
Merge pull request #541 from PSchwisow/master
...
Fix DDC-1690
2012-12-22 03:38:03 -08:00
Patrick Schwisow
0b21046fce
[DDC-1690] Added an empty line as requested.
2012-12-21 15:35:32 -06:00
Patrick Schwisow
bc6921504a
[DDC-1690] Created unit test
2012-12-21 14:32:10 -06:00
Fabio B. Silva
b6b493f450
test parentheses
2012-12-21 10:00:40 -02:00
Fabio B. Silva
eda43c77bb
Fix DDC-2208
2012-12-21 10:00:40 -02:00
Guilherme Blanco
a8340cc980
Merge pull request #146 from noginn/patch-1
...
Added missing "new" keyword for event listener
2012-12-21 03:46:51 -08:00
Guilherme Blanco
8b5e4a9a52
Merge pull request #542 from FabioBatSilva/DDC-2205
...
[DDC-2205] Fix DDC-2205
2012-12-21 03:45:07 -08:00
Fabio B. Silva
2104ae9935
fix DDC-2205
2012-12-20 23:06:30 -02:00
Patrick Schwisow
5627993827
Fix DDC-1690
...
Added the lines suggested by the original reporter.
2012-12-20 15:31:46 -06:00
Tom Graham
e17fc6c474
Added missing "new" keyword for event listener
2012-12-20 20:00:50 +00:00
Benjamin Eberlei
4bbfe0ce8a
Merge pull request #536 from KonstantinKuklin/master
...
add missed branch
2012-12-16 04:05:57 -08:00
Benjamin Eberlei
b6fd203355
Merge branch 'DDC-2199'
2012-12-16 12:58:01 +01:00
Benjamin Eberlei
7c337748b6
DDC-2199 / DDC-2192 - Versioned fields didnt work in XML/YAML mapping
2012-12-16 12:57:53 +01:00
Benjamin Morel
774bb3fec4
Fixed missed documentation issues in Doctrine\ORM
2012-12-14 20:12:56 +00:00
Benjamin Morel
aadce3c747
Fixed documentation for Doctrine\Tests
2012-12-14 18:55:49 +00:00
Benjamin Morel
c405f6d3f6
Fixed documentation for Doctrine\Tests\Mocks
2012-12-14 18:55:28 +00:00
