Allow for using Doctrine ORM >=2.6 #9169
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pamil
added
Enhancement
pamil
commented
Feb 8, 2018
| @@ -43,8 +47,9 @@ function it_removes_select_product_attribute_choices( | |||
|
|
|||
| $productAttribute->getType()->willReturn(SelectAttributeType::TYPE); | |||
|
|
|||
| $entityManager->getUnitOfWork()->willReturn($unitOfWork); | |||
| $unitOfWork->getEntityChangeSet($productAttribute)->willReturn([ | |||
There was a problem hiding this comment.
Need to use Mockery for UnitOfWork mock as Doctrine ORM 2.6 changes getEntityChangeSet definition to return a reference instead of a value and it's no supported by Prophecy.
There was a problem hiding this comment.
To be honest this spec should be rewritten to follow "don't mock what you don't own" rule and behaviour tested by Behat scenarios, but this one is the quickest solution, allows us to install Doctrine ORM 2.6 and fixes the error seen in #9164.
Zales0123
approved these changes
Feb 8, 2018
| ->shouldNotBeCalled() | ||
| ; | ||
| $entityManager->getUnitOfWork()->willReturn($unitOfWork); | ||
| $entityManager->getRepository('Sylius\Component\Product\Model\ProductAttributeValue')->shouldNotBeCalled(); |
There was a problem hiding this comment.
Is there any reason for not using ProductAttributeValue::class?
There was a problem hiding this comment.
Not really, just wanted not to change too much as I would rather rewrite the whole test instead :)
| @@ -43,8 +47,9 @@ function it_removes_select_product_attribute_choices( | |||
|
|
|||
| $productAttribute->getType()->willReturn(SelectAttributeType::TYPE); | |||
|
|
|||
| $entityManager->getUnitOfWork()->willReturn($unitOfWork); | |||
| $unitOfWork->getEntityChangeSet($productAttribute)->willReturn([ | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.