RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-25 09:41:40 +03:00
Code Issues Projects Releases Wiki Activity
8,714 Commits 5 Branches 0 Tags
Commit Graph

8714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Marco Pivetta
04aea73a85 Merge branch 'tests/lazy-collection-tests' 
Tests for doctrine/doctrine2@d30e3ab43c
 2014-05-17 19:08:37 +02:00
Marco Pivetta
a259138180 The count in a LazyCriteriaCollection is null on initialization 2014-05-17 19:08:25 +02:00
Marco Pivetta
c68ed4c204 Verifying that the persister is used only once when matching on a lazy criteria collection 2014-05-17 19:06:16 +02:00
Marco Pivetta
d2174a893a Verifying that count is not called on the persister when the collection is initialized 2014-05-17 18:56:42 +02:00
Marco Pivetta
546bb53ef9 Verifying that count on the lazy criteria collection is cached even with 0 count 2014-05-17 18:51:33 +02:00
Marco Pivetta
c46b63f6b4 Verifying that count on the lazy criteria collection is cached 2014-05-17 18:51:01 +02:00
Marco Pivetta
81fbb049a5 LazyCriteriaCollection test setUp 2014-05-17 18:48:25 +02:00
Marco Pivetta
7cb40ed915 Mocking up tests for the lazy-criteria-collection 2014-05-17 18:45:33 +02:00
Guilherme Blanco
d6c727dcc1 Update LazyCriteriaCollection.php 
Fixed issue where count = 0
 2014-05-16 14:03:20 -04:00
Marco Pivetta
8babb77d37 Merge pull request #1031 from mnapoli/custom-functions-callback-documentation 
Documentation for #991
 2014-05-16 14:40:17 +02:00
Matthieu Napoli
5a4c558865 Fixed #991 to support non-closure callables on PHP 5.3 2014-05-16 10:49:59 +02:00
Matthieu Napoli
b16423b26b Documentation for #991 2014-05-16 09:32:52 +02:00
Guilherme Blanco
47ca10076b Merge pull request #991 from mnapoli/custom-functions-callback 
Ability to define custom functions with callback instead of class name
 2014-05-16 00:27:30 -04:00
Guilherme Blanco
d30e3ab43c Added count cache when lazy collection is not yet initialized. Some cosmetic changes (primarily, there's no ELSE). 2014-05-16 04:22:11 +00:00
Michaël Gallego
92a2b01c77 Fix tests by forcing collection initialization 2014-05-15 18:37:41 +02:00