RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity
8,774 Commits 5 Branches 0 Tags 32 MiB
a6a9c72a75
Commit Graph

8774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Austin Morris
a6a9c72a75 Fix the composer autoload paths for the doctrine CLT 2014-07-24 09:52:55 -04:00
Marco Pivetta
2b24478f05 Merge pull request #1087 from malukenho/patch-1 
Remove the error control operator
 2014-07-24 00:35:18 +02:00
Jefersson Nathan
70fe21b30a Remove the error control operator 2014-07-23 17:09:47 -03:00
Marco Pivetta
499f09fc99 Merge pull request #1084 from hartca/master 
Update advanced-field-value-conversion-using-custom-mapping-types.rst
 2014-07-18 01:25:50 +02:00
hartca
0ab2672872 Update advanced-field-value-conversion-using-custom-mapping-types.rst 2014-07-18 00:10:47 +01:00
Marco Pivetta
205a5de4e5 Merge pull request #1083 from deeky666/DDC-3073 
[DDC-3073] Add documentation about how to map column options
 2014-07-17 11:56:40 +02:00
Steve Müller
040c445297 add documentation about how to map column options 2014-07-17 11:28:43 +02:00
Guilherme Blanco
c019047d6c Merge pull request #1082 from scotam/invalid-parameter-count 
added more informative error messages when invalid parameter count
 2014-07-15 11:06:53 -04:00
Rhodri Pugh
ad10a18071 added more informative error messages when invalid parameter count 2014-07-15 13:17:22 +01:00
Marco Pivetta
85fbf68436 Merge branch 'hotfix/#1019-detached-entity-exception-rewording' 
Close #1019
 2014-07-14 11:25:42 +02:00
Andreas Flack
0ade3aa62a Improve phrasing on exception message instead of trying to fix callers 2014-07-14 11:25:04 +02:00
flack
b8ef3af982 Small grammar fix 
The exception was reading 

```
A detached entity was found during {removed|persisted} [entityName] 
```

I changed the verbs to infinitive now. Alternatively, the text in ``ORMInvalidArgumentException::detachedEntityCannot`` could also be changed to read 


```
Detached entity [entityName] cannot be {removed|persisted}  
```
 2014-07-14 11:25:04 +02:00
Marco Pivetta
5361676bba Merge pull request #1038 from Greenflex/doc/dql-hidden-keyword 
Add documentation for the `HIDDEN` keyword in DQL
 2014-07-14 11:18:30 +02:00
Marco Pivetta
90dee7036d Merge pull request #1067 from albertvolkman/add-fullstop-and-newline 
Add fullstop and newline after property description.
 2014-07-14 11:09:40 +02:00
Marco Pivetta
b80149344d Merge pull request #1073 from kamazee/add_passing_type_to_rsm_in_sql_walker 
Add missing type mapping
 2014-07-14 10:51:13 +02:00
Alexander Kurilo
38fcc66c16 Add missing type mapping 
Fixes DDC-3192
Refs DDC-2494

This is essentially a fix from DDC-2494 applied to SQLWalker.
The issue: type was not converted to PHP value when the result is fetched by
executing DQL query rather than using entity manager's findX(). Similar issue
for BasicEntityPersister (which is used when em's findX is executed) was fixed
in DDC-2494, but SQLWalker made the issue valid for any custom query.
 2014-07-14 11:22:08 +03:00
Marco Pivetta
ae0ee72425 Merge pull request #1080 from danielsippel/DDC-2021 
possible fix for DDC-2021
 2014-07-11 21:35:34 +02:00
Daniel Sippel
ae2235fd3c DDC-2021 sql generation test: remove comment 2014-07-10 00:32:24 +02:00
Daniel Sippel
b31ba98076 DDC-2021 add sql generation test 2014-07-10 00:27:28 +02:00
Daniel Sippel
45358bf5d0 possible fix for DDC-2021 2014-07-09 16:39:44 +02:00
Marco Pivetta
bf1e7e150e Merge pull request #1078 from renan/patch-1 
Removing Value Objects from limitations
 2014-07-07 20:20:59 +02:00
Renan Gonçalves
c9901c9017 Removing Value Objects from limitations as per #835 2014-07-07 20:17:56 +02: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
Albert Volkman
247803715b Add fullstop and newline after property description. 2014-06-23 09:53:27 -04: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