X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/74c06ef877c590774b59d31ab96428e5026dd284..1424e8e29bd54d3f713a38a834ff0c8ff5f463fb:/phpcs.xml?ds=sidebyside

diff --git a/phpcs.xml b/phpcs.xml
index 6c7ce19e..2f4bc118 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,29 +8,28 @@
   <!-- https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/PSR2/ruleset.xml -->
   <rule ref="PSR2"/>
 
-
-
-
-  <!-- currently 300 warnings, we set a limit later -->
   <rule ref="Generic.Files.LineLength">
     <properties>
-     <property name="lineLimit" value="9999"/>
-     <property name="absoluteLineLimit" value="0"/>
+     <property name="lineLimit" value="194"/>
+     <property name="absoluteLineLimit" value="194"/>
     </properties>
   </rule>
 
 
+  <!-- "A file should declare new symbols (classes, functions, constants, etc.) and cause no
+    other side effects, or it should execute logic with side effects, but should not do both."
+    ... we have too many script and includes to be able to enforce that.
+     -->
+  <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
+    <severity>0</severity>
+  </rule>
+
+
 
   <!-- **************************************************************
        DOCUMENTATION
        ************************************************************** -->
 
-  <rule ref="PEAR.Commenting.FileComment.Missing">
-    <severity>0</severity>
-  </rule>
-  <rule ref="PEAR.Commenting.ClassComment.Missing">
-    <severity>0</severity>
-  </rule>    
   <rule ref="PEAR.Commenting.FunctionComment.Missing">
     <severity>0</severity>
   </rule>
@@ -42,6 +41,12 @@
        COMMENTS
        ************************************************************** -->
 
+  <!-- any comments in the lines before function() are better than forcing
+       a PHPdoc style right now -->
+  <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
+    <severity>0</severity>
+  </rule>
+
   <!-- We allow comments after statements -->
   <rule ref="Squiz.Commenting.PostStatementComment.Found">
     <severity>0</severity>
@@ -50,6 +55,10 @@
   <rule ref="Squiz.Commenting.InlineComment.NoSpaceBefore">
     <severity>0</severity>
   </rule>
+  <!-- blank lines after inline comments are fine -->
+  <rule ref="Squiz.Commenting.InlineComment.SpacingAfter">
+    <severity>0</severity>
+  </rule>
 
   <!-- Comments don't have to start uppercase -->
   <rule ref="Squiz.Commenting.InlineComment.NotCapital">
@@ -59,16 +68,10 @@
   <rule ref="Squiz.Commenting.InlineComment.InvalidEndChar">
     <severity>0</severity>
   </rule>
-
-  <!-- we don't need '} // functionname()' at end of large blocks -->
-  <rule ref="Squiz.Commenting.ClosingDeclarationComment.Missing">
+  <!-- Empty comments are fine -->
+  <rule ref="Squiz.Commenting.InlineComment.Empty">
     <severity>0</severity>
   </rule>
-  <!-- .. same for conditions -->
-  <rule ref="Squiz.Commenting.LongConditionClosingComment.Missing">
-    <severity>0</severity>
-  </rule>
-
 
 
 
@@ -86,6 +89,9 @@
   <rule ref="Generic.Formatting.MultipleStatementAlignment.NotSame">
     <severity>0</severity>
   </rule>
+  <rule ref="Generic.Formatting.MultipleStatementAlignment.NotSameWarning">
+    <severity>0</severity>
+  </rule>
 
   <!-- Aligned looks nicer, but causes too many warnings currently -->
   <rule ref="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned">
@@ -131,12 +137,6 @@
   <rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed">
     <severity>0</severity>
   </rule>
-  <rule ref="Generic.ControlStructures.InlineControlStructure.Discouraged">
-    <severity>0</severity>
-  </rule>
-  <rule ref="Squiz.PHP.DisallowInlineIf.Found">
-    <severity>0</severity>
-  </rule>
 
   <!-- We allow "if (a)". No need for "if (a === TRUE)" -->
   <rule ref="Squiz.Operators.ComparisonOperatorUsage.ImplicitTrue">
@@ -147,25 +147,6 @@
     <severity>0</severity>
   </rule>
 
-  <!-- We allow
-              if (a)
-              {
-  -->
-  <rule ref="PEAR.ControlStructures.MultiLineCondition.NewlineBeforeOpenBrace">
-    <severity>0</severity>
-  </rule>
-  <!-- ... same -->
-  <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose">
-    <severity>0</severity>
-  </rule>
-  <!-- ... same for foreach/while etc -->
-  <rule ref="PEAR.ControlStructures.ControlSignature">
-    <severity>0</severity>
-  </rule>
-  <!-- ... same -->
-  <rule ref="Squiz.WhiteSpace.FunctionClosingBraceSpace.SpacingBeforeClose">
-    <severity>0</severity>
-  </rule>
 
 
 </ruleset>