RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-09 18:47:10 +03:00
Code Issues Projects Releases Wiki Activity
8,735 Commits 5 Branches 0 Tags 32 MiB
38187a31d6
Commit Graph

8735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marco Pivetta
72750b05e6 Using PHP_VERSION_ID instead of version_compare to see if we're using PHP 5.4+ 2014-05-31 13:37:39 +02:00
Guilherme Blanco
a851dd68fb Merge pull request #1045 from marmotz/master 
Fix the "Erroneous data format for unserializing" error message
 2014-05-30 09:11:34 -04:00
Renaud LITTOLFF
93c276d059 Fix the "Erroneous data format for unserializing" error message 2014-05-30 10:43:11 +02:00
Marco Pivetta
5d1275e938 Merge pull request #1044 from ronanguilloux/patch-2 
Use of ->andWhere() whithout any ->where() before is valid
 2014-05-29 22:42:09 +02:00
Ronan Guilloux
526c757901 Update query-builder.rst 2014-05-29 16:36:22 +02:00
Ronan Guilloux
495fe6002d Update query-builder.rst 
->andWhere() can be used directly, without any ->where() before, and we can just always use ->andWhere(). This is why ->hasWhere() is useless, cf. #1043.
 2014-05-29 16:29:49 +02:00
Marco Pivetta
5ee286e7e0 Merge pull request #1041 from c960657/entity-manager-interface 
Allow all EntityManagerInterface implementations
 2014-05-28 14:40:22 +02:00
Marco Pivetta
f941264b5e Merge pull request #1042 from bakura10/patch-1 
Fix second level cache doc
 2014-05-28 13:57:15 +02:00
Michaël Gallego
3d32bc47a7 Fix second level cache doc 2014-05-28 13:07:01 +02:00
Christian Schmidt
a7d072f525 Allow all EntityManagerInterface implementations 
This is necessary if Doctrine\ORM\Decorator\EntityManagerDecorator is used.
 2014-05-28 12:30:40 +02:00
Marco Pivetta
466808bf48 Merge pull request #1039 from iampersistent/patch-1 
Add yml example to single table inheritance
 2014-05-27 16:56:08 +02:00
Richard Shank
edaeaf48a8 Add yml example to single table inheritance 2014-05-27 07:47:07 -07:00
Marco Pivetta
20e47ae52d Merge pull request #1037 from spiechu/patch-1 
I can't look at those semicolons, sorry ;-)
 2014-05-27 09:55:42 +02:00
Dawid Spiechowicz
9c24e0b510 I can't look at those semicolons, sorry ;-) 2014-05-27 09:37:40 +02:00
Marco Pivetta
b421d03f69 Merge pull request #1036 from albertvolkman/entity-mapper-remove-extra-space 
Move space addition to implementation.
 2014-05-22 00:15:22 +02:00
Albert Volkman
49bca5171b Move space addition to implementation. 2014-05-21 16:27:36 -04:00
Marco Pivetta
7debf736a6 Merge pull request #1034 from hashnz/master 
Update caching.rst
 2014-05-19 22:59:06 +02:00
hashnz
43c4c80388 Update caching.rst 
Remove documentation referencing delete by regex/prefix.
 2014-05-20 08:53:41 +12:00
Michaël Gallego
140dc92e5f Enforce Criteria 2014-05-18 12:47:59 +02:00