Skip to content

Only load viewer in settings if the viewer app is enabled - #22650

Merged
MorrisJobke merged 1 commit into
masterfrom
fix/noid/fix-psalm-warning
Sep 7, 2020
Merged

Only load viewer in settings if the viewer app is enabled#22650
MorrisJobke merged 1 commit into
masterfrom
fix/noid/fix-psalm-warning

Conversation

@MorrisJobke

@MorrisJobkeMorrisJobke commented Sep 7, 2020

Copy link
Copy Markdown
Member

Found by Psalm:

2 errors fixed
/github/workspace/apps/settings/lib/Settings/Personal/ServerDevNotice.php:83:37:error - UndefinedClass: Class or interface OCA\Viewer\Event\LoadViewer does not exist
/github/workspace/apps/settings/lib/Settings/Personal/ServerDevNotice.php:83:60:error - UndefinedClass: Class or interface OCA\Viewer\Event\LoadViewer does not exist

@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Sep 7, 2020
@MorrisJobkeMorrisJobke added this to the Nextcloud 20 milestone Sep 7, 2020
@MorrisJobkeMorrisJobke mentioned this pull request Sep 7, 2020
Merged
2 tasks
@MorrisJobke

MorrisJobke commented Sep 7, 2020

Copy link
Copy Markdown
MemberAuthor

Regression from #22136

@kesselb

kesselb commented Sep 7, 2020

Copy link
Copy Markdown
Contributor

Viewer app is always enabled afaik.

@skjnldsv

skjnldsv commented Sep 7, 2020

Copy link
Copy Markdown
Member

Viewer app is always enabled afaik.

This 👍
You cannot disable nor remove viewer

@MorrisJobke

MorrisJobke commented Sep 7, 2020

Copy link
Copy Markdown
MemberAuthor

You cannot disable nor remove viewer

Didn't knew that. I thought it is only default enabled. Then we should add it to the external dependencies that are available.

@MorrisJobke
MorrisJobkeforce-pushed the fix/noid/fix-psalm-warning branch from a64a5b6 to 6a47634CompareSeptember 7, 2020 18:25
@MorrisJobke
Only load viewer in settings if the viewer app is enabled
ce1e873
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
MorrisJobkeforce-pushed the fix/noid/fix-psalm-warning branch from 6a47634 to ce1e873CompareSeptember 7, 2020 18:26
@MorrisJobke

MorrisJobke commented Sep 7, 2020

Copy link
Copy Markdown
MemberAuthor

I changed it to a zero-cost check that asserts the obvious, but fails in development environments properly.

@MorrisJobke
MorrisJobke merged commit 0e6344f into masterSep 7, 2020
@MorrisJobke
MorrisJobke deleted the fix/noid/fix-psalm-warning branch September 7, 2020 18:41
@rullzerrullzer mentioned this pull request Sep 8, 2020
Merged
13 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@kesselbkesselbkesselb approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@rullzerrullzerAwaiting requested review from rullzer
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr

Assignees

No one assigned

Labels

3. to reviewWaiting for reviews

Projects

None yet

Milestone

Nextcloud 20

Development

Successfully merging this pull request may close these issues.

4 participants

@MorrisJobke@kesselb@skjnldsv@ChristophWurst