From 143a0e3bc6c110980726dc53c9521d98310b67f3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Mon, 8 Jan 2018 23:37:18 -0500
Subject: [PATCH] Improve PHP Code Sniffer ruleset

- Pull Friendica specifics from
vendor/pear/text_languagedetect/phpcs.xml
- Revert changes to vendor/pear/text_languagedetect/phpcs.xml
---
 ruleset.xml                               | 17 +++++++++---
 vendor/pear/text_languagedetect/phpcs.xml | 34 ++++++-----------------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/ruleset.xml b/ruleset.xml
index c5f439e58a..a71b7062fc 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0"?>
-<ruleset>
-	<rule ref="PSR2">
-		<exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
-	</rule>
+<ruleset name="Friendica">
+    <description>Friendica Coding Standards: PSR2 with tabs instead of spaces</description>
+    <arg name="tab-width" value="4"/>
+    <rule ref="PSR2">
+        <exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
+    </rule>
+    <rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+    <rule ref="Generic.WhiteSpace.ScopeIndent">
+        <properties>
+            <property name="indent" value="4"/>
+            <property name="tabIndent" value="true"/>
+        </properties>
+    </rule>
 </ruleset>
diff --git a/vendor/pear/text_languagedetect/phpcs.xml b/vendor/pear/text_languagedetect/phpcs.xml
index 586ff6d195..611643b89c 100644
--- a/vendor/pear/text_languagedetect/phpcs.xml
+++ b/vendor/pear/text_languagedetect/phpcs.xml
@@ -1,26 +1,8 @@
-<?xml version="1.0"?>
-<ruleset name="PEAR-textlanguagedetect">
- <rule ref="PEAR">
-  <!-- we keep the old php4-style variable names for now -->
-  <exclude name="PEAR.NamingConventions.ValidFunctionName.PublicUnderscore"/>
-  <exclude name="PEAR.NamingConventions.ValidVariableName.PublicUnderscore"/>
-  <exclude name="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
-  <exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore"/>
-  <exclude name="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps"/>
-  <exclude name="PEAR.WhiteSpace.ScopeIndent.IncorrectExact"/>
-  <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
- </rule>
- <description>PSR2 with tabs instead of spaces.</description>
- <arg name="tab-width" value="4"/>
- <rule ref="PSR2">
-     <exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
-     <exclude name="Generic.Commenting.DocComment.MissingShort"/>
- </rule>
- <rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
- <rule ref="Generic.WhiteSpace.ScopeIndent">
-     <properties>
-         <property name="indent" value="4"/>
-         <property name="tabIndent" value="true"/>
-     </properties>
- </rule>
-</ruleset>
+<?xml version="1.0"?>
+<ruleset name="PEAR-textlanguagedetect">
+ <rule ref="PEAR">
+  <!-- we keep the old php4-style variable names for now -->
+  <exclude name="PEAR.NamingConventions.ValidFunctionName.PublicUnderscore"/>
+  <exclude name="PEAR.NamingConventions.ValidVariableName.PublicUnderscore"/>
+ </rule>
+</ruleset>