EZP-31044: Implemented SiteAccess providers #2838
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
mikadamczyk
changed the title
ViniTou
reviewed
Oct 24, 2019
eZ/Bundle/EzPublishCoreBundle/EventListener/ConsoleCommandListener.php
Outdated
Show resolved
Hide resolved
eZ/Publish/Core/MVC/Symfony/SiteAccess/Provider/ChainSiteAccessProvider.php
Outdated
Show resolved
Hide resolved
pawbuj
reviewed
Oct 28, 2019
eZ/Publish/Core/MVC/Symfony/SiteAccess/Provider/StaticSiteAccessProvider.php
Outdated
Show resolved
Hide resolved
alongosz
requested changes
Oct 29, 2019
There was a problem hiding this comment.
It's very difficult to review:
Please split commits into at least:
- class structure for SiteAccess providers
- refactoring which hooks SiteAccess providers into the Repository (or replaces SiteAccess list, depending how you see it),
- adds test coverage
- aligns existing tests (can be one commit for tests ^)
and use fixups to address code review issues (if they pop up)
Please use "providers" keyword for the PR title as well, since this is what you've actually implemented.
e.g.
EZP-31044: Implemented SiteAccess providers.
would be fine
eZ/Publish/Core/MVC/Symfony/SiteAccess/Provider/StaticSiteAccessProvider.php
Show resolved
Hide resolved
alongosz
force-pushed
the
EZP-31044-site-access-provider
branch
from
6f76950 to
16abcc8
Compare
adamwojs
reviewed
Oct 31, 2019
eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/ConsoleCommandListenerTest.php
Outdated
Show resolved
Hide resolved
mikadamczyk
force-pushed
the
EZP-31044-site-access-provider
branch
from
f96803e to
4bfc081
Compare
adamwojs
approved these changes
Nov 12, 2019
eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/RouterBaseTest.php
Outdated
Show resolved
Hide resolved
ViniTou
reviewed
Nov 13, 2019
ViniTou
approved these changes
Nov 13, 2019
pawbuj
reviewed
Nov 13, 2019
| public function getSiteAccesses(): Traversable | ||
| { | ||
| foreach ($this->siteAccessList as $name) { | ||
| yield new SiteAccess($name, SiteAccess::DEFAULT_MATCHING_TYPE, null, self::class); |
There was a problem hiding this comment.
yield $this-> getSiteAccess($name);
There was a problem hiding this comment.
We iterate over $this->siteAccessList and getSiteAccess method will perform again isDefined check which has no sense. I think it is better to return the object here.
| public function getSiteAccess(string $name): SiteAccess | ||
| { | ||
| if ($this->isDefined($name)) { | ||
| return new SiteAccess($name, SiteAccess::DEFAULT_MATCHING_TYPE, null, self::class); |
There was a problem hiding this comment.
I would consider caching siteAccesses instead of creating a new object every time function is fired.
alongosz
changed the title
alongosz
requested changes
Nov 15, 2019
| public function __construct( | ||
| string $name, | ||
| string $matchingType = self::DEFAULT_MATCHING_TYPE, | ||
| $matcher = null, |
There was a problem hiding this comment.
Follow-up: create common marker interface for URILexer and Matcher.
alongosz
approved these changes
Nov 20, 2019
katarzynazawada
approved these changes
Nov 26, 2019
mikadamczyk
force-pushed
the
EZP-31044-site-access-provider
branch
from
8659f01 to
5bf6970
Compare
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.
masterThis PR adds the possibility of having more than one source of available SiteAccesses.
By default, we have
StaticSiteAccessProviderwhich contains SiteAccesses fetched from configuration files. Provides are gathered byChainSiteAccessProviderwhich implementsSiteAccessProviderInterface. The chain is used instead of Strategy because the order of loaded SiteAccesses is important. Those coming from configuration files should be matched first.This will allows us to add another provider that will fetch another SiteAccesses from the database. This is required to introduce Site Factory.
TODO:
$ composer fix-cs).