From b507aa9c2e6de5752304009babf7bb77bb438f6c Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 5 Aug 2024 01:35:49 -0400 Subject: [PATCH 1/2] Update SonarTask.php Updated banner --- src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php b/src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php index 5560b01bb..01b82bb6b 100644 --- a/src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php +++ b/src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php @@ -275,7 +275,7 @@ private function validateExecutable() $isOk = false; foreach ($output as $line) { - if (preg_match('/Sonar(Qube )?Scanner \d+\\.\d+/', $line) === 1) { + if (preg_match('/Sonar(Qube )?Scanner CLI \d+\\.\d+/', $line) === 1) { $isOk = true; break; } From 886c04e342164123875c96594626b82f22ece2cd Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 5 Sep 2024 01:21:49 -0400 Subject: [PATCH 2/2] Update src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php Accepted suggestion Co-authored-by: Dan Wallis --- src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php b/src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php index 01b82bb6b..9ed37cf5f 100644 --- a/src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php +++ b/src/Phing/Task/Ext/Analyzer/Sonar/SonarTask.php @@ -275,7 +275,7 @@ private function validateExecutable() $isOk = false; foreach ($output as $line) { - if (preg_match('/Sonar(Qube )?Scanner CLI \d+\\.\d+/', $line) === 1) { + if (preg_match('/Sonar(Qube )?Scanner( CLI)? \d+\\.\d+/', $line) === 1) { $isOk = true; break; }