RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity
10,614 Commits 5 Branches 0 Tags
Commit Graph

10614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luís Cobucci
e123f16ec9
Require PHP 7.1 2017-06-19 17:43:37 +02:00
Luís Cobucci
99dc8aa2a9
Drop HHVM support 2017-06-19 17:43:16 +02:00
Marco Pivetta
fc67b398a1 Merge pull request #6479 from lcobucci/fix-risky-tests 
Fix all risky tests
 2017-06-13 01:20:57 +03:00
Luís Cobucci
5c02e0c1e8
Remove APC dependency on tests 
By using a shared array cache so that we can reproduce different cache
instances that shares the stored data.
 2017-06-12 23:05:58 +02:00
Luís Cobucci
a9c711ad7e
Register custom types to not skip model set validation 
Also removing an empty and unused model set.
 2017-06-12 23:05:57 +02:00
Luís Cobucci
ee5f222c58
Rename data provider so that it doesn't get executed as test 2017-06-12 23:05:56 +02:00
Luís Cobucci
8dccd27b52
Add the correct assertions for tests that don't have any 2017-06-12 23:05:55 +02:00
Luís Cobucci
d8663cd9ee
Use a more appropriate assertion on some tests 2017-06-12 23:05:54 +02:00
Luís Cobucci
8796e2d938
Expect an exception instead of failing the test 
Since that's the assertion we're actually doing.
 2017-06-12 23:05:53 +02:00
Luís Cobucci
19fc91482e
Validate if optimistic locks are released properly 
By trying to update an entry using a different connection.
 2017-06-12 23:05:52 +02:00
Luís Cobucci
99df158fc8
Allow passing a connection while creating an entity manager 
Also removing unsed arguments.
 2017-06-12 23:05:51 +02:00
Luís Cobucci
1bf884970f
Increment assertion count manually 
Which is needed to test void methods that shouldn't raise any exception
on a certain condition. If the interpreter gets to the point where the
assertion count is incremented it means that no exceptions have been
thrown and our test is successful.

Important to note that some tests were slighly refactored to simplify
things a bit.
 2017-06-12 23:04:56 +02:00
Luís Cobucci
8d144daf01
Remove duplicated tests (keeping them on unit test suite only) 2017-06-12 23:04:55 +02:00
Luís Cobucci
043ca69f0b
Fix some code style issues in tests 2017-06-12 23:04:54 +02:00
Benjamin Eberlei
3dc0f471fe Merge pull request #6481 from lcobucci/improve-build-extensions 
Improve build extensions
 2017-06-12 20:45:25 +02:00
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
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