From 06960c00e57736f6549df368baae0cbca8b0326b Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Wed, 14 Dec 2022 14:39:51 +0100
Subject: [PATCH 01/11] Upgrade some versions and sonar from 9.4 to 9.7

---
 docker-compose.yml                            | 14 ++---
 .../fr/cnumr/java/MyJavaRulesDefinition.java  | 16 ++++--
 .../AvoidConcatenateStringsInLoopTest.java    |  6 +-
 .../checks/AvoidFullSQLRequestCheckTest.java  |  4 +-
 .../AvoidGettingSizeCollectionInLoopTest.java |  6 +-
 .../AvoidRegexPatternNotStaticTest.java       |  6 +-
 .../AvoidSQLRequestInLoopCheckTest.java       |  4 +-
 .../AvoidSetConstantInBatchInsertTest.java    |  4 +-
 .../AvoidUsageOfStaticCollectionsTests.java   |  6 +-
 ...oidUsingGlobalVariablesCheckCheckTest.java |  4 +-
 ...ResourcesOfAutoCloseableInterfaceTest.java |  6 +-
 .../cnumr/java/checks/IncrementCheckTest.java |  4 +-
 ...itializeBufferWithAppropriateSizeTest.java |  4 +-
 ...oFunctionCallWhenDeclaringForLoopTest.java |  4 +-
 .../OptimizeReadFileExceptionCheckTest.java   |  4 +-
 ...ecessarilyAssignValuesToVariablesTest.java |  4 +-
 .../java/checks/UseCorrectLoopCheckTest.java  |  4 +-
 .../main/java/fr/cnumr/php/MyPhpRules.java    | 20 ++++---
 .../php/rules/custom/DefaultProfilePath.json  |  3 +
 pom.xml                                       | 29 ++++++----
 python-plugin/pom.xml                         | 25 +++++----
 .../python/CustomPythonRuleRepository.java    | 37 +++++-------
 .../main/java/fr/cnumr/python/RulesList.java  | 56 +++++++++++++++++++
 .../CustomPythonRuleRepositoryTest.java       |  6 +-
 24 files changed, 172 insertions(+), 104 deletions(-)
 create mode 100644 php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json
 create mode 100644 python-plugin/src/main/java/fr/cnumr/python/RulesList.java

diff --git a/docker-compose.yml b/docker-compose.yml
index 8f1641440..17e5b12e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   sonar:
-    image: sonarqube:9.3-community
+    image: sonarqube:9.7-community
     container_name: sonar_standard
     ports:
       - "9000:9000"
@@ -24,12 +24,12 @@ services:
       - type: bind
         source: ./python-plugin/target/ecocode-python-plugin-0.1.0-SNAPSHOT.jar
         target: /opt/sonarqube/extensions/plugins/ecocode-python-plugin-0.1.0-SNAPSHOT.jar
-#      - type: bind
-#        source: ./ecolinter-plugin/target/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
-#        target: /opt/sonarqube/extensions/plugins/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
-#      - type: bind
-#        source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
-#        target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
+      #      - type: bind
+      #        source: ./ecolinter-plugin/target/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
+      #        target: /opt/sonarqube/extensions/plugins/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
+      #      - type: bind
+      #        source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
+      #        target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
       - "extensions:/opt/sonarqube/extensions"
       - "logs:/opt/sonarqube/logs"
       - "data:/opt/sonarqube/data"
diff --git a/java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java b/java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java
index 00b80634a..34603e01d 100644
--- a/java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java
+++ b/java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java
@@ -23,7 +23,13 @@
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
+
+import org.sonar.api.SonarEdition;
+import org.sonar.api.SonarQubeSide;
+import org.sonar.api.SonarRuntime;
+import org.sonar.api.internal.SonarRuntimeImpl;
 import org.sonar.api.server.rule.RulesDefinition;
+import org.sonar.api.utils.Version;
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
 
 /**
@@ -46,7 +52,9 @@ public class MyJavaRulesDefinition implements RulesDefinition {
   public void define(Context context) {
     NewRepository repository = context.createRepository(REPOSITORY_KEY, LANGUAGE).setName(NAME);
 
-    RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH);
+    SonarRuntime sonarRuntime = SonarRuntimeImpl.forSonarQube(Version.create(9, 7), SonarQubeSide.SCANNER, SonarEdition.DEVELOPER);
+
+    RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH,sonarRuntime);
 
     ruleMetadataLoader.addRulesByAnnotatedClass(repository, new ArrayList<>(RulesList.getChecks()));
 
@@ -57,8 +65,8 @@ public void define(Context context) {
 
   private static void setTemplates(NewRepository repository) {
     RULE_TEMPLATES_KEY.stream()
-      .map(repository::rule)
-      .filter(Objects::nonNull)
-      .forEach(rule -> rule.setTemplate(true));
+            .map(repository::rule)
+            .filter(Objects::nonNull)
+            .forEach(rule -> rule.setTemplate(true));
   }
 }
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidConcatenateStringsInLoopTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidConcatenateStringsInLoopTest.java
index d21c1d09f..fff7aed67 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidConcatenateStringsInLoopTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidConcatenateStringsInLoopTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 public class AvoidConcatenateStringsInLoopTest {
 
     @Test
     public void checkNonCompliantTests() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidConcatenateStringsInLoop.java")
                 .withCheck(new AvoidConcatenateStringsInLoop())
                 .verifyIssues();
@@ -15,7 +15,7 @@ public void checkNonCompliantTests() {
 
     @Test
     public void checkCompliantTests() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/GoodWayConcatenateStringsLoop.java")
                 .withCheck(new AvoidConcatenateStringsInLoop())
                 .verifyNoIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidFullSQLRequestCheckTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidFullSQLRequestCheckTest.java
index e809db096..950b827c7 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidFullSQLRequestCheckTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidFullSQLRequestCheckTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidFullSQLRequestCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidFullSQLRequestCheck.java")
                 .withCheck(new AvoidFullSQLRequest())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidGettingSizeCollectionInLoopTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidGettingSizeCollectionInLoopTest.java
index 07b4c8454..9afbdc499 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidGettingSizeCollectionInLoopTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidGettingSizeCollectionInLoopTest.java
@@ -1,16 +1,16 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidGettingSizeCollectionInLoopTest {
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidGettingSizeCollectionInLoopBad.java")
                 .withCheck(new AvoidGettingSizeCollectionInLoop())
                 .verifyIssues();
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidGettingSizeCollectionInLoopGood.java")
                 .withCheck(new AvoidGettingSizeCollectionInLoop())
                 .verifyNoIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidRegexPatternNotStaticTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidRegexPatternNotStaticTest.java
index 710b3dea9..163ccfe1c 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidRegexPatternNotStaticTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidRegexPatternNotStaticTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 public class AvoidRegexPatternNotStaticTest {
 
     @Test
     public void testHasIssues() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidRegexPatternNotStatic.java")
                 .withCheck(new AvoidRegexPatternNotStatic())
                 .verifyIssues();
@@ -15,7 +15,7 @@ public void testHasIssues() {
 
     @Test
     public void testHasNoIssues() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFiles(
                         "src/test/files/ValidRegexPattern.java",
                         "src/test/files/ValidRegexPattern2.java",
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSQLRequestInLoopCheckTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSQLRequestInLoopCheckTest.java
index 0e61bd981..89538c934 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSQLRequestInLoopCheckTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSQLRequestInLoopCheckTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidSQLRequestInLoopCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidSQLRequestInLoopCheck.java")
                 .withCheck(new AvoidSQLRequestInLoop())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSetConstantInBatchInsertTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSetConstantInBatchInsertTest.java
index c568e70df..9644ad136 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSetConstantInBatchInsertTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSetConstantInBatchInsertTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidSetConstantInBatchInsertTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidSetConstantInBatchUpdateCheck.java")
                 .withCheck(new AvoidSetConstantInBatchUpdate())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsageOfStaticCollectionsTests.java b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsageOfStaticCollectionsTests.java
index 74ddfc6b7..8697b3794 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsageOfStaticCollectionsTests.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsageOfStaticCollectionsTests.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 public class AvoidUsageOfStaticCollectionsTests {
 
     @Test
     public void testHasIssues() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidUsageOfStaticCollections.java")
                 .withCheck(new AvoidUsageOfStaticCollections())
                 .verifyIssues();
@@ -15,7 +15,7 @@ public void testHasIssues() {
 
     @Test
     public void testNoIssues() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/GoodUsageOfStaticCollections.java")
                 .withCheck(new AvoidUsageOfStaticCollections())
                 .verifyNoIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsingGlobalVariablesCheckCheckTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsingGlobalVariablesCheckCheckTest.java
index 6447ede61..fa33b2e22 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsingGlobalVariablesCheckCheckTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsingGlobalVariablesCheckCheckTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidUsingGlobalVariablesCheckCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidUsingGlobalVariablesCheck.java")
                 .withCheck(new AvoidUsingGlobalVariablesCheck())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/FreeResourcesOfAutoCloseableInterfaceTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/FreeResourcesOfAutoCloseableInterfaceTest.java
index d7e9691ee..3cc25db25 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/FreeResourcesOfAutoCloseableInterfaceTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/FreeResourcesOfAutoCloseableInterfaceTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class FreeResourcesOfAutoCloseableInterfaceTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/FreeResourcesOfAutoCloseableInterface.java")
                 .withCheck(new FreeResourcesOfAutoCloseableInterface())
                 .withJavaVersion(7)
@@ -16,7 +16,7 @@ void test() {
 
     @Test
     void test_no_java_version() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/FreeResourcesOfAutoCloseableInterface.java")
                 .withCheck(new FreeResourcesOfAutoCloseableInterface())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/IncrementCheckTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/IncrementCheckTest.java
index c73d2249b..e14538cd9 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/IncrementCheckTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/IncrementCheckTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class IncrementCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/IncrementCheck.java")
                 .withCheck(new IncrementCheck())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/InitializeBufferWithAppropriateSizeTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/InitializeBufferWithAppropriateSizeTest.java
index 134b6c5ef..b9f09b68e 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/InitializeBufferWithAppropriateSizeTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/InitializeBufferWithAppropriateSizeTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class InitializeBufferWithAppropriateSizeTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/InitializeBufferWithAppropriateSize.java")
                 .withCheck(new InitializeBufferWithAppropriateSize())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/NoFunctionCallWhenDeclaringForLoopTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/NoFunctionCallWhenDeclaringForLoopTest.java
index d0ff2e1a4..62b956e76 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/NoFunctionCallWhenDeclaringForLoopTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/NoFunctionCallWhenDeclaringForLoopTest.java
@@ -1,12 +1,12 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class NoFunctionCallWhenDeclaringForLoopTest {
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/NoFunctionCallWhenDeclaringForLoop.java")
                 .withCheck(new NoFunctionCallWhenDeclaringForLoop())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/OptimizeReadFileExceptionCheckTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/OptimizeReadFileExceptionCheckTest.java
index 998c97035..8b87feb8f 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/OptimizeReadFileExceptionCheckTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/OptimizeReadFileExceptionCheckTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class OptimizeReadFileExceptionCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/OptimizeReadFileExceptionCheck.java")
                 .withCheck(new OptimizeReadFileExceptions())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/UnnecessarilyAssignValuesToVariablesTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/UnnecessarilyAssignValuesToVariablesTest.java
index 4fb0422bd..3b643311d 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/UnnecessarilyAssignValuesToVariablesTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/UnnecessarilyAssignValuesToVariablesTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class UnnecessarilyAssignValuesToVariablesTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/UnnecessarilyAssignValuesToVariablesTestCheck.java")
                 .withCheck(new UnnecessarilyAssignValuesToVariables())
                 .verifyIssues();
diff --git a/java-plugin/src/test/java/fr/cnumr/java/checks/UseCorrectLoopCheckTest.java b/java-plugin/src/test/java/fr/cnumr/java/checks/UseCorrectLoopCheckTest.java
index e19b8db7c..09af6c477 100644
--- a/java-plugin/src/test/java/fr/cnumr/java/checks/UseCorrectLoopCheckTest.java
+++ b/java-plugin/src/test/java/fr/cnumr/java/checks/UseCorrectLoopCheckTest.java
@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class UseCorrectLoopCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/UseCorrectForLoopCheck.java")
                 .withCheck(new UseCorrectForLoop())
                 .verifyIssues();
diff --git a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
index 261386ba8..04f56192a 100644
--- a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
+++ b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
@@ -22,14 +22,15 @@
 
 import com.google.common.collect.ImmutableList;
 import fr.cnumr.php.checks.*;
+import org.sonar.api.SonarEdition;
+import org.sonar.api.SonarQubeSide;
+import org.sonar.api.SonarRuntime;
+import org.sonar.api.internal.SonarRuntimeImpl;
 import org.sonar.api.server.rule.RulesDefinition;
+import org.sonar.api.utils.Version;
 import org.sonar.plugins.php.api.visitors.PHPCustomRuleRepository;
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Extension point to define a PHP rule repository.
@@ -39,6 +40,7 @@ public class MyPhpRules implements RulesDefinition, PHPCustomRuleRepository {
   public static final String LANGUAGE = "php";
   public static final String NAME = "Collectif Conception Numérique Responsable";
   public static final String RESOURCE_BASE_PATH = "fr/cnumr/l10n/php/rules/custom";
+  public static final String DEFAULT_PROFILE_PATH = "fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json";
   public static final String REPOSITORY_KEY = "cnumr-php";
   private static final Set<String> RULE_TEMPLATES_KEY = Collections.emptySet();
 
@@ -56,7 +58,7 @@ public String repositoryKey() {
    */
   @Override
   public ImmutableList<Class> checkClasses() {
-    
+
     return ImmutableList.of(IncrementCheck.class, AvoidTryCatchFinallyCheck_NOK_failsAllTryStatements.class, AvoidDoubleQuoteCheck.class,
             AvoidFullSQLRequestCheck.class, AvoidSQLRequestInLoopCheck.class, NoFunctionCallWhenDeclaringForLoop.class);
 
@@ -64,9 +66,11 @@ public ImmutableList<Class> checkClasses() {
 
   @Override
   public void define(Context context) {
-    NewRepository repository = context.createRepository(REPOSITORY_KEY, LANGUAGE).setName(NAME);
+    NewRepository repository = context.createRepository(repositoryKey(), LANGUAGE).setName(NAME);
+
+    SonarRuntime sonarRuntime = SonarRuntimeImpl.forSonarQube(Version.create(9, 7), SonarQubeSide.SCANNER, SonarEdition.DEVELOPER);
 
-    RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH);
+    RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH,DEFAULT_PROFILE_PATH,sonarRuntime);
 
     ruleMetadataLoader.addRulesByAnnotatedClass(repository, new ArrayList<>(checkClasses()));
 
diff --git a/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json b/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json
new file mode 100644
index 000000000..c00983472
--- /dev/null
+++ b/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json
@@ -0,0 +1,3 @@
+{
+"ruleKeys": ["S69"]
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a588f28ac..7d58a4efe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,24 +44,24 @@
 		<project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
 
-		<sonarqube.version>8.7.1.42226</sonarqube.version>
-		<sonarjava.version>6.14.0.25463</sonarjava.version>
+		<sonarqube.version>9.4.0.54424</sonarqube.version>
+		<sonarjava.version>7.15.0.30507</sonarjava.version>
 
 		<sonar.organization>cnumr-1</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
 		<!-- Don't forget to update this version -->
-		<jacoco.version>0.8.6</jacoco.version>
+		<jacoco.version>0.8.8</jacoco.version>
 
-		<sonar-analyzer-commons.version>1.8.0.295</sonar-analyzer-commons.version>
-		<sonar.python.version>3.4.0.7980</sonar.python.version>
-		<sonarphp.version>2.13.0.3107</sonarphp.version>
+		<sonar-analyzer-commons.version>2.1.0.1111</sonar-analyzer-commons.version>
+		<sonar.python.version>3.9.0.9230</sonar.python.version>
+		<sonarphp.version>3.3.0.5166</sonarphp.version>
 		<sonar-packaging.version>1.20.0.405</sonar-packaging.version>
-		<junit.jupiter.version>5.7.0</junit.jupiter.version>
-		<assertJ.version>3.17.2</assertJ.version>
-		<junit.version>4.12</junit.version>
-		<sonar-plugin-api-impl.version>8.7.0.41497</sonar-plugin-api-impl.version>
-		
+		<junit.jupiter.version>5.9.1</junit.jupiter.version>
+		<assertJ.version>3.23.1</assertJ.version>
+		<junit.version>4.13.2</junit.version>
+		<sonar-plugin-api-impl.version>9.7.1.62043</sonar-plugin-api-impl.version>
+
 	</properties>
 
 	<dependencyManagement>
@@ -167,6 +167,11 @@
 			<artifactId>sonar-plugin-api</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.sonarsource.sonarqube</groupId>
+			<artifactId>sonar-plugin-api-impl</artifactId>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -193,5 +198,5 @@
 		<module>python-plugin</module>
 		<!-- <module>xml-plugin</module> -->
 	</modules>
-	
+
 </project>
diff --git a/python-plugin/pom.xml b/python-plugin/pom.xml
index fb176a104..626b81fd2 100644
--- a/python-plugin/pom.xml
+++ b/python-plugin/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>io.ecocode</groupId>
         <artifactId>ecocode-parent</artifactId>
@@ -39,6 +39,7 @@
         <dependency>
             <groupId>org.sonarsource.sonarqube</groupId>
             <artifactId>sonar-plugin-api-impl</artifactId>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
@@ -64,19 +65,19 @@
                         <id>copy-bundle</id>
                         <phase>package</phase>
                         <goals>
-                        <goal>copy</goal>
+                            <goal>copy</goal>
                         </goals>
                         <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <version>${project.version}</version>
-                            <type>jar</type>
-                            <overWrite>true</overWrite>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>../lib</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>../lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/python-plugin/src/main/java/fr/cnumr/python/CustomPythonRuleRepository.java b/python-plugin/src/main/java/fr/cnumr/python/CustomPythonRuleRepository.java
index 67a35ea14..1d8a77c87 100644
--- a/python-plugin/src/main/java/fr/cnumr/python/CustomPythonRuleRepository.java
+++ b/python-plugin/src/main/java/fr/cnumr/python/CustomPythonRuleRepository.java
@@ -21,14 +21,20 @@
 
 
 
-import fr.cnumr.python.checks.*;
+import org.sonar.api.SonarEdition;
+import org.sonar.api.SonarQubeSide;
+import org.sonar.api.SonarRuntime;
+import org.sonar.api.internal.SonarRuntimeImpl;
 import org.sonar.api.server.rule.RulesDefinition;
-import org.sonar.plugins.python.api.PythonCustomRuleRepository;
+import org.sonar.api.utils.Version;
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
 
-public class CustomPythonRuleRepository implements RulesDefinition, PythonCustomRuleRepository {
+public class CustomPythonRuleRepository implements RulesDefinition {
     public static final String LANGUAGE = "py";
     public static final String NAME = "Collectif Conception Numérique Responsable";
     public static final String RESOURCE_BASE_PATH = "fr/cnumr/l10n/python/rules/python";
@@ -46,29 +52,14 @@ private static void setTemplates(NewRepository repository) {
     public void define(Context context) {
         NewRepository repository = context.createRepository(REPOSITORY_KEY, LANGUAGE).setName(NAME);
 
-        RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH);
+        SonarRuntime sonarRuntime = SonarRuntimeImpl.forSonarQube(Version.create(9, 7), SonarQubeSide.SCANNER, SonarEdition.DEVELOPER);
 
-        ruleMetadataLoader.addRulesByAnnotatedClass(repository, new ArrayList<>(checkClasses()));
+        RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH,sonarRuntime);
+
+        ruleMetadataLoader.addRulesByAnnotatedClass(repository, new ArrayList<>(RulesList.getChecks()));
 
         setTemplates(repository);
 
         repository.done();
     }
-
-    @Override
-    public String repositoryKey() {
-        return REPOSITORY_KEY;
-    }
-
-    @Override
-    public List<Class> checkClasses() {
-        return Arrays.asList(
-                AvoidGlobalVariableInFunctionCheck.class,
-                AvoidFullSQLRequest.class,
-                AvoidSQLRequestInLoop.class,
-                AvoidTryCatchFinallyCheck.class,
-                NoFunctionCallWhenDeclaringForLoop.class,
-                AvoidGettersAndSetters.class
-        );
-    }
 }
diff --git a/python-plugin/src/main/java/fr/cnumr/python/RulesList.java b/python-plugin/src/main/java/fr/cnumr/python/RulesList.java
new file mode 100644
index 000000000..ae30ba853
--- /dev/null
+++ b/python-plugin/src/main/java/fr/cnumr/python/RulesList.java
@@ -0,0 +1,56 @@
+/*
+ * SonarQube Java
+ * Copyright (C) 2012-2021 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package fr.cnumr.python;
+
+import fr.cnumr.python.checks.*;
+import org.sonar.plugins.python.api.PythonCheck;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public final class RulesList {
+
+    private RulesList() {
+    }
+
+    public static List<Class<? extends PythonCheck>> getChecks() {
+        List<Class<? extends PythonCheck>> checks = new ArrayList<>();
+        checks.addAll(getPythonChecks());
+        checks.addAll(getPythonTestChecks());
+        return Collections.unmodifiableList(checks);
+    }
+
+    public static List<Class<? extends PythonCheck>> getPythonChecks() {
+        return Collections.unmodifiableList(Arrays.asList(
+                AvoidGlobalVariableInFunctionCheck.class,
+                AvoidFullSQLRequest.class,
+                AvoidSQLRequestInLoop.class,
+                AvoidTryCatchFinallyCheck.class,
+                NoFunctionCallWhenDeclaringForLoop.class,
+                AvoidGettersAndSetters.class
+        ));
+    }
+
+    public static List<Class<? extends PythonCheck>> getPythonTestChecks() {
+        return Collections.emptyList();
+    }
+}
diff --git a/python-plugin/src/test/java/fr/cnumr/python/CustomPythonRuleRepositoryTest.java b/python-plugin/src/test/java/fr/cnumr/python/CustomPythonRuleRepositoryTest.java
index 391a2f335..32ca1b9e9 100644
--- a/python-plugin/src/test/java/fr/cnumr/python/CustomPythonRuleRepositoryTest.java
+++ b/python-plugin/src/test/java/fr/cnumr/python/CustomPythonRuleRepositoryTest.java
@@ -22,6 +22,7 @@
 import org.junit.Test;
 import org.sonar.api.server.rule.RulesDefinition;
 
+import static fr.cnumr.python.CustomPythonRuleRepository.REPOSITORY_KEY;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class CustomPythonRuleRepositoryTest {
@@ -31,9 +32,8 @@ public void test_rule_repository() {
     CustomPythonRuleRepository customPythonRuleRepository = new CustomPythonRuleRepository();
     RulesDefinition.Context context = new RulesDefinition.Context();
     customPythonRuleRepository.define(context);
-    assertThat(customPythonRuleRepository.repositoryKey()).isEqualTo(CustomPythonRuleRepository.REPOSITORY_KEY);
-    assertThat(context.repositories()).hasSize(1).extracting("key").containsExactly(customPythonRuleRepository.repositoryKey());
+    assertThat(context.repositories()).hasSize(1).extracting("key").containsExactly(REPOSITORY_KEY);
     assertThat(context.repositories().get(0).rules()).hasSize(6);
-    assertThat(customPythonRuleRepository.checkClasses()).hasSize(6);
+    assertThat(RulesList.getChecks()).hasSize(6);
   }
 }

From a50345cb06b5958550699e4c49f5b0533301f38d Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Wed, 14 Dec 2022 14:50:33 +0100
Subject: [PATCH 02/11] Fix format

---
 docker-compose.yml                            | 12 +++++-----
 .../main/java/fr/cnumr/php/MyPhpRules.java    |  6 +++--
 python-plugin/pom.xml                         | 22 +++++++++----------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 17e5b12e7..47ef76f59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,12 +24,12 @@ services:
       - type: bind
         source: ./python-plugin/target/ecocode-python-plugin-0.1.0-SNAPSHOT.jar
         target: /opt/sonarqube/extensions/plugins/ecocode-python-plugin-0.1.0-SNAPSHOT.jar
-      #      - type: bind
-      #        source: ./ecolinter-plugin/target/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
-      #        target: /opt/sonarqube/extensions/plugins/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
-      #      - type: bind
-      #        source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
-      #        target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
+#     - type: bind
+#       source: ./ecolinter-plugin/target/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
+#       target: /opt/sonarqube/extensions/plugins/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
+#     - type: bind
+#       source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
+#       target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
       - "extensions:/opt/sonarqube/extensions"
       - "logs:/opt/sonarqube/logs"
       - "data:/opt/sonarqube/data"
diff --git a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
index 04f56192a..01d917c2f 100644
--- a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
+++ b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
@@ -30,8 +30,10 @@
 import org.sonar.api.utils.Version;
 import org.sonar.plugins.php.api.visitors.PHPCustomRuleRepository;
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
 /**
  * Extension point to define a PHP rule repository.
  */
diff --git a/python-plugin/pom.xml b/python-plugin/pom.xml
index 626b81fd2..416fefc20 100644
--- a/python-plugin/pom.xml
+++ b/python-plugin/pom.xml
@@ -65,19 +65,19 @@
                         <id>copy-bundle</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>copy</goal>
+                        <goal>copy</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>../lib</outputDirectory>
+                        <artifactItems>
+                            <artifactItem>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>${project.artifactId}</artifactId>
+                                <version>${project.version}</version>
+                                <type>jar</type>
+                                <overWrite>true</overWrite>
+                            </artifactItem>
+                        </artifactItems>
+                        <outputDirectory>../lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

From e632eec54d38461e47cdd7832b74c320db0d00c3 Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Wed, 14 Dec 2022 14:54:15 +0100
Subject: [PATCH 03/11] Fix format

---
 .../src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java b/java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java
index 34603e01d..c3d9a5878 100644
--- a/java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java
+++ b/java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java
@@ -65,8 +65,8 @@ public void define(Context context) {
 
   private static void setTemplates(NewRepository repository) {
     RULE_TEMPLATES_KEY.stream()
-            .map(repository::rule)
-            .filter(Objects::nonNull)
-            .forEach(rule -> rule.setTemplate(true));
+      .map(repository::rule)
+      .filter(Objects::nonNull)
+      .forEach(rule -> rule.setTemplate(true));
   }
 }

From 1b9cd4b9bb9588d23a44fa7a08d2d03780679b0d Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Wed, 14 Dec 2022 17:45:55 +0100
Subject: [PATCH 04/11] Add review changes

---
 INSTALL.md                                    |  1 +
 .../main/java/fr/cnumr/php/MyPhpRules.java    | 26 +--------
 .../src/main/java/fr/cnumr/php/RulesList.java | 55 +++++++++++++++++++
 3 files changed, 59 insertions(+), 23 deletions(-)
 create mode 100644 php-plugin/src/main/java/fr/cnumr/php/RulesList.java

diff --git a/INSTALL.md b/INSTALL.md
index 5c1a034fa..f24ef6b95 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -33,6 +33,7 @@ Howto build the SonarQube ecoCode plugins
 
 - Java >= 11
 - Mvn 3
+- SonarQube 9.4 or higher
 
 ### Build the code
 
diff --git a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
index 01d917c2f..62e42376e 100644
--- a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
+++ b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
@@ -37,7 +37,7 @@
 /**
  * Extension point to define a PHP rule repository.
  */
-public class MyPhpRules implements RulesDefinition, PHPCustomRuleRepository {
+public class MyPhpRules implements RulesDefinition {
 
   public static final String LANGUAGE = "php";
   public static final String NAME = "Collectif Conception Numérique Responsable";
@@ -46,35 +46,15 @@ public class MyPhpRules implements RulesDefinition, PHPCustomRuleRepository {
   public static final String REPOSITORY_KEY = "cnumr-php";
   private static final Set<String> RULE_TEMPLATES_KEY = Collections.emptySet();
 
-  /**
-   * Provide the repository key
-   */
-  @Override
-  public String repositoryKey() {
-    return REPOSITORY_KEY;
-  }
-
-  /**
-   * Provide the list of checks class that implements rules
-   * to be part of the rule repository
-   */
-  @Override
-  public ImmutableList<Class> checkClasses() {
-
-    return ImmutableList.of(IncrementCheck.class, AvoidTryCatchFinallyCheck_NOK_failsAllTryStatements.class, AvoidDoubleQuoteCheck.class,
-            AvoidFullSQLRequestCheck.class, AvoidSQLRequestInLoopCheck.class, NoFunctionCallWhenDeclaringForLoop.class);
-
-  }
-
   @Override
   public void define(Context context) {
-    NewRepository repository = context.createRepository(repositoryKey(), LANGUAGE).setName(NAME);
+    NewRepository repository = context.createRepository(REPOSITORY_KEY, LANGUAGE).setName(NAME);
 
     SonarRuntime sonarRuntime = SonarRuntimeImpl.forSonarQube(Version.create(9, 7), SonarQubeSide.SCANNER, SonarEdition.DEVELOPER);
 
     RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH,DEFAULT_PROFILE_PATH,sonarRuntime);
 
-    ruleMetadataLoader.addRulesByAnnotatedClass(repository, new ArrayList<>(checkClasses()));
+    ruleMetadataLoader.addRulesByAnnotatedClass(repository, new ArrayList<>(RulesList.getChecks()));
 
     setTemplates(repository);
 
diff --git a/php-plugin/src/main/java/fr/cnumr/php/RulesList.java b/php-plugin/src/main/java/fr/cnumr/php/RulesList.java
new file mode 100644
index 000000000..5c79480c8
--- /dev/null
+++ b/php-plugin/src/main/java/fr/cnumr/php/RulesList.java
@@ -0,0 +1,55 @@
+/*
+ * SonarQube Java
+ * Copyright (C) 2012-2021 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package fr.cnumr.php;
+
+import fr.cnumr.php.checks.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public final class RulesList {
+
+    private RulesList() {
+    }
+
+    public static List<Class<?>> getChecks() {
+        List<Class<?>> checks = new ArrayList<>();
+        checks.addAll(getPythonChecks());
+        checks.addAll(getPythonTestChecks());
+        return Collections.unmodifiableList(checks);
+    }
+
+    public static List<Class<?>> getPythonChecks() {
+        return Collections.unmodifiableList(Arrays.asList(
+            IncrementCheck.class,
+            AvoidTryCatchFinallyCheck_NOK_failsAllTryStatements.class,
+            AvoidDoubleQuoteCheck.class,
+            AvoidFullSQLRequestCheck.class,
+            AvoidSQLRequestInLoopCheck.class,
+            NoFunctionCallWhenDeclaringForLoop.class
+        ));
+    }
+
+    public static List<Class<?>> getPythonTestChecks() {
+        return Collections.emptyList();
+    }
+}

From 0b8051a6fdf45daf8ff817a08ee1df4497d7a078 Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Wed, 14 Dec 2022 17:47:53 +0100
Subject: [PATCH 05/11] Fix names

---
 php-plugin/src/main/java/fr/cnumr/php/RulesList.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/php-plugin/src/main/java/fr/cnumr/php/RulesList.java b/php-plugin/src/main/java/fr/cnumr/php/RulesList.java
index 5c79480c8..dee7ecc40 100644
--- a/php-plugin/src/main/java/fr/cnumr/php/RulesList.java
+++ b/php-plugin/src/main/java/fr/cnumr/php/RulesList.java
@@ -33,12 +33,12 @@ private RulesList() {
 
     public static List<Class<?>> getChecks() {
         List<Class<?>> checks = new ArrayList<>();
-        checks.addAll(getPythonChecks());
-        checks.addAll(getPythonTestChecks());
+        checks.addAll(getPhpChecks());
+        checks.addAll(getPhpTestChecks());
         return Collections.unmodifiableList(checks);
     }
 
-    public static List<Class<?>> getPythonChecks() {
+    public static List<Class<?>> getPhpChecks() {
         return Collections.unmodifiableList(Arrays.asList(
             IncrementCheck.class,
             AvoidTryCatchFinallyCheck_NOK_failsAllTryStatements.class,
@@ -49,7 +49,7 @@ public static List<Class<?>> getPythonChecks() {
         ));
     }
 
-    public static List<Class<?>> getPythonTestChecks() {
+    public static List<Class<?>> getPhpTestChecks() {
         return Collections.emptyList();
     }
 }

From 1d008fdd1b4c9f77df9de24d1991ecee54aed7a1 Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Fri, 16 Dec 2022 21:19:04 +0100
Subject: [PATCH 06/11] Fix dependency

---
 java-plugin/pom.xml                                    |  7 ++++++-
 php-plugin/pom.xml                                     | 10 ++++++++++
 php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java  |  3 ---
 pom.xml                                                |  8 +++++---
 python-plugin/pom.xml                                  |  3 ---
 .../l10n/python/rules/python/DefaultProfilePath.json   |  3 +++
 6 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 python-plugin/src/main/resources/fr/cnumr/l10n/python/rules/python/DefaultProfilePath.json

diff --git a/java-plugin/pom.xml b/java-plugin/pom.xml
index 48c0fa7fb..e9eb695b6 100644
--- a/java-plugin/pom.xml
+++ b/java-plugin/pom.xml
@@ -27,6 +27,11 @@
             <artifactId>sonar-plugin-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.sonarsource.sonarqube</groupId>
+            <artifactId>sonar-plugin-api-impl</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.sonarsource.analyzer-commons</groupId>
             <artifactId>sonar-analyzer-commons</artifactId>
@@ -68,7 +73,7 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
     </dependencies>
 
     <build>
diff --git a/php-plugin/pom.xml b/php-plugin/pom.xml
index fd2e31d33..6a96fee9b 100644
--- a/php-plugin/pom.xml
+++ b/php-plugin/pom.xml
@@ -26,6 +26,16 @@
             <artifactId>sonar-plugin-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.sonarsource.sonarqube</groupId>
+            <artifactId>sonar-plugin-api-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.sonarsource.analyzer-commons</groupId>
+            <artifactId>sonar-analyzer-commons</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
index 62e42376e..3cc9785c2 100644
--- a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
+++ b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
@@ -20,15 +20,12 @@
 package fr.cnumr.php;
 
 
-import com.google.common.collect.ImmutableList;
-import fr.cnumr.php.checks.*;
 import org.sonar.api.SonarEdition;
 import org.sonar.api.SonarQubeSide;
 import org.sonar.api.SonarRuntime;
 import org.sonar.api.internal.SonarRuntimeImpl;
 import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.api.utils.Version;
-import org.sonar.plugins.php.api.visitors.PHPCustomRuleRepository;
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/pom.xml b/pom.xml
index 1b27df628..f27f99481 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,8 +58,8 @@
 		<sonar.python.version>3.9.0.9230</sonar.python.version>
 		<sonarphp.version>3.3.0.5166</sonarphp.version>
 		<sonar-packaging.version>1.20.0.405</sonar-packaging.version>
-    
-    <junit.version>4.13.2</junit.version>
+
+		<junit.version>4.13.2</junit.version>
 		<junit.jupiter.version>5.9.1</junit.jupiter.version>
 		<assertJ.version>3.23.1</assertJ.version>
 
@@ -80,12 +80,14 @@
 				<groupId>org.sonarsource.analyzer-commons</groupId>
 				<artifactId>sonar-analyzer-commons</artifactId>
 				<version>${sonar-analyzer-commons.version}</version>
+				<scope>compile</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.sonarsource.sonarqube</groupId>
 				<artifactId>sonar-plugin-api-impl</artifactId>
 				<version>${sonar-plugin-api-impl.version}</version>
+				<scope>compile</scope>
 			</dependency>
 
 			<!-- JAVA -->
@@ -190,9 +192,9 @@
 
 	<modules>
 		<!-- <module>ecolinter-plugin</module> -->
+		<module>python-plugin</module>
 		<module>java-plugin</module>
 		<module>php-plugin</module>
-		<module>python-plugin</module>
 		<!-- <module>xml-plugin</module> -->
 	</modules>
 
diff --git a/python-plugin/pom.xml b/python-plugin/pom.xml
index 7bf34f6f7..e3b9aa96b 100644
--- a/python-plugin/pom.xml
+++ b/python-plugin/pom.xml
@@ -26,13 +26,10 @@
             <groupId>org.sonarsource.sonarqube</groupId>
             <artifactId>sonar-plugin-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.sonarsource.sonarqube</groupId>
             <artifactId>sonar-plugin-api-impl</artifactId>
-            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.sonarsource.analyzer-commons</groupId>
             <artifactId>sonar-analyzer-commons</artifactId>
diff --git a/python-plugin/src/main/resources/fr/cnumr/l10n/python/rules/python/DefaultProfilePath.json b/python-plugin/src/main/resources/fr/cnumr/l10n/python/rules/python/DefaultProfilePath.json
new file mode 100644
index 000000000..c00983472
--- /dev/null
+++ b/python-plugin/src/main/resources/fr/cnumr/l10n/python/rules/python/DefaultProfilePath.json
@@ -0,0 +1,3 @@
+{
+"ruleKeys": ["S69"]
+}
\ No newline at end of file

From 5c7aa5073dead168b69d26f60582e9b9c4213144 Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Mon, 19 Dec 2022 12:03:32 +0100
Subject: [PATCH 07/11] Fix dependency versions + add maven maven-shade-plugin
 to shade

---
 java-plugin/pom.xml                           | 19 +++++++++++++++++--
 php-plugin/pom.xml                            | 13 +++++++++++++
 .../main/java/fr/cnumr/php/MyPhpRules.java    |  3 +--
 .../php/rules/custom/DefaultProfilePath.json  |  3 ---
 pom.xml                                       |  9 +++++----
 python-plugin/pom.xml                         | 18 +++++++++++++++++-
 .../rules/python/DefaultProfilePath.json      |  3 ---
 7 files changed, 53 insertions(+), 15 deletions(-)
 delete mode 100644 php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json
 delete mode 100644 python-plugin/src/main/resources/fr/cnumr/l10n/python/rules/python/DefaultProfilePath.json

diff --git a/java-plugin/pom.xml b/java-plugin/pom.xml
index e9eb695b6..5790b5223 100644
--- a/java-plugin/pom.xml
+++ b/java-plugin/pom.xml
@@ -88,8 +88,23 @@
                     <pluginClass>fr.cnumr.java.MyJavaRulesPlugin</pluginClass>
                     <sonarLintSupported>true</sonarLintSupported>
                     <sonarQubeMinVersion>${sonarqube.version}</sonarQubeMinVersion>
-                    <requirePlugins>java:${sonarjava.version}</requirePlugins>
-                </configuration>
+                    <!-- TODO : commented because plugin not loaded in SONAR if required version of java plugin is not installed -->
+                    <!-- TODO : check how to resolve it (how to force this version in SonarQube installation) -->
+                    <!-- <requirePlugins>java:${sonarjava.version}</requirePlugins> -->
+                    <basePlugin>java</basePlugin>                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
diff --git a/php-plugin/pom.xml b/php-plugin/pom.xml
index 6a96fee9b..687a8ef63 100644
--- a/php-plugin/pom.xml
+++ b/php-plugin/pom.xml
@@ -59,6 +59,19 @@
                     <basePlugin>php</basePlugin>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
index 3cc9785c2..aa3bf8ba7 100644
--- a/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
+++ b/php-plugin/src/main/java/fr/cnumr/php/MyPhpRules.java
@@ -39,7 +39,6 @@ public class MyPhpRules implements RulesDefinition {
   public static final String LANGUAGE = "php";
   public static final String NAME = "Collectif Conception Numérique Responsable";
   public static final String RESOURCE_BASE_PATH = "fr/cnumr/l10n/php/rules/custom";
-  public static final String DEFAULT_PROFILE_PATH = "fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json";
   public static final String REPOSITORY_KEY = "cnumr-php";
   private static final Set<String> RULE_TEMPLATES_KEY = Collections.emptySet();
 
@@ -49,7 +48,7 @@ public void define(Context context) {
 
     SonarRuntime sonarRuntime = SonarRuntimeImpl.forSonarQube(Version.create(9, 7), SonarQubeSide.SCANNER, SonarEdition.DEVELOPER);
 
-    RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH,DEFAULT_PROFILE_PATH,sonarRuntime);
+    RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH,sonarRuntime);
 
     ruleMetadataLoader.addRulesByAnnotatedClass(repository, new ArrayList<>(RulesList.getChecks()));
 
diff --git a/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json b/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json
deleted file mode 100644
index c00983472..000000000
--- a/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/DefaultProfilePath.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-"ruleKeys": ["S69"]
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f27f99481..e894618fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,10 +55,11 @@
     
 		<sonar-plugin-api-impl.version>9.7.1.62043</sonar-plugin-api-impl.version>
 		<sonar-analyzer-commons.version>2.1.0.1111</sonar-analyzer-commons.version>
-		<sonar.python.version>3.9.0.9230</sonar.python.version>
-		<sonarphp.version>3.3.0.5166</sonarphp.version>
-		<sonar-packaging.version>1.20.0.405</sonar-packaging.version>
-
+		<sonar.python.version>3.19.0.10254</sonar.python.version>
+		<sonarphp.version>3.25.0.9077</sonarphp.version>
+		<sonar-packaging.version>1.21.0.505</sonar-packaging.version>
+		<sonar.skipDependenciesPackaging>true</sonar.skipDependenciesPackaging>
+		<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
 		<junit.version>4.13.2</junit.version>
 		<junit.jupiter.version>5.9.1</junit.jupiter.version>
 		<assertJ.version>3.23.1</assertJ.version>
diff --git a/python-plugin/pom.xml b/python-plugin/pom.xml
index e3b9aa96b..a74bc305e 100644
--- a/python-plugin/pom.xml
+++ b/python-plugin/pom.xml
@@ -61,9 +61,25 @@
                     <pluginClass>fr.cnumr.python.CustomPythonRulesPlugin</pluginClass>
                     <sonarLintSupported>true</sonarLintSupported>
                     <sonarQubeMinVersion>${sonarqube.version}</sonarQubeMinVersion>
-                    <requirePlugins>python:${sonar.python.version}</requirePlugins>
+                    <!-- TODO : commented because plugin not loaded in SONAR if required version of python plugin is not installed -->
+                    <!-- TODO : check how to resolve it (how to force this version in SonarQube installation) -->
+                    <!-- <requirePlugins>python:${sonar.python.version}</requirePlugins> -->
+                    <basePlugin>python</basePlugin>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/python-plugin/src/main/resources/fr/cnumr/l10n/python/rules/python/DefaultProfilePath.json b/python-plugin/src/main/resources/fr/cnumr/l10n/python/rules/python/DefaultProfilePath.json
deleted file mode 100644
index c00983472..000000000
--- a/python-plugin/src/main/resources/fr/cnumr/l10n/python/rules/python/DefaultProfilePath.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-"ruleKeys": ["S69"]
-}
\ No newline at end of file

From 453f6a883b13371669fd26b313b4819af152f86c Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Mon, 19 Dec 2022 15:22:11 +0100
Subject: [PATCH 08/11] Format code

---
 java-plugin/pom.xml   | 23 ++++++++++++-----------
 php-plugin/pom.xml    | 20 ++++++++++----------
 python-plugin/pom.xml | 22 +++++++++++-----------
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/java-plugin/pom.xml b/java-plugin/pom.xml
index 5790b5223..526aa4a73 100644
--- a/java-plugin/pom.xml
+++ b/java-plugin/pom.xml
@@ -91,7 +91,8 @@
                     <!-- TODO : commented because plugin not loaded in SONAR if required version of java plugin is not installed -->
                     <!-- TODO : check how to resolve it (how to force this version in SonarQube installation) -->
                     <!-- <requirePlugins>java:${sonarjava.version}</requirePlugins> -->
-                    <basePlugin>java</basePlugin>                </configuration>
+                    <basePlugin>java</basePlugin>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -136,15 +137,15 @@
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <version>${project.version}</version>
-                            <type>jar</type>
-                            <overWrite>true</overWrite>
-                            </artifactItem>
-                        </artifactItems>
+                            <artifactItems>
+                                <artifactItem>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>${project.artifactId}</artifactId>
+                                <version>${project.version}</version>
+                                <type>jar</type>
+                                <overWrite>true</overWrite>
+                                </artifactItem>
+                            </artifactItems>
                         <outputDirectory>../lib</outputDirectory>
                         </configuration>
                     </execution>
@@ -153,7 +154,7 @@
                         <id>copy</id>
                         <phase>test-compile</phase>
                         <goals>
-                           <goal>copy</goal>
+                            <goal>copy</goal>
                         </goals>
                         <configuration>
                             <artifactItems>
diff --git a/php-plugin/pom.xml b/php-plugin/pom.xml
index 687a8ef63..ea9b0b699 100644
--- a/php-plugin/pom.xml
+++ b/php-plugin/pom.xml
@@ -83,16 +83,16 @@
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <version>${project.version}</version>
-                            <type>jar</type>
-                            <overWrite>true</overWrite>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>../lib</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>${project.artifactId}</artifactId>
+                                <version>${project.version}</version>
+                                <type>jar</type>
+                                <overWrite>true</overWrite>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>../lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/python-plugin/pom.xml b/python-plugin/pom.xml
index a74bc305e..751fd1348 100644
--- a/python-plugin/pom.xml
+++ b/python-plugin/pom.xml
@@ -88,19 +88,19 @@
                         <id>copy-bundle</id>
                         <phase>package</phase>
                         <goals>
-                        <goal>copy</goal>
+                            <goal>copy</goal>
                         </goals>
                         <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>${project.artifactId}</artifactId>
-                                <version>${project.version}</version>
-                                <type>jar</type>
-                                <overWrite>true</overWrite>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>../lib</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>../lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

From 3765f2baaad1ae253d4493e313e04258da0832ff Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Tue, 20 Dec 2022 11:25:59 +0100
Subject: [PATCH 09/11] Add images to the description files.

---
 common/images/php/s72_percent_comparison.jpg    | Bin 0 -> 13269 bytes
 docker-compose.yml                              |   3 +++
 .../fr/cnumr/l10n/php/rules/custom/S72.html     |   3 +++
 3 files changed, 6 insertions(+)
 create mode 100644 common/images/php/s72_percent_comparison.jpg

diff --git a/common/images/php/s72_percent_comparison.jpg b/common/images/php/s72_percent_comparison.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..74b339a1b0d89680fc4d708fff37e0e98e5769a6
GIT binary patch
literal 13269
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

literal 0
HcmV?d00001

diff --git a/docker-compose.yml b/docker-compose.yml
index 47ef76f59..88d685d20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,9 @@ services:
 #     - type: bind
 #       source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
 #       target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
+      - type: bind
+        source: common
+        target: /opt/sonarqube/common
       - "extensions:/opt/sonarqube/extensions"
       - "logs:/opt/sonarqube/logs"
       - "data:/opt/sonarqube/data"
diff --git a/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/S72.html b/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/S72.html
index 3b51bdc50..bb3aa530f 100644
--- a/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/S72.html
+++ b/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/S72.html
@@ -1,4 +1,7 @@
 <p>Executing SQL queries in loop induced unnecessary calculation by the cpu, RAM usage and network transfert.</p>
+<img src="/opt/sonarqube/common/images/php/s72_percent_comparison.jpg"
+     alt="ETSdiff percent comparison" style="width:50%;height:50%;">
+
 <h2>Noncompliant Code Example</h2>
 <pre>
     public function foo() {

From b2012a74997b09e670f115932789ba7c0b661372 Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Tue, 20 Dec 2022 11:45:04 +0100
Subject: [PATCH 10/11] Revert "Add images to the description files."

This reverts commit 3765f2baaad1ae253d4493e313e04258da0832ff.
---
 common/images/php/s72_percent_comparison.jpg    | Bin 13269 -> 0 bytes
 docker-compose.yml                              |   3 ---
 .../fr/cnumr/l10n/php/rules/custom/S72.html     |   3 ---
 3 files changed, 6 deletions(-)
 delete mode 100644 common/images/php/s72_percent_comparison.jpg

diff --git a/common/images/php/s72_percent_comparison.jpg b/common/images/php/s72_percent_comparison.jpg
deleted file mode 100644
index 74b339a1b0d89680fc4d708fff37e0e98e5769a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13269
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

diff --git a/docker-compose.yml b/docker-compose.yml
index 88d685d20..47ef76f59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,9 +30,6 @@ services:
 #     - type: bind
 #       source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
 #       target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
-      - type: bind
-        source: common
-        target: /opt/sonarqube/common
       - "extensions:/opt/sonarqube/extensions"
       - "logs:/opt/sonarqube/logs"
       - "data:/opt/sonarqube/data"
diff --git a/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/S72.html b/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/S72.html
index bb3aa530f..3b51bdc50 100644
--- a/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/S72.html
+++ b/php-plugin/src/main/resources/fr/cnumr/l10n/php/rules/custom/S72.html
@@ -1,7 +1,4 @@
 <p>Executing SQL queries in loop induced unnecessary calculation by the cpu, RAM usage and network transfert.</p>
-<img src="/opt/sonarqube/common/images/php/s72_percent_comparison.jpg"
-     alt="ETSdiff percent comparison" style="width:50%;height:50%;">
-
 <h2>Noncompliant Code Example</h2>
 <pre>
     public function foo() {

From 9338329809782fd0d23f98659f9032146f17d21f Mon Sep 17 00:00:00 2001
From: Oussama <oussamala72@gmail.com>
Date: Fri, 23 Dec 2022 09:50:40 +0100
Subject: [PATCH 11/11] New review fix

---
 .gitignore            | 1 +
 INSTALL.md            | 2 +-
 docker-compose.yml    | 8 +-------
 java-plugin/pom.xml   | 1 -
 php-plugin/pom.xml    | 1 -
 pom.xml               | 7 +++++--
 python-plugin/pom.xml | 1 -
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index f83f86ce0..ed3d4a52d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ target
 *.iml
 lib/*.jar
 bin
+dependency-reduced-pom.xml
diff --git a/INSTALL.md b/INSTALL.md
index 3f43217a5..2703f56fa 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -33,7 +33,7 @@ Howto build the SonarQube ecoCode plugins
 
 - Java >= 11.0.17
 - Mvn 3
-- SonarQube 9.4 or higher
+- SonarQube 9.4 to 9.8
 
 ### Build the code
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 47ef76f59..f8fed2f92 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   sonar:
-    image: sonarqube:9.7-community
+    image: sonarqube:9.8-community
     container_name: sonar_standard
     ports:
       - "9000:9000"
@@ -24,12 +24,6 @@ services:
       - type: bind
         source: ./python-plugin/target/ecocode-python-plugin-0.1.0-SNAPSHOT.jar
         target: /opt/sonarqube/extensions/plugins/ecocode-python-plugin-0.1.0-SNAPSHOT.jar
-#     - type: bind
-#       source: ./ecolinter-plugin/target/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
-#       target: /opt/sonarqube/extensions/plugins/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
-#     - type: bind
-#       source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
-#       target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
       - "extensions:/opt/sonarqube/extensions"
       - "logs:/opt/sonarqube/logs"
       - "data:/opt/sonarqube/data"
diff --git a/java-plugin/pom.xml b/java-plugin/pom.xml
index 526aa4a73..b8f1bdf77 100644
--- a/java-plugin/pom.xml
+++ b/java-plugin/pom.xml
@@ -97,7 +97,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>${maven-shade-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/php-plugin/pom.xml b/php-plugin/pom.xml
index ea9b0b699..c96396dd5 100644
--- a/php-plugin/pom.xml
+++ b/php-plugin/pom.xml
@@ -62,7 +62,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>${maven-shade-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/pom.xml b/pom.xml
index e894618fd..808d63c14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,14 +81,12 @@
 				<groupId>org.sonarsource.analyzer-commons</groupId>
 				<artifactId>sonar-analyzer-commons</artifactId>
 				<version>${sonar-analyzer-commons.version}</version>
-				<scope>compile</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.sonarsource.sonarqube</groupId>
 				<artifactId>sonar-plugin-api-impl</artifactId>
 				<version>${sonar-plugin-api-impl.version}</version>
-				<scope>compile</scope>
 			</dependency>
 
 			<!-- JAVA -->
@@ -182,6 +180,11 @@
 					<artifactId>sonar-packaging-maven-plugin</artifactId>
 					<version>${sonar-packaging.version}</version>
 				</plugin>
+				<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>${maven-shade-plugin.version}</version>
+				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
diff --git a/python-plugin/pom.xml b/python-plugin/pom.xml
index 751fd1348..43afc307b 100644
--- a/python-plugin/pom.xml
+++ b/python-plugin/pom.xml
@@ -70,7 +70,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>${maven-shade-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>package</phase>