#5934 - add `fetch` option to `AssociationOverride` in order to override fetch strategy for subclasses of entities #5938

Ma27 · 2016-07-16T10:12:58Z

adds the fetch option to the association-override sequence.

patrick-mcdougle · 2016-07-17T23:24:01Z

tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.xml

+            <generator strategy="AUTO" />
+        </id>
+
+        <many-to-many target-entity="DDC5934Member" inversed-by="contract" fetch="LAZY" field="members" />


Is there a typo here? Should this be contracts?

possibly. Some tests are still failing. Try to fix it somehow in the next days...

no, not a typo ;)

Ma27 · 2016-08-16T22:24:54Z

ok, fixed the tests now and squashed everything into a single commit

@Ocramius anything to add here?

patrick-mcdougle · 2016-08-17T17:53:47Z

Looks good to me! LGTM!

patrick-mcdougle · 2016-09-11T03:05:30Z

Sad that this didn't make the release. Anything else to do for this one @Ocramius?

Ocramius · 2016-09-11T03:08:04Z

Patch releases don't get new features, folks!

On 11 Sep 2016 5:05 a.m., "Patrick McDougle" notifications@github.com
wrote:

Sad that this didn't make the release. Anything else to do for this one
@Ocramius https://github.com/Ocramius?

—
You are receiving this because you were mentioned.

Reply to this email directly, view it on GitHub
#5938 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAJakJo4yXGsBgmhgwM87OAaoksnct0bks5qo2_6gaJpZM4JN-7o
.

Ma27 · 2016-09-11T06:09:44Z

http://semver.org/ - the release yesterday was a release which shouldn't contain anything which is a new feature (and this one is definitly a new feature)

patrick-mcdougle · 2016-11-07T18:48:34Z

Can we get this in 3.0?

Ma27 · 2016-11-23T18:34:26Z

@patrick-mcdougle we'll see, 2.6 hopefully :-)

koemeet · 2017-05-30T13:41:58Z

Any news on this?

…ide fetch strategy for subclasses of entities

lcobucci

I've rebased it to sync with master, made a tiny change (to use ::class syntax) and it LGTM

Ma27 · 2017-05-30T16:53:25Z

ok, thank you @lcobucci :-)

…

On Tue, May 30, 2017 at 6:29 PM, Luís Cobucci ***@***.***> wrote: ***@***.**** approved this pull request. I've rebased it to sync with master and made a tiny change (to use ::class syntax) and it LGTM — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#5938 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFvwBHfXWf57NDx3vdjcShelzcSXqfnVks5r_EP7gaJpZM4JN-7o> .

Ocramius · 2017-05-31T09:37:59Z

lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php

@@ -621,6 +621,11 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
                    $override['inversedBy'] = (string) $overrideElement->{'inversed-by'}['name'];
                }

+                // Check for `fetch`
+                if (isset($overrideElement['fetch'])) {
+                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $overrideElement['fetch']);


Can we use ::class for the first bit of the string?

Ocramius · 2017-05-31T09:38:02Z

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

@@ -470,6 +470,11 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
                    $override['inversedBy'] = $associationOverride->inversedBy;
                }

+                // Check for `fetch`
+                if ($associationOverride->fetch) {
+                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverride->fetch);


Can we use ::class for the first bit of the string?

Ocramius · 2017-05-31T09:38:22Z

lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php

@@ -622,6 +622,11 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
                    $override['inversedBy'] = (string) $associationOverrideElement['inversedBy'];
                }

+                // Check for `fetch`
+                if (isset($associationOverrideElement['fetch'])) {
+                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverrideElement['fetch']);


Can we use ::class for the first bit of the string?

Ma27 · 2017-05-31T10:21:04Z

thanks for the review, hope I'll find some time tonight to address your comments :-)

…

On 31. May 2017, at 11:39 AM, Marco Pivetta ***@***.***> wrote: @Ocramius requested changes on this pull request. In lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php: > @@ -621,6 +621,11 @@ public function loadMetadataForClass($className, ClassMetadata $metadata) $override['inversedBy'] = (string) $overrideElement->{'inversed-by'}['name']; } + // Check for `fetch` + if (isset($overrideElement['fetch'])) { + $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $overrideElement['fetch']); Can we use ::class for the first bit of the string? In lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php: > @@ -470,6 +470,11 @@ public function loadMetadataForClass($className, ClassMetadata $metadata) $override['inversedBy'] = $associationOverride->inversedBy; } + // Check for `fetch` + if ($associationOverride->fetch) { + $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverride->fetch); Can we use ::class for the first bit of the string? In lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php: > @@ -622,6 +622,11 @@ public function loadMetadataForClass($className, ClassMetadata $metadata) $override['inversedBy'] = (string) $associationOverrideElement['inversedBy']; } + // Check for `fetch` + if (isset($associationOverrideElement['fetch'])) { + $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverrideElement['fetch']); Can we use ::class for the first bit of the string? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or mute the thread.

@Ocramius

…N in config drivers as of @Ocramius's review

Ocramius

LGTM 👍

lcobucci · 2017-05-31T12:56:51Z

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

@@ -472,7 +472,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)

                // Check for `fetch`
                if ($associationOverride->fetch) {
-                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverride->fetch);
+                    $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . $associationOverride->fetch);


This won't work since ClassMetadata points to Doctrine\Common\Persistence\Mapping\ClassMetadata and it doesn't have the constants.

ouch, I'm sorry^^

ARGH, good catch :S

…get of ::class expression

Ma27 · 2017-05-31T16:37:50Z

@lcobucci as travis-ci seems to not run on this PR, I just executed the corresponding tests on my machine:

→ ./vendor/bin/phpunit --group DDC-5934
PHPUnit 6.2-g3e3c42c32 by Sebastian Bergmann and contributors.

......                                                              6 / 6 (100%)

Time: 1.01 seconds, Memory: 36.00MB

OK (6 tests, 12 assertions)

Ocramius · 2017-05-31T18:24:42Z

@Ma27 travis passed! 👍

patrick-mcdougle reviewed Jul 17, 2016
View reviewed changes

#5934 - add fetch option to AssociationOverride in order to overr…

92476b5

…ide fetch strategy for subclasses of entities

lcobucci approved these changes May 30, 2017

View reviewed changes

lcobucci self-assigned this May 30, 2017

lcobucci added the New Feature label May 30, 2017

lcobucci added this to the 2.6.0 milestone May 30, 2017

lcobucci requested a review from Ocramius May 30, 2017 16:30

Ocramius suggested changes May 31, 2017

View reviewed changes

#5934 - #5938 - use ClassMetadata::class expression rather than FQC…

fcfaa13

…N in config drivers as of @Ocramius's review

Ocramius approved these changes May 31, 2017

View reviewed changes

lcobucci suggested changes May 31, 2017

View reviewed changes

#5934 - #5938 - fix accidentally introduced regression with wrong tar…

49bb345

…get of ::class expression

Ocramius merged commit 22ecc2d into doctrine:master May 31, 2017

Ocramius mentioned this pull request May 31, 2017

Allow override of fetch for associations #5934

Closed

Ma27 deleted the feature/DDC5934-allow-fetch-override branch May 31, 2017 18:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#5934 - add `fetch` option to `AssociationOverride` in order to override fetch strategy for subclasses of entities #5938

#5934 - add `fetch` option to `AssociationOverride` in order to override fetch strategy for subclasses of entities #5938

Ma27 commented Jul 16, 2016

patrick-mcdougle Jul 17, 2016

Ma27 Jul 18, 2016

Ma27 Aug 16, 2016 •

edited

Loading

Ma27 commented Aug 16, 2016 •

edited

Loading

patrick-mcdougle commented Aug 17, 2016

patrick-mcdougle commented Sep 11, 2016

Ocramius commented Sep 11, 2016

Ma27 commented Sep 11, 2016

patrick-mcdougle commented Nov 7, 2016

Ma27 commented Nov 23, 2016

koemeet commented May 30, 2017

lcobucci left a comment •

edited

Loading

Ma27 commented May 30, 2017 via email

Ocramius May 31, 2017

Ocramius May 31, 2017

Ocramius May 31, 2017

Ma27 commented May 31, 2017 via email

Ocramius left a comment

lcobucci May 31, 2017

Ma27 May 31, 2017

Ocramius May 31, 2017

Ma27 commented May 31, 2017

Ocramius commented May 31, 2017

#5934 - add fetch option to AssociationOverride in order to override fetch strategy for subclasses of entities #5938

#5934 - add fetch option to AssociationOverride in order to override fetch strategy for subclasses of entities #5938

Conversation

Ma27 commented Jul 16, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ma27 Aug 16, 2016 • edited Loading

Choose a reason for hiding this comment

Ma27 commented Aug 16, 2016 • edited Loading

patrick-mcdougle commented Aug 17, 2016

patrick-mcdougle commented Sep 11, 2016

Ocramius commented Sep 11, 2016

Ma27 commented Sep 11, 2016

patrick-mcdougle commented Nov 7, 2016

Ma27 commented Nov 23, 2016

koemeet commented May 30, 2017

lcobucci left a comment • edited Loading

Choose a reason for hiding this comment

Ma27 commented May 30, 2017 via email

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ma27 commented May 31, 2017 via email

Ocramius left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ma27 commented May 31, 2017

Ocramius commented May 31, 2017

#5934 - add `fetch` option to `AssociationOverride` in order to override fetch strategy for subclasses of entities #5938

#5934 - add `fetch` option to `AssociationOverride` in order to override fetch strategy for subclasses of entities #5938

Ma27 Aug 16, 2016 •

edited

Loading

Ma27 commented Aug 16, 2016 •

edited

Loading

lcobucci left a comment •

edited

Loading