Skip to content

Conversation

@gary-kim
Copy link
Member

@gary-kim gary-kim commented May 2, 2020

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-kim gary-kim added bug 3. to review Waiting for reviews labels May 2, 2020
@gary-kim gary-kim added this to the Nextcloud 19 milestone May 2, 2020
Signed-off-by: Gary Kim <[email protected]>
@gary-kim gary-kim force-pushed the fix/noid/php-cs branch from c49793d to 74d4023 Compare May 2, 2020 06:28
@skjnldsv
Copy link
Member

skjnldsv commented May 2, 2020

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

@rullzer rullzer mentioned this pull request May 2, 2020
2 tasks
Copy link
Member

@rullzer rullzer left a comment

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 master May 2, 2020
@rullzer rullzer deleted the fix/noid/php-cs branch May 2, 2020 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants