encoder64
cd4bc93483
Simple Fixes
2014-08-09 13:27:38 +03:00
encoder64
94ba6e2dfc
#DDC-1590: Simple Fixes
2014-08-04 20:18:26 +03:00
encoder64
4e805bb59a
#DDC-1590: Fix Inheritance in Code-Generation: Code Style Fixes
2014-08-03 17:07:20 +03:00
encoder64
e0ae7634d5
#DDC-1590: Fix Inheritance in Code-Generation
2014-08-03 17:02:33 +03:00
Marco Pivetta
a8035f25a2
Merge pull request #1074 from zimmermanj42/DDC-3160
...
[DDC-3160] Alternate fix for DDC-2996 bug
2014-07-06 16:07:43 +02:00
Justin Zimmerman
6a4867512e
Fix test issues.
2014-07-04 11:15:57 -04:00
Justin Zimmerman
65e7cc9143
[DDC-3160] Change to fix that was implemented for DDC-2996.
...
A fix for DDC-2996 was implemented that broke quite a few extensions.
This commit is an attempt to fix the DDC-2996 bug without the adverse side effects seen in DDC-3160.
Basically, if changes are detected that would cause a changeset to be made, but the entity is awaiting insertion, the code will not save the changeset nor flag the entity as awaiting updating in the Unit of Work.
Some styling tweaks based on Pull Request guidelines.
2014-07-04 10:51:04 -04:00
Guilherme Blanco
8c0166d3bf
Merge pull request #1076 from velosipedist/fix-typos
...
Fix switch non-uniform syntax
2014-07-01 23:11:53 -04:00
velosipedist
60cb01be1f
Fix switch non-uniform syntax
2014-06-29 18:00:02 +04:00
Marco Pivetta
c370426792
Merge pull request #1075 from vilartoni/master
...
Fixed query cache id generation: added platform to hash
2014-06-27 22:37:36 +02:00
Antonio Vilar
4e61ceb0df
Added platform key
2014-06-27 22:36:02 +02:00
Antonio Vilar
0dde8585c3
Fixed query cache id generation: added platform to hash
2014-06-27 20:29:55 +02:00
Marco Pivetta
9e36a95a97
Merge pull request #1065 from egeloen/DDC-3179
...
[DDC-3179] EntityNotFoundException on the postRemove event if the entity is a proxy
2014-06-26 18:25:53 +02:00
Eric GELOEN
20f96cc9d3
[DDC-3179] Document postRemove limitation
2014-06-26 18:09:32 +02:00
Marco Pivetta
22d71de2c3
Merge pull request #1071 from VasekPurchart/fix-setup-cache
...
Setup::createConfiguration breaks Cache interface contract
2014-06-26 02:15:54 +02:00
Vasek Purchart
ee5f465a2f
set namespace in setup only on CacheProvider instances
2014-06-26 01:29:35 +02:00
Marco Pivetta
d98b4a5124
Merge pull request #1068 from jkavalik/patch-1
...
Fix typo in documentation
2014-06-24 08:25:19 +02:00
jkavalik
d5dd21dd79
Fix typo in documentation
2014-06-24 08:00:45 +02:00
Guilherme Blanco
38187a31d6
Merge pull request #1032 from bakura10/optimized-contains
...
Add support for optimized contains in LazyCriteria
2014-06-21 08:56:47 -04:00
Guilherme Blanco
381cf8022f
Merge pull request #1063 from FlorianLB/master
...
singularize variable name on add/remove methods for EntityGenerator
2014-06-21 08:49:53 -04:00
Marco Pivetta
84a0fddaf4
Merge branch 'hotfix/#1064-xsd-on-update-removal'
2014-06-19 16:06:03 +02:00
Marco Pivetta
19b5e87cab
on-update is not supported anymore
2014-06-19 16:05:12 +02:00
Marco Pivetta
e940ce1df6
Replacing " with ' to avoid escaping warnings
2014-06-19 15:54:43 +02:00
Marco Pivetta
59720370f9
Corrected FQCN reference in @expectedException
2014-06-19 15:53:37 +02:00
Marco Pivetta
7dfca09ff6
Minor CS fixes (use statements compliant with PSR-2)
2014-06-19 15:53:11 +02:00
Marco Pivetta
85c02e57b1
Merge pull request #1064 from stefanotorresi/update-xsd
...
remove on-update from join-column
2014-06-19 14:33:58 +02:00
Stefano Torresi
391847d627
remove on-update from join-column
2014-06-19 14:27:56 +02:00
FlorianLB
fdca5d7584
singularize variable name on add/remove methods for EntityGenerator
2014-06-19 10:00:40 +02:00
Guilherme Blanco
f7c5a0684a
Merge pull request #1060 from ureimers/master
...
[DDC-3170] SimpleObjectHydrator fails to get discriminator column from mapped SQL result
2014-06-17 10:44:16 -04:00
Ulf
a7aa634247
Fixed mapping of discriminator column
...
Added fix for [DDC-3170] (http://www.doctrine-project.org/jira/browse/DDC-3170 ).
When querying a simple entity which uses single table- or class table inheritance using simple object hydration (``AbstractQuery::HYDRATE_SIMPLEOBJECT``), the mapped discriminator column was not retrieved correctly.
If the column got an alias during result set mapping other than it's actual name (e.g. ``type34`` insteaad of ``type``) than this alias wasn't reverted when retrieving the discriminator column from the SQL result set.
2014-06-17 14:51:19 +02:00
Ulf
7aa1c0a907
Create DDC3170Test.php
...
Added test for [DDC-3170] (http://www.doctrine-project.org/jira/browse/DDC-3170 )
2014-06-17 14:45:59 +02:00
Marco Pivetta
ef43b223fd
Merge pull request #1059 from iampersistent/patch-3
...
fix spacing for yaml example
2014-06-16 20:21:30 +02:00
Richard Shank
9a5fc49690
fix spacing for yaml example
2014-06-16 08:20:14 -07:00
Marco Pivetta
ca37f87c27
Merge pull request #1058 from DavidPrevot/Unicode
...
Drop Unicode character
2014-06-15 12:19:45 +02:00
David Prévot
3ff92f587f
Drop Unicode character
...
It broke the LaTeX build.
2014-06-14 23:14:42 -04:00
Andreas Flack
a5cf6417b3
Add failing test for DDC-3160
2014-06-12 17:28:13 +02:00
Marco Pivetta
5c447cfb71
Merge branch 'hotfix/build-fix'
2014-06-07 15:12:09 +02:00
Marco Pivetta
50d7975fd6
Allowing failures on hhvm-nightly, as the build chokes on composer installation for now (unrecognized console flags)
2014-06-07 15:11:51 +02:00
Marco Pivetta
32b24ba155
Fixed mismatch in expected exception message, see doctrine/doctrine2#1048
2014-06-07 14:55:59 +02:00
Marco Pivetta
3ade0cf6a5
Merge pull request #1048 from MidnightDesign/patch-1
...
Fix typo in exception message
2014-06-06 04:34:50 +02:00
Marco Pivetta
d71159c6c5
Merge pull request #1049 from deeky666/DDC-3152
...
[DDC-3152] Fix redeclaration of methods on entity generation update
2014-06-06 03:48:24 +02:00
Steve Müller
dcf8d6a86e
ignore case when checking for existing methods to avoid redeclaration on update
2014-06-05 15:58:54 +02:00
Rudolph Gottesheim
daa90bf32d
Fix typo in exception message
2014-06-04 15:59:57 +02:00
Benjamin Eberlei
6f622ab1f7
Merge branch 'master' of github.com:doctrine/doctrine2
2014-06-03 21:42:38 +02:00
Benjamin Eberlei
46ebb57b45
Fix wrong version
2014-06-03 21:41:26 +02:00
Marco Pivetta
b3d01b6036
Merge pull request #1047 from simonharris/master
...
Minor grammatical corrections
2014-06-03 17:52:45 +02:00
Simon Harris
7dac285de6
A few minor changes for English and clarity
2014-06-03 16:46:37 +01:00
Simon Harris
8b1f5d71e1
Fix minor grammatical error
2014-06-03 16:26:54 +01:00
Benjamin Eberlei
e577e77867
Cleanup 93c276d
2014-06-03 17:05:02 +02:00
Marco Pivetta
2101a8fdc6
Merge branch 'hotfix/php-version-id-check-in-metadata-prototype-instantiation'
2014-05-31 13:37:50 +02:00
