Merge remote-tracking branch 'upstream/master'

[nominatim.git] / phpcs.xml

diff --git a/phpcs.xml b/phpcs.xml
index 2f4bc11823b89be57f01c1df771f00b33d08beda..ab9d3969284b0961f0b4f31c9d4243de05556e5d 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,6 +8,12 @@
   <!-- https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/PSR2/ruleset.xml -->
   <rule ref="PSR2"/>
 
   <!-- https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/PSR2/ruleset.xml -->
   <rule ref="PSR2"/>
 

+  <exclude-pattern>./lib/template/*html*</exclude-pattern>
+  <exclude-pattern>./lib/template/includes/</exclude-pattern>
+  <exclude-pattern>./module/</exclude-pattern>
+  <exclude-pattern>./website/css</exclude-pattern>
+  <exclude-pattern>./website/js</exclude-pattern>
+

   <rule ref="Generic.Files.LineLength">
     <properties>
      <property name="lineLimit" value="194"/>
   <rule ref="Generic.Files.LineLength">
     <properties>
      <property name="lineLimit" value="194"/>


@@ -26,6 +32,13 @@
 
 
 
 
 
 

+  <!-- eval, system, etc -->
+  <rule ref="Generic.PHP.ForbiddenFunctions">
+    <properties>
+      <property name="forbiddenFunctions" type="array" value="sizeof=>count,delete=>unset,print=>echo,create_function=>null,eval=>null"/>
+    </properties>
+  </rule>
+

   <!-- **************************************************************
        DOCUMENTATION
        ************************************************************** -->
   <!-- **************************************************************
        DOCUMENTATION
        ************************************************************** -->


@@ -80,18 +93,7 @@
        INDENTATION, SPACING
        ************************************************************** -->
 
        INDENTATION, SPACING
        ************************************************************** -->
 

-  <!-- We don't need 2 blank lines after function -->
-  <rule ref="Squiz.WhiteSpace.FunctionSpacing.After">
-    <severity>0</severity>
-  </rule>
-
-  <!-- Aligned looks nicer, but causes too many warnings currently -->
-  <rule ref="Generic.Formatting.MultipleStatementAlignment.NotSame">
-    <severity>0</severity>
-  </rule>
-  <rule ref="Generic.Formatting.MultipleStatementAlignment.NotSameWarning">
-    <severity>0</severity>
-  </rule>
+  <rule ref="Squiz.Arrays.ArrayDeclaration.KeyNotAligned" />

 
   <!-- Aligned looks nicer, but causes too many warnings currently -->
   <rule ref="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned">
 
   <!-- Aligned looks nicer, but causes too many warnings currently -->
   <rule ref="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned">


@@ -103,7 +105,6 @@
 
 
 
 
 
 

-

   <!-- **************************************************************
        VARIABLES
        ************************************************************** -->
   <!-- **************************************************************
        VARIABLES
        ************************************************************** -->


@@ -126,6 +127,25 @@
     <severity>0</severity>
   </rule>
 
     <severity>0</severity>
   </rule>
 

+  <!-- array() instead of [] for initialisation -->
+  <rule ref="Generic.Arrays.DisallowShortArraySyntax.Found" />
+
+
+
+
+  <!-- **************************************************************
+       STRING QUOTING
+       ************************************************************** -->
+
+  <!-- Prefer single quoted strings -->
+  <rule ref="Squiz.Strings.DoubleQuoteUsage" />
+
+  <!-- We allow variabled inside double-quoted strings "abc $somevar" -->
+  <rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
+    <severity>0</severity>
+  </rule>
+
+