Skip to content

Comply with php-cs for CI - #20779

Merged
rullzer merged 1 commit into
masterfrom
fix/noid/php-cs
May 2, 2020
Merged

Comply with php-cs for CI#20779
rullzer merged 1 commit into
masterfrom
fix/noid/php-cs

Conversation

@gary-kim

@gary-kimgary-kim commented May 2, 2020

Copy link
Copy Markdown
Member

This is a fix to match php-cs for the CI but I'm thinking it may be better to exclude the templates from php-cs-fixer. This fix doesn't really make much sense. Any thoughts?
EDIT: I changed the fix so the indentation still makes sense but this was the fix made by cs:fix:

diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index e0445f419c4..ccc947e68ed 100644
--- a/core/templates/layout.public.php+++ b/core/templates/layout.public.php@@ -40,10 +40,10 @@
<div class="logo logo-icon svg"></div>
<h1 class="header-appname">
<?php if (isset($template) && $template->getHeaderTitle() !== '') {
- p($template->getHeaderTitle());- } else {- p($theme->getName());- } ?>+ p($template->getHeaderTitle());+ } else {+ p($theme->getName());+ } ?>
</h1>
<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
<div class="header-shared-by">

@gary-kimgary-kim added bug 3. to review Waiting for reviews labels May 2, 2020
@gary-kimgary-kim added this to the Nextcloud 19 milestone May 2, 2020
Signed-off-by: Gary Kim <gary@garykim.dev>
@skjnldsv

Copy link
Copy Markdown
Member

Yeah, i'm in favor of excluding templates from phpcs too :)

@rullzerrullzer mentioned this pull request May 2, 2020
2 tasks

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets do this for now. But yeah maybe the templates are not ideal.

@rullzer
rullzer merged commit 5ca0ffb into masterMay 2, 2020
@rullzer
rullzer deleted the fix/noid/php-cs branch May 2, 2020 18:26
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gary-kim@skjnldsv@rullzer