From 4e2a0488940704ef9e6147860eace28c59dbbc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Thu, 19 Oct 2017 17:34:25 +0200
Subject: [PATCH] =?UTF-8?q?Utilise=20la=20configuration=20phpcs=20et=20php?=
 =?UTF-8?q?md=20par=20d=C3=A9faut.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml |  4 ++--
 phpcs.xml.dist | 24 ------------------------
 phpmd.xml      | 34 ----------------------------------
 3 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 phpcs.xml.dist
 delete mode 100755 phpmd.xml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b45479a..79ed7aab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ phploc:
 
 lint:
   <<: *defaults
-  script: parallel-lint  -j $(nproc) --exclude vendor .
+  script: parallel-lint -j $(nproc) --exclude vendor .
 
 phpcs:
   <<: *defaults
@@ -33,5 +33,5 @@ phpcpd:
 
 phpmd:
   <<: *defaults
-  script: phpmd . text ./phpmd.xml --suffixes=php
+  script: phpmd . text /rules/phpmd.xml --suffixes=php
   allow_failure: true
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
deleted file mode 100644
index 090f2dbd..00000000
--- a/phpcs.xml.dist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Irstea" namespace="Irstea\Standard">
-
-    <description>Coding standard of Irstea, pôle informatique scientifique</description>
-
-    <file>.</file>
-
-    <arg name="extensions" value="php"/>
-    <arg name="encoding" value="utf-8"/>
-    <arg value="sp"/>
-
-    <rule ref="PSR2"/>
-
-    <rule ref="Generic.Files.LineLength">
-        <properties>
-            <property name="lineLimit" value="140"/>
-        </properties>
-    </rule>
-
-    <exclude-pattern>vendor/</exclude-pattern>
-    <exclude-pattern>node_modules/</exclude-pattern>
-    <exclude-pattern>cache/</exclude-pattern>
-
-</ruleset>
diff --git a/phpmd.xml b/phpmd.xml
deleted file mode 100755
index a7731302..00000000
--- a/phpmd.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Irstea PHPMD ruleset"
-         xmlns="http://pmd.sf.net/ruleset/1.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
-
-    <description>Irstea ruleset</description>
-
-    <rule ref="rulesets/unusedcode.xml"/>
-    <rule ref="rulesets/codesize.xml"/>
-    <rule ref="rulesets/design.xml"/>
-    <rule ref="rulesets/controversial.xml"/>
-
-    <rule ref="rulesets/cleancode.xml/StaticAccess">
-        <properties>
-            <property name="exceptions" value="\DateTime,\DateTimeZone,\Doctrine\DBAL\Types\ConversionException"/>
-        </properties>
-    </rule>
-
-    <rule ref="rulesets/naming.xml">
-        <exclude name="ShortVariable"/>
-    </rule>
-
-    <rule ref="rulesets/naming.xml/ShortVariable">
-        <properties>
-            <property name="exceptions" value="em,tz,i,j,id,x,y,dn,fh,ex"/>
-        </properties>
-    </rule>
-
-    <exclude-pattern>vendor/</exclude-pattern>
-    <exclude-pattern>node_modules/</exclude-pattern>
-    <exclude-pattern>.*/cache/</exclude-pattern>
-
-</ruleset>
-- 
GitLab