diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a8479c..d6734d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#10](https://github.com/green-code-initiative/ecoCode-php/pull/10) Adding EC35 rule : EC35 rule replaces EC34 with a specific use case ("file not found" specific) - [#13](https://github.com/green-code-initiative/ecoCode-php/issues/13) Add build number to manifest - Update ecocode-rules-specifications to 0.0.9 +- [#12](https://github.com/green-code-initiative/ecoCode-php/issues/12) Fix unit tests execution with Maven ### Deleted @@ -27,4 +28,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#205](https://github.com/green-code-initiative/ecoCode/issues/205) compatibility with SonarQube 10.1 [unreleased]: https://github.com/green-code-initiative/ecoCode-php/compare/v1.4.0...HEAD -[1.4.0]: https://github.com/green-code-initiative/ecoCode-php/compare/v0.0.0...1.4.0 \ No newline at end of file +[1.4.0]: https://github.com/green-code-initiative/ecoCode-php/compare/v0.0.0...1.4.0 diff --git a/pom.xml b/pom.xml index a19d165..8109ff4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,16 +5,19 @@ io.ecocode ecocode-php-plugin 1.4.1-SNAPSHOT + sonar-plugin ecoCode - PHP language Provides rules to reduce the environmental footprint of your PHP programs 2023 + https://github.com/green-code-initiative/ecoCode-php green-code-initiative https://github.com/green-code-initiative + GPL v3 @@ -22,12 +25,14 @@ repo + scm:git:https://github.com/green-code-initiative/ecocode-php scm:git:https://github.com/green-code-initiative/ecocode-php https://github.com/green-code-initiative/ecocode-php HEAD + GitHub https://github.com/green-code-initiative/ecoCode-php/issues @@ -52,20 +57,18 @@ 3.28.0.9490 - - 7.17.0.31219 - + 2.5.0.1358 1.23.0.740 - true - - 5.9.1 - 3.23.1 - 5.3.1 0.0.9 - 2.5.0.1358 + 3.5.0 + + 5.9.2 + 3.24.2 + 5.3.1 + 0.8.11 @@ -101,13 +104,6 @@ - - org.sonarsource.java - java-checks-testkit - ${sonarjava.version} - test - - org.junit.jupiter junit-jupiter @@ -118,7 +114,7 @@ org.assertj assertj-core - ${assertJ.version} + ${assertj.version} test @@ -172,11 +168,7 @@ org.jacoco jacoco-maven-plugin - 0.8.10 - - file - false - + ${jacoco.version} prepare-agent @@ -203,6 +195,7 @@ fr.greencodeinitiative.php.PHPPlugin true ${sonarqube.version} + true ${java.version} @@ -233,8 +226,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.0 - + ${maven-shade.version} package @@ -242,29 +234,19 @@ shade + false + true + false - - commons-*:* - - META-INF/** - - org.*:* META-INF/** - org/sonar/api/batch/sensor/** javax/annotation/** - com.*:* - - META-INF/** - - - - junit:* + io.ecocode:ecocode-rules-specifications:* META-INF/** diff --git a/src/test/java/fr/greencodeinitiative/php/checks/AvoidDoubleQuoteCheckTest.java b/src/test/java/fr/greencodeinitiative/php/checks/AvoidDoubleQuoteCheckTest.java index 1c20056..8aeecfa 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/AvoidDoubleQuoteCheckTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/AvoidDoubleQuoteCheckTest.java @@ -17,16 +17,16 @@ */ package fr.greencodeinitiative.php.checks; -import java.io.File; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; -public class AvoidDoubleQuoteCheckTest { +import java.io.File; + +class AvoidDoubleQuoteCheckTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new AvoidDoubleQuoteCheck(), new PhpTestFile(new File("src/test/resources/checks/AvoidDoubleQuote.php"))); } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/AvoidFullSQLRequestCheckTest.java b/src/test/java/fr/greencodeinitiative/php/checks/AvoidFullSQLRequestCheckTest.java index 52ed025..aee6056 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/AvoidFullSQLRequestCheckTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/AvoidFullSQLRequestCheckTest.java @@ -17,16 +17,17 @@ */ package fr.greencodeinitiative.php.checks; -import java.io.File; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; -public class AvoidFullSQLRequestCheckTest { +import java.io.File; + +class AvoidFullSQLRequestCheckTest { @Test - public void test() { + void test() { PHPCheckTest.check(new AvoidFullSQLRequestCheck(), new PhpTestFile(new File("src/test/resources/checks/AvoidFullSQLRequest.php"))); } + } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/AvoidGettingSizeCollectionInLoopTest.java b/src/test/java/fr/greencodeinitiative/php/checks/AvoidGettingSizeCollectionInLoopTest.java index 29ee090..f612230 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/AvoidGettingSizeCollectionInLoopTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/AvoidGettingSizeCollectionInLoopTest.java @@ -17,16 +17,17 @@ */ package fr.greencodeinitiative.php.checks; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; import java.io.File; -public class AvoidGettingSizeCollectionInLoopTest { +class AvoidGettingSizeCollectionInLoopTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new AvoidGettingSizeCollectionInLoopCheck(), new PhpTestFile(new File("src/test/resources/checks/AvoidGettingSizeCollectionInLoop.php"))); } + } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/AvoidMultipleIfElseStatementCheckTest.java b/src/test/java/fr/greencodeinitiative/php/checks/AvoidMultipleIfElseStatementCheckTest.java index 62228a3..37c6cea 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/AvoidMultipleIfElseStatementCheckTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/AvoidMultipleIfElseStatementCheckTest.java @@ -17,19 +17,16 @@ */ package fr.greencodeinitiative.php.checks; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; import java.io.File; -/** - * Test class to test the check implementation. - */ -public class AvoidMultipleIfElseStatementCheckTest { +class AvoidMultipleIfElseStatementCheckTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new AvoidMultipleIfElseStatementCheck(), new PhpTestFile(new File("src/test/resources/checks/AvoidMultipleIfElseStatement.php"))); } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/AvoidSQLRequestInLoopCheckTest.java b/src/test/java/fr/greencodeinitiative/php/checks/AvoidSQLRequestInLoopCheckTest.java index 7d8b22e..eaba84e 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/AvoidSQLRequestInLoopCheckTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/AvoidSQLRequestInLoopCheckTest.java @@ -17,16 +17,17 @@ */ package fr.greencodeinitiative.php.checks; -import java.io.File; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; -public class AvoidSQLRequestInLoopCheckTest { +import java.io.File; + +class AvoidSQLRequestInLoopCheckTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new AvoidSQLRequestInLoopCheck(), new PhpTestFile(new File("src/test/resources/checks/AvoidSQLRequestInLoop.php"))); } + } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/AvoidTryCatchWithFileOpenedCheckTest.java b/src/test/java/fr/greencodeinitiative/php/checks/AvoidTryCatchWithFileOpenedCheckTest.java index 7739a24..15eeb7c 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/AvoidTryCatchWithFileOpenedCheckTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/AvoidTryCatchWithFileOpenedCheckTest.java @@ -17,16 +17,16 @@ */ package fr.greencodeinitiative.php.checks; -import java.io.File; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; -public class AvoidTryCatchWithFileOpenedCheckTest { +import java.io.File; + +class AvoidTryCatchWithFileOpenedCheckTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new AvoidTryCatchWithFileOpenedCheck(), new PhpTestFile(new File("src/test/resources/checks/AvoidTryCatchWithFileOpenedCheck.php"))); } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/AvoidUsingGlobalVariablesCheckTest.java b/src/test/java/fr/greencodeinitiative/php/checks/AvoidUsingGlobalVariablesCheckTest.java index b9ed4a6..0cc3715 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/AvoidUsingGlobalVariablesCheckTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/AvoidUsingGlobalVariablesCheckTest.java @@ -17,16 +17,16 @@ */ package fr.greencodeinitiative.php.checks; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; import java.io.File; -public class AvoidUsingGlobalVariablesCheckTest { +class AvoidUsingGlobalVariablesCheckTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new AvoidUsingGlobalVariablesCheck(), new PhpTestFile(new File("src/test/resources/checks/AvoidUsingGlobalVariablesCheck.php"))); } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/IncrementCheckTest.java b/src/test/java/fr/greencodeinitiative/php/checks/IncrementCheckTest.java index df03d9b..db61edd 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/IncrementCheckTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/IncrementCheckTest.java @@ -17,16 +17,16 @@ */ package fr.greencodeinitiative.php.checks; -import java.io.File; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; -public class IncrementCheckTest { +import java.io.File; + +class IncrementCheckTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new IncrementCheck(), new PhpTestFile(new File("src/test/resources/checks/IncrementCheck.php"))); } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/NoFunctionCallWhenDeclaringForLoopTest.java b/src/test/java/fr/greencodeinitiative/php/checks/NoFunctionCallWhenDeclaringForLoopTest.java index 0ee0bf9..c989d20 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/NoFunctionCallWhenDeclaringForLoopTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/NoFunctionCallWhenDeclaringForLoopTest.java @@ -17,16 +17,17 @@ */ package fr.greencodeinitiative.php.checks; -import java.io.File; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; -public class NoFunctionCallWhenDeclaringForLoopTest { +import java.io.File; + +class NoFunctionCallWhenDeclaringForLoopTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new NoFunctionCallWhenDeclaringForLoop(), new PhpTestFile(new File("src/test/resources/checks/NoFunctionCallWhenDeclaringForLoop.php"))); } + } diff --git a/src/test/java/fr/greencodeinitiative/php/checks/UseOfMethodsForBasicOperationsTest.java b/src/test/java/fr/greencodeinitiative/php/checks/UseOfMethodsForBasicOperationsTest.java index dfe17a9..c8c080d 100644 --- a/src/test/java/fr/greencodeinitiative/php/checks/UseOfMethodsForBasicOperationsTest.java +++ b/src/test/java/fr/greencodeinitiative/php/checks/UseOfMethodsForBasicOperationsTest.java @@ -17,16 +17,17 @@ */ package fr.greencodeinitiative.php.checks; -import java.io.File; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonar.plugins.php.api.tests.PHPCheckTest; import org.sonar.plugins.php.api.tests.PhpTestFile; -public class UseOfMethodsForBasicOperationsTest { +import java.io.File; + +class UseOfMethodsForBasicOperationsTest { @Test - public void test() throws Exception { + void test() throws Exception { PHPCheckTest.check(new UseOfMethodsForBasicOperations(), new PhpTestFile(new File("src/test/resources/checks/UseOfMethodsForBasicOperations.php"))); } + }