From dce2307b29d1400f52a70db91f7a950b6bce7707 Mon Sep 17 00:00:00 2001 From: Rodrigo Primo Date: Tue, 12 Dec 2023 15:39:19 -0300 Subject: [PATCH 1/2] Rename test case file for AssignmentInCondition sniff Doing this to be able to add more test case files to cover defensive code in the AssignmentInCondition sniff that protects it when checking code with parse errors. --- ...nc => AssignmentInConditionUnitTest.1.inc} | 0 .../AssignmentInConditionUnitTest.php | 82 ++++++++++--------- 2 files changed, 45 insertions(+), 37 deletions(-) rename src/Standards/Generic/Tests/CodeAnalysis/{AssignmentInConditionUnitTest.inc => AssignmentInConditionUnitTest.1.inc} (100%) diff --git a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.1.inc similarity index 100% rename from src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc rename to src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.1.inc diff --git a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php index a1836217ee..5dd5adc6c1 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php @@ -41,46 +41,54 @@ public function getErrorList() * The key of the array should represent the line number and the value * should represent the number of warnings that should occur on that line. * + * @param string $testFile The name of the file being tested. + * * @return array */ - public function getWarningList() + public function getWarningList($testFile='') { - return [ - 46 => 1, - 47 => 1, - 48 => 1, - 49 => 1, - 50 => 1, - 51 => 1, - 52 => 1, - 53 => 1, - 54 => 1, - 55 => 1, - 56 => 1, - 57 => 1, - 58 => 1, - 59 => 1, - 60 => 1, - 61 => 2, - 63 => 1, - 64 => 1, - 67 => 1, - 68 => 1, - 69 => 1, - 70 => 1, - 71 => 1, - 72 => 1, - 73 => 1, - 75 => 1, - 77 => 1, - 80 => 2, - 84 => 1, - 85 => 2, - 88 => 1, - 90 => 1, - 92 => 1, - 95 => 1, - ]; + switch ($testFile) { + case 'AssignmentInConditionUnitTest.1.inc': + return [ + 46 => 1, + 47 => 1, + 48 => 1, + 49 => 1, + 50 => 1, + 51 => 1, + 52 => 1, + 53 => 1, + 54 => 1, + 55 => 1, + 56 => 1, + 57 => 1, + 58 => 1, + 59 => 1, + 60 => 1, + 61 => 2, + 63 => 1, + 64 => 1, + 67 => 1, + 68 => 1, + 69 => 1, + 70 => 1, + 71 => 1, + 72 => 1, + 73 => 1, + 75 => 1, + 77 => 1, + 80 => 2, + 84 => 1, + 85 => 2, + 88 => 1, + 90 => 1, + 92 => 1, + 95 => 1, + ]; + + default: + return []; + }//end switch }//end getWarningList() From 1fad6ab87db3f3f9d5f0aeeefdc6123054d5eead Mon Sep 17 00:00:00 2001 From: Rodrigo Primo Date: Wed, 13 Dec 2023 10:28:57 -0300 Subject: [PATCH 2/2] Improve test coverage for the AssignmentInCondition sniff This commit improves the test coverage for the AssignmentInCondition sniff by adding a few more test case files to exercise the parts of the sniff code that checks for invalid syntax. --- .../Tests/CodeAnalysis/AssignmentInConditionUnitTest.2.inc | 4 ++++ .../Tests/CodeAnalysis/AssignmentInConditionUnitTest.3.inc | 4 ++++ .../Tests/CodeAnalysis/AssignmentInConditionUnitTest.4.inc | 6 ++++++ .../Tests/CodeAnalysis/AssignmentInConditionUnitTest.5.inc | 6 ++++++ .../Tests/CodeAnalysis/AssignmentInConditionUnitTest.6.inc | 5 +++++ 5 files changed, 25 insertions(+) create mode 100644 src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.2.inc create mode 100644 src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.3.inc create mode 100644 src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.4.inc create mode 100644 src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.5.inc create mode 100644 src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.6.inc diff --git a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.2.inc b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.2.inc new file mode 100644 index 0000000000..123d7f3e9a --- /dev/null +++ b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.2.inc @@ -0,0 +1,4 @@ +