EZP-31281: Decoupled RoleDomainMapper from Repository #42
Conversation
alongosz
requested review from
Nattfarinn,
mikadamczyk,
adamwojs,
michal-myszka,
ViniTou and
webhdx
Moved \eZ\Publish\Core\Repository\Helper\RoleDomainMapper to \eZ\Publish\Core\Repository\Mapper\RoleDomainMapper. Kept Helper\RoleDomainMapper for temporary BC with 1st party packages.
alongosz
force-pushed
the
move-role-domain-mapper
branch
from
2701726
to
e51c154
Compare
alongosz
changed the title
There was a problem hiding this comment.
we could change
MapperRoleDomainMappertoBaseRoleDomainMapper
Squashed into 0fa9110.
@mikadamczyk @adamwojs I've expanded the scope here by introducing decoupling as well, to speed up things for @Nattfarinn in #44.
Added b184253 and e51c154. Sorry for the inconvenience.
| @@ -1075,34 +1074,16 @@ protected function getUserReferenceMock() | |||
| /** | |||
| * @return \eZ\Publish\API\Repository\Repository|\PHPUnit\Framework\MockObject\MockObject | |||
| */ | |||
| protected function getRepositoryMock($methods = []) | |||
| protected function getRepositoryMock(): Repository | |||
There was a problem hiding this comment.
This was quite misleading as it was not used. Moreover inherited from parent Base which did not have this argument.
There were no usages with this argument in the codebase anyway.
| { | ||
| if ($this->repositoryMock === null) { | ||
| $this->repositoryMock = $this | ||
| ->getMockBuilder(CoreRepository::class) | ||
| ->setMethods(['getPermissionResolver']) | ||
| ->onlyMethods(['getPermissionResolver']) |
There was a problem hiding this comment.
setMethods is deprecated.
| protected function getRoleDomainMapperMock(array $methods = []): RoleDomainMapper | ||
| { | ||
| if ($this->roleDomainMapperMock === null) { | ||
| $mockBuilder = $this->getMockBuilder(RoleDomainMapper::class); | ||
| if (!empty($methods)) { | ||
| $mockBuilder->onlyMethods($methods); | ||
| } | ||
| $this->roleDomainMapperMock = $mockBuilder | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
| } | ||
|
|
||
| return $this->roleDomainMapperMock; | ||
| } |
There was a problem hiding this comment.
Moved from child class as now it's needed here as well. Not 1:1 because setMethods is deprecated. Diff could be a bit confusing, because passing $methods directly will lead to "no methods" with an empty array, rather than what we've expected here.
|
Regression tests passed (see the last link to the private repo). Merging to unblock #44. |
v3.0.1This is one of the last steps towards decoupling PermissionResolver (cc @Nattfarinn)
I've moved
\eZ\Publish\Core\Repository\Helper\RoleDomainMapperto\eZ\Publish\Core\Repository\Mapper\RoleDomainMapper.For now I've kept
Helper\RoleDomainMapperfor temporary BC with 1st party packages to avoid fighting with false negative CI issues (used by ezplatform-http-cache Behat tests). To be dropped after merging this one and aligning ezplatform-http-cache.After I was done with that, I've decoupled
RoleDomainMapperfromRepository. Merged into this PR to speed up process for #44. This is still the scope of EZP-31281 and makes it now complete.Checklist:
$ composer fix-cs).