From 62842975ccf0c88bdcef6d431f2a4ccd742475e8 Mon Sep 17 00:00:00 2001 From: Bill Ruddock Date: Sun, 14 Jul 2024 01:35:34 +0100 Subject: [PATCH 1/2] Squiz/ControlSignature: rename test case file to allow for adding more --- ...reUnitTest.inc => ControlSignatureUnitTest.1.inc} | 0 ...nc.fixed => ControlSignatureUnitTest.1.inc.fixed} | 0 .../ControlStructures/ControlSignatureUnitTest.php | 12 +++++++++--- 3 files changed, 9 insertions(+), 3 deletions(-) rename src/Standards/Squiz/Tests/ControlStructures/{ControlSignatureUnitTest.inc => ControlSignatureUnitTest.1.inc} (100%) rename src/Standards/Squiz/Tests/ControlStructures/{ControlSignatureUnitTest.inc.fixed => ControlSignatureUnitTest.1.inc.fixed} (100%) diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc similarity index 100% rename from src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc rename to src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc.fixed b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc.fixed similarity index 100% rename from src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc.fixed rename to src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc.fixed diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php index f20666d976..f6db4b19a0 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php +++ b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php @@ -55,7 +55,8 @@ public function getErrorList($testFile='') 112 => 1, ]; - if ($testFile === 'ControlSignatureUnitTest.inc') { + switch ($testFile) { + case 'ControlSignatureUnitTest.1.inc': $errors[122] = 1; $errors[130] = 2; $errors[134] = 1; @@ -84,9 +85,14 @@ public function getErrorList($testFile='') $errors[306] = 3; $errors[309] = 1; $errors[315] = 1; - }//end if + return $errors; - return $errors; + case 'ControlSignatureUnitTest.js': + return $errors; + + default: + return []; + }//end switch }//end getErrorList() From 3798bdaddc6b12e2338dbd934f3a68b09613b08e Mon Sep 17 00:00:00 2001 From: Bill Ruddock Date: Sun, 14 Jul 2024 01:38:47 +0100 Subject: [PATCH 2/2] Squiz/ControlSignature: move parse error to its own file --- .../Tests/ControlStructures/ControlSignatureUnitTest.1.inc | 4 ---- .../ControlStructures/ControlSignatureUnitTest.1.inc.fixed | 4 ---- .../Tests/ControlStructures/ControlSignatureUnitTest.2.inc | 5 +++++ 3 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.2.inc diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc index 6496f7fb34..de0235cdd2 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc +++ b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc @@ -318,7 +318,3 @@ endif; // Reset property. // phpcs:set Squiz.ControlStructures.ControlSignature requiredSpacesBeforeColon 1 - -// Intentional parse error. This should be the last test in the file. -foreach - // Some unrelated comment. diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc.fixed b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc.fixed index c8834a3dd1..03e6bf2c66 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc.fixed +++ b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.1.inc.fixed @@ -322,7 +322,3 @@ endif; // Reset property. // phpcs:set Squiz.ControlStructures.ControlSignature requiredSpacesBeforeColon 1 - -// Intentional parse error. This should be the last test in the file. -foreach - // Some unrelated comment. diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.2.inc b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.2.inc new file mode 100644 index 0000000000..ef99b1a223 --- /dev/null +++ b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.2.inc @@ -0,0 +1,5 @@ +