Marco Pivetta
09189fc021
#6613 #6614 removing IDE-generated header
2017-08-11 21:21:36 +02:00
Marco Pivetta
5a0d3e5fb8
#6613 #6614 removing phone/user specifics, using ORM naming for associations
2017-08-11 21:21:27 +02:00
Marco Pivetta
b9ba4e3207
#6613 #6614 correcting column mapping (was integer, should be string), segregating phone creation away
2017-08-11 21:21:24 +02:00
Marco Pivetta
d7919678e5
#6613 #6614 remove superfluous mappings
2017-08-11 21:21:21 +02:00
Marco Pivetta
8b185eb822
#6613 #6614 rewrote test logic to be less magic-constant-dependent
2017-08-11 21:21:17 +02:00
Marco Pivetta
693a0546d3
#6613 #6614 CS - applying @group annotation to the test
2017-08-11 21:21:14 +02:00
Marco Pivetta
5c5c8fc487
#6613 #6614 removing dedicated DDC6613 model directory
2017-08-11 21:21:10 +02:00
Marco Pivetta
85dc707cc8
#6613 #6614 smashing entity definitions into the test
2017-08-11 21:21:03 +02:00
Marco Pivetta
64a1251b61
#6613 #6614 better test specification - removing useless assertions
2017-08-11 21:20:42 +02:00
Marco Pivetta
65ed6a2c2f
#6613 #6614 simplifying entity definition - using auto-assigned string identifiers to reduce moving parts
2017-08-11 21:20:34 +02:00
Marco Pivetta
d27a9fce7a
Merge pull request #6580 from Tobion/patch-1
...
Allow DBAL 2.6 and common 2.8 to be installed
2017-07-25 05:02:26 +02:00
Tobias Schultze
11659f5cfe
Allow common 2.8 to be installed
2017-07-24 16:38:01 +02:00
Tobias Schultze
68dad26482
Allow DBAL 2.6 to be installed
...
DBAL 2.6 is released but currently dependencies can't be resolved as ORM 2.5 does not allow DBAL 2.6 and ORM 2.6 is not relased yet.
2017-07-24 16:27:53 +02:00
Marco Pivetta
b3ceef0fb6
Merge branch 'fix/#6550-correct-return-value-of-extra-lazy-removeElement-calls' into 2.5
...
Backport #6550 to 2.5
2017-07-22 09:27:30 +02:00
Andreas Braun
095b365146
Add test for removing element not in collection
2017-07-22 09:27:13 +02:00
Andreas Braun
7c1ebd99bc
Fix return of removeElement on collections
...
Fixes #5745
2017-07-22 09:27:01 +02:00
Marco Pivetta
c06f19db8d
Merge branch 'fix/#1515-clean-hydrator-listeners-on-hydration-end-2.5' into 2.5
...
Close #1515
This is a backport of the original PR - the same patch should land in `master` too, after a cleanup
2017-06-24 03:23:19 +02:00
Emiel Nijpels
0be9be4e24
DDC-3146 remove event listener from event listener in abstract hydrator in cleanup function
2017-06-24 03:23:01 +02:00
Luís Cobucci
b2bf5ee92e
Leave PHP 7.1 and nightly to master
2017-06-22 07:57:54 +02:00
Luís Cobucci
698bd813a2
Remove HHVM from build
2017-06-22 07:46:45 +02:00
Jáchym Toušek
b2ac8fdfd7
Fix CountOutputWalker for queries with GROUP BY
2017-06-22 07:15:35 +02:00
Marco Pivetta
9c2b54b748
Adding classes required by the SchemaToolTest that exist in 'master', but not in '2.5'
2017-06-21 07:27:41 +02:00
Marco Pivetta
910784213f
Corrected duplicate import statements due to cherry picking
2017-06-21 06:49:45 +02:00
Marco Pivetta
1d1de7de80
Merge branch 'fix/#5798-undefined-schema-tool-index-2.5' into 2.5
...
Close #5798
2017-06-21 06:32:00 +02:00
Sergey Fedotov
741da6eed7
Fix undefined index for discriminator column in SchemaTool
2017-06-21 06:31:23 +02:00
Marco Pivetta
ad5397b581
Merge branch 'fix/#5715-fix-metadata-filtering-in-cli-tools-2.5' into 2.5
...
Close #5715
2017-06-21 06:15:42 +02:00
Guilliam Xavier
57bb46ca9d
Add regex tests for MetadataFilter (PR #507 )
2017-06-21 06:15:25 +02:00
Guilliam Xavier
0416d5e036
Add more basic tests for MetadataFilter
2017-06-21 06:15:14 +02:00
Guilliam Xavier
a14432117a
Fix MetadataFilter not testing filters after first
2017-06-21 06:15:01 +02:00
Guilliam Xavier
824f62d3bb
Add failing test for #5715 (unit test for MetadataFilter)
2017-06-21 06:14:48 +02:00
Marco Pivetta
c0f0fe060f
Merge branch 'fix/#1541-minor-docblock-correction-in-resultset-mapping-builder' into 2.5
...
Backport #1541 to 2.5
2017-05-20 16:45:59 +02:00
aleeeftw
caffbe04a2
Minor docblock correction
...
The documentation for the method ‘addJoinedEntityFromClassMetadata’ is
wrong. As we can see currently says you need to pass an object and that
is wrong. The $relation variable is passed to ‘addJoinedEntityResult’
which is using it as a ‘string’.
2017-05-20 16:45:25 +02:00
Marco Pivetta
d2c805b071
Correcting PHP 5.4 compliance by removing ::class usage (moving to real constants)
2017-05-02 09:33:48 +02:00
Marco Pivetta
04fc7a9a1c
Merge branch 'fix/#6367-#6362-inheritance-alias-hydration' into 2.5
...
Close #6367
Close #6362
2017-05-02 09:26:54 +02:00
Timothy Clissold
149b8f4e09
Fix inheritance join alias
2017-05-02 09:26:44 +02:00
Marco Pivetta
48e8c02cb8
Merge pull request #6381 from ElisDN/ElisDN-phpdoc
...
Fixed PHPDoc
2017-04-03 09:04:13 +02:00
Елисеев Дмитрий
e218866a69
Fixed PHPDoc
2017-04-02 20:29:46 +03:00
Marco Pivetta
e6c434196c
Merge pull request #6178 from doctrine/fix/#6174-#5570-merging-new-entities-should-also-trigger-prepersist-lifecycle-callbacks-2.5
...
Backport #6177 - fix #6174 #5570 : merging new entities should also trigger prepersist lifecycle callbacks with the merged data
2016-12-18 16:42:34 +01:00
Marco Pivetta
d52dbe62ac
#6174 #5570 switching ::class to string constants for PHP 5.4 compat (still supported in ORM 2.5.x)
2016-12-18 16:24:42 +01:00
Marco Pivetta
b0ede40f47
#6174 #5570 removed modifications applied to the CompanyContractListener, since UnitOfWorkTest now completely encapsulates the scenarios being covered
2016-12-18 16:13:11 +01:00
Marco Pivetta
3645a9c44d
#6174 #5570 removed unused imports
2016-12-18 16:13:04 +01:00
Marco Pivetta
39ce6f96a0
#6174 #5570 renamed entity for better fitting the use-cases it's in
2016-12-18 16:12:57 +01:00
Marco Pivetta
e43f5304ef
#6174 #5570 removed unused test class
2016-12-18 16:12:46 +01:00
Marco Pivetta
67724eb7ae
#6174 #5570 adding group annotations to newly introduced test
2016-12-18 16:12:36 +01:00
Marco Pivetta
8d4bc0638d
#6174 #5570 prePersist listeners should never be called when entities are merged, but are already in the UoW
2016-12-18 16:12:29 +01:00
Marco Pivetta
81186105b6
#6174 #5570 started moving tests around prePersist event subscriber triggering on UnitOfWork into the UnitOfWorkTest
2016-12-18 16:12:03 +01:00
Marco Pivetta
beef8acdf5
#6174 #5570 CS fixes around the EntityListenersOnMergeTest
2016-12-18 16:10:17 +01:00
Marco Pivetta
26fc8d60e6
#6174 #5570 adding group annotation to newly introduced tests
2016-12-18 16:10:08 +01:00
Marco Pivetta
12e8ab216a
#6174 #5570 CS - spacing/variable naming
2016-12-18 16:09:59 +01:00
Marco Pivetta
dac1a16964
#6174 #5570 removed unused/dead code
2016-12-18 16:09:52 +01:00
