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
Marco Pivetta
d9821d3fda
#6174 #5570 CS - spacing
2016-12-18 16:09:45 +01:00
Marco Pivetta
576a4d7e31
#6174 #5570 CS - spacing
2016-12-18 16:09:38 +01:00
Marco Pivetta
eaee924180
#6174 #5570 flattened nested conditionals
2016-12-18 16:09:32 +01:00
Marco Pivetta
cf941ce54f
#6174 #5570 documenting thrown exception types
2016-12-18 16:09:25 +01:00
Marco Pivetta
cfb7461f51
#6174 #5570 CS - alignment
2016-12-18 16:09:18 +01:00
bilouwan
569c08ce55
Rename test
2016-12-18 16:09:11 +01:00
bilouwan
295523cdca
Cherry pick unit test from PR #5570 (Fix PrePersist EventListener when using merge instead of persist)
2016-12-18 16:09:00 +01:00
bilouwan
25efabdb74
doMerge will mergeEntityStateIntoManagedCopy BEFORE persistNew to let lifecyle events changes be persisted
2016-12-18 16:08:15 +01:00
bilouwan
1d96178097
Create failing test to reveal the issue
2016-12-18 16:08:05 +01:00
Marco Pivetta
20cb50451d
Merge pull request #6159 from nicolas-cajelli/backport-fix-relation-cache-#1551-to-2.5
...
#5821 Backport #1551 - Fixed support for inverse side second level cache
2016-12-12 08:34:27 +01:00
Guilherme Blanco
0ff512ba8f
Fixed support for inverse side second level cache
2016-12-05 14:36:33 -03:00
Marco Pivetta
5e9014fd99
Merge pull request #6156 from Slamdunk/patch-2
...
Allow doctrine/common 2.7
2016-12-04 06:53:07 +01:00
Filippo Tessarotto
a90cd9dfe8
Allow doctrine/common 2.7
2016-12-02 09:00:50 +01:00
Marco Pivetta
4d699789a2
Merge branch 'fix/#6110-collection-clear-should-also-clear-keys-2.5' into 2.5
...
Close #6110
2016-11-26 06:06:11 +01:00
Marco Pivetta
1486c8f8e2
split test into multiple sub-scenarios involving PersistentCollection key checking #6110
2016-11-26 06:05:31 +01:00
Steevan BARBOYON
3dadfa49d5
Clear $this->collection even when empty, to reset indexes
2016-11-26 06:04:35 +01:00
Marco Pivetta
9b36947a48
Merge branch 'fix/#6028-l2c-inheritance-query-cache-use-parent-entity-name-2.5' into 2.5
...
Backport #6028 to 2.5.x
2016-11-23 18:06:28 +01:00
Marco Pivetta
2122297fdb
#6028 removed specific ::class usage, since 2.5.x still supports PHP 5.4.x
2016-11-23 18:06:14 +01:00
Marco Pivetta
af99cba28c
#6028 removed specific ::class usage, since 2.5.x still supports PHP 5.4.x
2016-11-23 18:02:15 +01:00
Luís Cobucci
9bcee455ca
Make child entity share the timestamp region with parent class
2016-11-23 17:58:05 +01:00
Marco Pivetta
73e4be7c7b
Merge branch 'fix/#5768-#5755-clone-proxy-private-properties-in-multi-level-inheritances-2.5' into 2.5
...
Close #5768
Close #5755
2016-09-10 20:51:13 +02:00
