Fixes model visibility #2580
Merged
Fixes model visibility #2580
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
Model Visibility extender does not take into consideration missing dependencies. For instance flarum/tags adds a policy on the Flag model from flarum/flags. But because flarum/flags might as well not be installed we need to check for the existence of that model. Otherwise the exception is thrown or flarum fails to boot.
|
Issue: #2539 Alternate PR: flarum/tags#109 I like this one better though since it's more generic. Maybe there are other issues we need to fix this for? |
askvortsov1
requested changes
Jan 28, 2021
| @@ -44,7 +44,7 @@ public function __construct(string $modelClass) | |||
| { | |||
| $this->modelClass = $modelClass; | |||
|
|
|||
| if (! method_exists($modelClass, 'registerVisibilityScoper')) { | |||
| if (class_exists($this->modelClass) && ! is_callable([$modelClass, 'registerVisibilityScoper'])) { | |||
There was a problem hiding this comment.
Should this fail silently if the model doesn't exist? Although I suppose that would be inline with behavior of current extensions.
There was a problem hiding this comment.
I think the original idea behind the policy was to apply only when flags was installed. I don't think we need to log anything here.
askvortsov1
approved these changes
Jan 29, 2021
SychO9
approved these changes
Jan 29, 2021
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.
Model Visibility extender does not take into consideration missing
dependencies. For instance flarum/tags adds a policy on the Flag model
from flarum/flags. But because flarum/flags might as well not be
installed we need to check for the existence of that model. Otherwise
the exception is thrown or flarum fails to boot.