RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-03 13:59:27 +03:00
Code Issues Projects Releases Wiki Activity
10,712 Commits 5 Branches 0 Tags
Commit Graph

10712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Pivetta
c0c08d92ba Merge pull request #6493 from astepin/small-code-improvements 
Minor fixes: typos, documentation, etc.
 2017-06-11 12:14:30 +03:00
Artem Stepin
799190d5e4 - fixed columnPrefix generator for the embedded annotation 2017-06-09 22:25:19 +02:00
Artem Stepin
351b6972a4 Merge branch 'original-pr-6356' into gh-6356 2017-06-09 21:58:57 +02:00
Artem Stepin
7a63e81c94 Add failing test for gh-#6314 (gh-#6356) 2017-06-08 23:18:47 +02:00
Artem Stepin
43009682a4 minor code work: 
- method calls with incorrect case
- removed unused imports
- typos and some other minor code smells
- documentation update (wrong return types etc. )
 2017-06-08 22:04:07 +02:00
Marco Pivetta
049ad1e079 Merge pull request #6491 from SamKnows/fix/mock-implementations 
Fix Mock Implementations.
 2017-06-08 19:06:25 +02:00
Mathew Davies
b42c36f472
Update phpDoc 2017-06-08 16:43:18 +01:00
Mathew Davies
9f13557d14
Be consistent with the rest of the file. 2017-06-08 16:42:11 +01:00
Mathew Davies
633b821e18 Update StatementArrayMock to implement the right interface. 2017-06-08 16:31:59 +01:00
Mathew Davies
a59367423a Update StatementMock to implement the right interface. 2017-06-08 16:25:57 +01:00
Mathew Davies
1559db7ac1
Update HydratorMockStatement to implement the right interface. 2017-06-08 16:25:03 +01:00
Marco Pivetta
971c400025 Merge pull request #6462 from mkosiedowski/proxy-embedded-fields-fix 
Fix #6460 - \Doctrine\ORM\Mapping\ClassMetadataInfo::hasField should return true for embedded fields
 2017-06-01 15:52:07 +02:00
Luís Cobucci
2359360149
Disable XDebug based on PHPUnit flags instead 
Then we don't need to keep changing versions information.
 2017-06-01 07:40:28 +02:00
Marco Pivetta
22ecc2d58c Merge pull request #5938 from Ma27/feature/DDC5934-allow-fetch-override 
#5934 - add `fetch` option to `AssociationOverride` in order to override fetch strategy for subclasses of entities
 2017-05-31 20:24:57 +02:00
Maximilian Bosch
49bb345533
#5934 - #5938 - fix accidentally introduced regression with wrong target of ::class expression 2017-05-31 15:01:25 +02:00
Maximilian Bosch
fcfaa13df9
#5934 - #5938 - use ClassMetadata::class expression rather than FQCN in config drivers as of @Ocramius's review 2017-05-31 14:52:55 +02:00
Maximilian Bosch
92476b5953
#5934 - add fetch option to AssociationOverride in order to override fetch strategy for subclasses of entities 2017-05-30 18:19:48 +02:00
Marco Pivetta
205ee72e33 Merge pull request #6478 from lcobucci/fix-yaml-tests 
Fix YAML related tests
 2017-05-30 14:05:19 +02:00
Luís Cobucci
f9062d9931
Force YAML parser to convert keys to string 
Since Symfony 3.3 implicit conversion is not enabled by default so we
need to pass that flag manually.

Related to: https://github.com/symfony/symfony/pull/21774
 2017-05-30 13:53:45 +02:00
Luís Cobucci
f18e178960
Fix wrong YAML mapping 
We had duplicated keys and that's no longer valid on symfony/yaml 3.3.
 2017-05-30 12:51:51 +02:00
Luís Cobucci
2a239be45e Merge pull request #6466 from fmagnan/patch-1 
Update QueryBuilder.php
 2017-05-23 18:44:10 +02:00
Franck Magnan
db528a44b1
Update QueryBuilder.php 
Hello,

thank you very much for your work, it's awesome!
I found a minor error in PHPDOC for method setParameter. Argument "type" can be a string or null but can be also an int if it comes from \PDO::PARAM_*. So I've changed typehint "string" into "mixed".
 2017-05-23 18:42:01 +02:00
Maciej Kosiedowski
76f0fe45af fixes in tests 2017-05-22 15:52:19 +02:00
Maciej Kosiedowski
f304685c68 Fix #6460 - \Doctrine\ORM\Mapping\ClassMetadataInfo::hasField should return true for embedded fields 2017-05-22 14:41:06 +02:00
Marco Pivetta
6ea30f0354 Merge pull request #6456 from bitwombat/doc_changes 
Fixes and clarifications to Association Mapping document
 2017-05-21 15:17:40 +02:00
Greg Bell
00aba32c67 Resolve conflicts 2017-05-21 16:56:16 +10:00
Greg Bell
46cebfb33d Clarify concepts, fix minor English issues. 
- Globally change 'Shipping' to 'Shipment' - shipment is a noun and thus a clearer name for an object.
- Add definition of unidirectional to the top of the document.
- Explain inversedBy and mappedBy the first time they are used.
- Clarify some ownership and bidirectionality text.
- Minor English and punctuation fixes.
 2017-05-21 16:39:06 +10:00
Greg Bell
89bf6152a6 Merge branch 'doc_changes' of https://github.com/bitwombat/doctrine2 into doc_changes 2017-05-21 14:14:52 +10:00
Greg Bell
75821e75f5 Clarify English and a few concepts 
- Globally change 'Shipping' to 'Shipment' - shipment is a noun and thus a
clearer name for an object.
- Move definition of unidirectional from example to the top of the document.
- Explain inversedBy and mappedBy the first time they are used.
- Clarify some ownership and bidirectionality text.
- Minor English and punctuation fixes.
 2017-05-21 14:14:28 +10:00
Greg Bell
7bfd172156 Clarify English and a few concepts 
- Globally change 'Shipping' to 'Shipment' - shipment is a noun and thus a
clearer name for an object.
- Move definition of unidirectional from example to the to of the document.
- Explain inversedBy and mappedBy the first time they are used.
- Clarify some ownership and bidirectionality text.
- Minor English and punctuation fixes.
 2017-05-21 14:10:38 +10:00
Marco Pivetta
ee066cc5de Merge pull request #6451 from nicolas-grekas/sf4 
Allow Symfony 4.0
 2017-05-18 12:59:19 +02:00
Nicolas Grekas
7ce2381bdd Allow Symfony 4.0 2017-05-18 12:57:36 +02:00
Marco Pivetta
334b7e68a7 Merge pull request #6442 from sensorario/performance-improvement 
Compute size of loaders in the test suite beforehand, and not on each iteration
 2017-05-16 13:40:17 +02:00
Marco Pivetta
95c60219d5 Merge pull request #6446 from eibt/update-docs-theme-submodule 
Update theme submodule
 2017-05-16 13:21:34 +02:00
Ivan
73770ac090 Update git submodule "docs/en/_theme" 
- This fixes the broken image at the footer of Doctrine 2 ORM's docs
 2017-05-15 14:53:23 -06:00
Simone Gentili
0a801b895e compute size of loaders beforehand and not on each iteration 2017-05-15 07:43:15 +02:00
Luís Cobucci
e9b54de488 Merge pull request #6439 from sensorario/align-equals-signs 
align equals signs
 2017-05-14 10:21:42 +02:00
Simone Gentili
fac7e8facb align equals signs 2017-05-13 23:05:37 +02:00
Marco Pivetta
c222c1d17a Merge pull request #6433 from mpdude/patch-1 
Remove dead code in the schema tool
 2017-05-10 19:31:40 +02:00
Luís Cobucci
2695f5e3a5 Merge pull request #6436 from lcobucci/fix-result-set-cache-eviction 
Pass the connections parameters for cache key generation
 2017-05-10 18:07:12 +02:00
Luís Cobucci
885c431bd9
Pass the connection parameters for cache key generation 
That argument was added to not have key collisions for different
connections.

More info: https://github.com/doctrine/dbal/pull/713
 2017-05-10 17:52:38 +02:00
Matthias Pigulla
5c1908d82f Remove dead code 
Hopefully this does not do anything...?
 2017-05-09 19:21:49 +02:00
Marco Pivetta
7bb02d0dbd Merge pull request #6417 from lcobucci/fix-expire-result-cache 
Fix expire result cache
 2017-05-03 12:40:33 +02:00
Luís Cobucci
e71272e2b4
Evict result set cache if Query#expireResultCache() was called 2017-05-02 23:25:56 +02:00
bruno da silva
85a52d781e
add a not weel writend/nammed test testing Query::expireResultCache() 2017-05-02 23:25:56 +02:00
Marco Pivetta
2c1ebc4ef1 Merge pull request #6416 from lcobucci/fix-quote-on-inheritance 
Fix quoting when using inheritance as well
 2017-05-02 09:42:03 +02:00
Marco Pivetta
77ee69f1a8 Merge pull request #6367 from SirWaddles/fix-inheritance-alias 
Fix inheritance alias
 2017-05-02 09:25:18 +02:00
Timothy Clissold
0a10f347d3
Fix inheritance join alias 2017-05-02 00:17:16 +02:00
Luís Cobucci
6c0654c144 Merge pull request #6274 from Necsord/issue/5887-one-to-one-with-custom-id-object-relationship-fix 
Fixing #5887 - lazy loading of one-to-one relationship with custom id object
 2017-04-30 20:10:37 +02:00
Marcin Szulc
a360da5a7e
Fix lazy loading of 1-to-1 relationship with custom id object 
Fixing case when lazy loading of entity in one-to-one relationship on the side without foreign key
did not return eht entity because of custom type not being detected and properly formatted before
applying to database query.

Closes https://github.com/doctrine/doctrine2/issues/5887
 2017-04-30 19:53:28 +02:00