1
0
mirror of synced 2024-12-13 06:46:03 +03:00
Commit Graph

4350 Commits

Author SHA1 Message Date
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
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
90b6d5e293 Merge branch 'master' of github.com:doctrine/doctrine2 2012-12-24 10:40:52 +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
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
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
Fabio B. Silva
eda43c77bb Fix DDC-2208 2012-12-21 10:00:40 -02: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
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
ad967e8e22 Fixed documentation for Doctrine\ORM\Tools\Pagination 2012-12-14 13:13:22 +00:00
Benjamin Morel
2524c878b6 Fixed documentation for Doctrine\ORM\Tools\Export 2012-12-14 13:02:12 +00:00
Benjamin Morel
0122d8d36c Fixed documentation for Doctrine\ORM\Tools\Event 2012-12-14 12:49:59 +00:00
Benjamin Morel
71e78014e5 Fixed documentation for Doctrine\ORM\Tools\Console 2012-12-14 12:49:05 +00:00
Benjamin Morel
e72445b836 Fixed documentation for Doctrine\ORM\Tools 2012-12-13 18:55:44 +00:00
Benjamin Morel
7869ec714d Fixed unused 'use' statements.
Fixed missed documentation issues in Doctrine\ORM
2012-12-13 18:19:21 +00:00
Benjamin Morel
ba16789843 Fixed documentation for Doctrine\ORM\Query 2012-12-13 16:36:14 +00:00
Benjamin Morel
28966e2087 Fixed documentation for Doctrine\ORM\Query\Expr and Doctrine\ORM\Query\Filter 2012-12-13 12:05:34 +00:00
Benjamin Morel
d4357801a2 Fixed documentation for Doctrine\ORM\Query\Exec 2012-12-13 11:57:46 +00:00
Benjamin Morel
98ac6b5fec Fixed documentation for Doctrine\ORM\Query\AST 2012-12-13 11:52:19 +00:00
Benjamin Morel
f743da0e02 Fixed documentation for Doctrine\ORM\Query\AST\Functions 2012-12-13 10:42:25 +00:00
Benjamin Morel
42e83a2716 Fixed documentation for ORM\Proxy 2012-12-13 10:28:55 +00:00
Francis Besset
657a54da84 Passed column options to the join column 2012-12-04 12:26:40 +01:00
Francis Besset
df2bfbb636 Fixed trailing spaces on SchemaTool 2012-12-04 12:23:55 +01:00
Benjamin Morel
43b301f22b Fixed English mistakes 2012-12-03 11:02:29 +00:00
Benjamin Morel
159ece8943 Fixed documentation for ORM\Persisters 2012-12-03 10:15:43 +00:00
Benjamin Morel
46e6ada4f9 Fixed documentation for ORM\Mapping 2012-12-03 09:36:08 +00:00
Benjamin Morel
4714a53c32 Fixed documentation for ORM\Internal 2012-12-02 19:46:34 +00:00
Benjamin Morel
fad22d1e60 Fixed documentation for ORM\Event and ORM\Id 2012-12-02 12:37:56 +00:00
Benjamin Morel
dacdd6cd89 Documentation (docblock) fixes. 2012-12-01 16:28:06 +00:00
Benjamin Morel
26d6f5ce4e Fixed coding standard issue, as per @stof's request. 2012-11-30 19:10:53 +00:00
Benjamin Morel
5edc287848 Fixed documentation for Doctrine\ORM\Query\AST\Node::dispatch(). 2012-11-30 11:41:03 +00:00
Guilherme Blanco
29f0b678cf Merge pull request #526 from FabioBatSilva/DDC-2172
[DDC-2172] Fix EntityGenerator get literal type
2012-11-27 12:14:12 -08:00
Guilherme Blanco
f4c0fd1744 Added support to subselects in update item. 2012-11-27 14:36:56 -05:00
Fabio B. Silva
bac92f4d3e Fix CS 2012-11-27 16:58:48 -02:00
Fabio B. Silva
d1dc72b65a refactoring tests 2012-11-27 14:38:18 -02:00
Fabio B. Silva
41b907606f Fix DDC-2172 2012-11-27 14:29:02 -02:00
Jan Kramer
5b3f54429a [DDC-2074] Fixed bug regarding clearing PC's without owner
When calling clear on a PC that has no owner (e.g. because it was
cloned), it can't be deleted as there is no metadata available.
In these cases, it shouldn't be scheduled for deletion.
2012-11-25 19:27:39 +01:00