Mathieu De Zutter
ec35d4886c
Don't load detached proxies when merging them.
...
Ticket DDC-1392 fixed an issue where uninitialized proxies could not be merged
because the merge routine couldn't get the identifier from them. The soution
was to initialize the proxy.
Ticket DDC-1734 fixed the merging of *unserialized* uninitialized proxies by
resetting their internals, so these proxies were able to initialize, as required
by the fix for DDC-1392.
Somehow, in the meanwhile, the fix for DDC-1392 is not needed anymore:
reverting the patch will not break the associated test (but it does break the
test for DDC-1734). This means it is not needed anymore to initialize the proxy
when merging.
Uninitialized proxies that get merged should not be loaded at all. Since they
are not initialized, the entity data for sure hasn't changed, so it can be
safely ignored. Actually, the only thing the data is needed for while merging,
is to copy it into the managed entity, but that one is already supposed to be
up to date. By not initializing the proxy, a potential database roundtrip is
saved, and the fix for DDC-1734 is not needed anymore.
Besides optimizing the merge, this patch also solves an issue with merging.
Currently, when a detached uninitialized proxy is merged while there is already a
corresponding managed entity (proxy or not), the ORM returns a blank entity
instead of returning the already managed entity. This patch makes sure that
already existing managed entities are re-used.
2015-01-16 20:54:15 +01:00
Marco Pivetta
f28654de12
Merge branch 'hotfix/#1133-better-exception-message-on-missing-embeddable-class-in-metadata'
...
Close #1133
2015-01-16 19:50:26 +01:00
Marco Pivetta
935a79e15f
#1133 DDC-3305 - minor cs fix (spacing)
2015-01-16 19:46:04 +01:00
Marco Pivetta
7e4dab17ec
#1133 DDC-3305 - test case with embeddable without referenced embeddable class
2015-01-16 19:45:16 +01:00
Javier Spagnoletti
705a7d2cc2
[Embeddables] Improved exception message when embeddables is missing 'class' attribute.
2015-01-16 19:18:46 +01:00
Marco Pivetta
655394d433
Merge branch 'hotfix/abstract-id-generator-revert-bc-break'
2015-01-16 18:53:36 +01:00
Marco Pivetta
6acfdc1439
Removing Doctrine\ORM\Id\AbstractIdGenerator#generate(EntityManagerInterface $em, $entity) from upgrade notes (BC break reverted)
2015-01-16 18:53:27 +01:00
Marco Pivetta
f799986be1
Reverting BC break in AbstractIdGenerator signature
2015-01-16 18:52:58 +01:00
Marco Pivetta
de589799e8
Merge pull request #1209 from Ocramius/hotfix/DDC-3427-allow-entitymanagerinterface-globally
...
s/EntityManager/EntityManagerInterface in type-hints
2015-01-16 15:06:58 +01:00
Marco Pivetta
efe9e3ab28
#1209 DDC-3427 - documenting s/EntityManager/EntityManagerInterface signature BC breaks
2015-01-16 14:55:16 +01:00
Marco Pivetta
339bd23ac8
#1209 DDC-3427 - removing leftover EntityManager hints (using interface instead)
2015-01-16 14:44:31 +01:00
Marco Pivetta
dd8db1acd2
DDC-3427 - s/EntityManager/EntityManagerInterface in relevant tests about identifier generation
2015-01-16 14:22:03 +01:00
Marco Pivetta
6fc0d84b7a
DDC-3427 - s/EntityManager/EntityManagerInterface in type-hints
2015-01-16 14:21:30 +01:00
Marco Pivetta
0e7646cf4b
Merge branch 'namespace-persisters'
...
Close #1258
2015-01-16 00:10:56 +01:00
Guilherme Blanco
f90475772d
Classify persisters into more granular namespaces.
2015-01-16 00:10:25 +01:00
Fabio B. Silva
f97bb00dff
Merge pull request #1259 from Ocramius/hotfix/cache-region-cache-namespace-mutability-removal
...
Hotfix: Cache region should not mutate injected cache instance settings
2015-01-15 15:26:23 -05:00
Marco Pivetta
0f2c117f3e
Cloning and configuring the cache adapter for each newly created cache region (fixes cache namespacing)
2015-01-15 21:17:49 +01:00
Marco Pivetta
6564f95260
Typo fix (region should be named 'bar', not 'foo'
2015-01-15 21:17:25 +01:00
Marco Pivetta
a82eecfc07
Each cache region built by the DefaultCacheFactory should have its own cache with its own unique namespace
2015-01-15 21:15:38 +01:00
Marco Pivetta
514fd008b9
Cache regions will not modify the injected cache instance settings
2015-01-15 21:01:35 +01:00
Marco Pivetta
f38d4551f1
Cache regions should not modify the injected cache instance settings
2015-01-15 21:01:02 +01:00
Guilherme Blanco
0b2fb7fd78
Fixed identifier quoting in functional tests.
2015-01-15 03:55:29 +00:00
Guilherme Blanco
8a0989aa50
Fixed identifier quoting in functional tests.
2015-01-15 03:50:18 +00:00
Marco Pivetta
5bd921139e
Merge branch 'hotfix/#1250-DDC-3493-fix-class-pseudo-constant-parsing-in-entitygenerator'
2015-01-15 04:16:44 +01:00
Guilherme Blanco
a1d77bdc65
Renamed coll to collection and some small updates to tests.
2015-01-15 03:14:48 +00:00
Marco Pivetta
5be57d0f4a
Merge branch 'hotfix/#1256-DDC-3493-fix' into hotfix/#1250-DDC-3493-fix-class-pseudo-constant-parsing-in-entitygenerator
...
Close #1250
Close #1256
2015-01-15 04:13:28 +01:00
Andrea Sprega
243210e896
DDC-3493 - fixed EntityGenerator parsing for php 5.5 "::class" syntax
2015-01-15 04:13:09 +01:00
lukasmaz
41dd584f62
Test case for "class" keyword
...
Test case for http://www.doctrine-project.org/jira/browse/DDC-3493
2015-01-15 04:12:31 +01:00
Marco Pivetta
55a75bfb1b
Merge pull request #1249 from doctrine/extra-lazy-get-m2m
...
Support for extra lazy get for both owning and inverse side on many to many associations.
2015-01-15 03:36:35 +01:00
Steve Müller
d343617f13
Merge pull request #1255 from Ocramius/cleanup/php-5.3-support-end
...
Cleanup: PHP 5.3 support end
2015-01-15 01:29:00 +01:00
Marco Pivetta
934e4fdde4
Merge pull request #1251 from TomasVotruba/travis-optimize
...
travis: optimize to run coverage only once
2015-01-15 01:20:02 +01:00
Marco Pivetta
a88726d84e
Merge branch 'hotfix/#1072-fix-iteration-of-file-lock-region-on-no-match'
...
Close #1072
2015-01-15 00:55:16 +01:00
Marco Pivetta
8b223c5c83
#1072 DDC-3191 - test cleanup: reflection is better than mixing up I/O operations and global state
2015-01-15 00:54:25 +01:00
Marco Pivetta
e2acd74cb4
#1072 DDC-3191 - minor performance optimization
2015-01-15 00:37:41 +01:00
Marco Pivetta
aca719be41
#1072 DDC-3191 - adding test for failing glob() operations on the FileLockRegion
2015-01-15 00:36:26 +01:00
Alexander Kurilo
58cd520e32
Fix attempt of traversing bool in FileLockRegion
2015-01-14 23:51:41 +01:00
Tomas Votruba
57cad1f232
travis: optimize to run coverage only once
2015-01-14 23:08:15 +01:00
Marco Pivetta
a1e40fc3f1
Removing PHP 5.3 references, simplified getting started docs
2015-01-14 21:02:15 +01:00
Marco Pivetta
3ee47bef41
Updating readme minimum required PHP version
2015-01-14 21:00:59 +01:00
Marco Pivetta
89520b1f38
Updating readme minimum required PHP version
2015-01-14 21:00:37 +01:00
Marco Pivetta
9024c04c72
Removing conditionals checking for PHP 5.4 support
2015-01-14 20:14:39 +01:00
Marco Pivetta
541e7bdf72
Refactoring test method: no need to test for PHP version
2015-01-14 20:13:46 +01:00
Marco Pivetta
8e28cb9119
Removing useless $self use statements, as PHP 5.4 supports $this in closures
2015-01-14 20:12:27 +01:00
Marco Pivetta
effe33096d
Dropping PHP 5.3 from the build matrix
2015-01-14 20:03:49 +01:00
Marco Pivetta
e05858b09c
Requiring PHP 5.4 as a minimum runtime
2015-01-14 20:02:48 +01:00
Marco Pivetta
e030dac3d0
Merge pull request #1253 from SofHad/fix-dbal-configuration-404
...
Fix dead link
2015-01-14 19:43:03 +01:00
Marco Pivetta
1d4b96eed0
Merge branch 'hotfix/#881-support-schema-on-platform-without-schema-emulation'
...
Close #881
2015-01-14 19:18:22 +01:00
Marco Pivetta
0106cba602
#881 DDC-2825 - reusing mapping files that already exist in models, where applicable
2015-01-14 19:17:39 +01:00
Marco Pivetta
7164e28138
#881 DDC-2825 - renaming table/schema name for clarity and to avoid collisions
2015-01-14 19:16:42 +01:00
Marco Pivetta
7b168de236
#881 DDC-2825 - removing unused imports
2015-01-14 19:05:40 +01:00
