From 947e918f05d70d5dce4efa4ef403e593581c3fa9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Feb 2021 12:26:24 +0100
Subject: Travis: Enforce phpcs line length + whitespace (#3488)

* Update Travis line length

* Also check whitespace in CSS files

* Fix line length ext.php

* More syntax, string templates

* Fix exclude-pattern

* Test JS files as well
---
 phpcs.xml | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'phpcs.xml')

diff --git a/phpcs.xml b/phpcs.xml
index b2bbe8896..5da38fa5b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="FreshRSS Ruleset">
 	<description>Created with the PHP Coding Standard Generator. https://edorian.github.com/php-coding-standard-generator/</description>
-	<!-- to circumvent https://github.com/squizlabs/PHP_CodeSniffer/pull/1404 -->
-	<arg name="tab-width" value="40"/>
+	<arg name="extensions" value="php,phtml,css,js"/>
+	<arg name="tab-width" value="4"/>
 	<exclude-pattern>./lib/SimplePie/</exclude-pattern>
 	<exclude-pattern>./lib/PHPMailer/</exclude-pattern>
 	<exclude-pattern>./lib/http-conditional.php</exclude-pattern>
 	<exclude-pattern>./lib/lib_phpQuery.php</exclude-pattern>
+	<exclude-pattern>./node_modules/</exclude-pattern>
 	<exclude-pattern>./data/config.php</exclude-pattern>
 	<exclude-pattern>./data/users/*/config.php</exclude-pattern>
 	<exclude-pattern>./extensions/</exclude-pattern>
+	<exclude-pattern>*.min.js$</exclude-pattern>
 	<!-- Duplicate class names are not allowed -->
 	<rule ref="Generic.Classes.DuplicateClassName"/>
 	<!-- Statements must not be empty -->
@@ -20,19 +22,15 @@
 	<rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
 	<!-- Do not override methods to call their parent -->
 	<rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
-	<!-- One line should not have more than 80 characters -->
-	<!-- One line must never exceed 120 characters -->
+	<!-- Maximum line length -->
 	<rule ref="Generic.Files.LineLength">
 		<!-- For language strings maximum line lengths make little sense. -->
 		<exclude-pattern>./app/i18n/</exclude-pattern>
 		<!-- Don't enforce line length on the HTML; the point is to improve legibility, not reduce it -->
-		<exclude-pattern>./app/install.php</exclude-pattern>
-		<!-- @todo remove test exclusion -->
-		<exclude-pattern>./tests/app/</exclude-pattern>
+		<exclude-pattern>*.phtml$</exclude-pattern>
 		<properties>
-			<property name="lineLimit" value="100"/>
-			<!-- needs to be large to accomodate extra large tab width to circumvent https://github.com/squizlabs/PHP_CodeSniffer/pull/1404 -->
-			<property name="absoluteLineLimit" value="500"/>
+			<property name="lineLimit" value="165"/>
+			<property name="absoluteLineLimit" value="190"/>
 		</properties>
 	</rule>
 	<!-- When calling a function: -->
@@ -92,9 +90,26 @@
 	<!-- Do not add spaces when casting -->
 	<rule ref="Squiz.WhiteSpace.CastSpacing"/>
 	<!-- Operators must have a space around them -->
-	<rule ref="Squiz.WhiteSpace.OperatorSpacing"/>
+	<rule ref="Squiz.WhiteSpace.OperatorSpacing">
+		<properties>
+			<property name="ignoreNewlines" value="true" />
+		</properties>
+	</rule>
 	<!-- Do not add a whitespace before a semicolon -->
 	<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
 	<!-- Do not add whitespace at start or end of a file or end of a line -->
 	<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
+	<!-- Expected space after closing parenthesis -->
+	<rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis">
+		<exclude-pattern>.phtml$</exclude-pattern>
+	</rule>
+	<!-- Newline required after opening brace -->
+	<rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
+		<exclude-pattern>.phtml$</exclude-pattern>
+		<exclude-pattern>.js$</exclude-pattern>
+	</rule>
+	<!-- No PHP code was found in this file -->
+	<rule ref="Internal.NoCodeFound">
+		<exclude-pattern>.phtml$</exclude-pattern>
+	</rule>
 </ruleset>
-- 
cgit v1.2.3