From d59fdcfdac3f37aa92130c4df25ee3865fe32d64 Mon Sep 17 00:00:00 2001
From: Omar <omar.lopesino@metadrop.net>
Date: Tue, 17 Jan 2023 11:54:11 +0100
Subject: [PATCH 1/4] Append suffixes correctly for phpcpd

---
 src/Tools/Analyzer/Phpcpd.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Tools/Analyzer/Phpcpd.php b/src/Tools/Analyzer/Phpcpd.php
index e788803..fb47db9 100644
--- a/src/Tools/Analyzer/Phpcpd.php
+++ b/src/Tools/Analyzer/Phpcpd.php
@@ -30,8 +30,14 @@ function ($extension) use ($isOlderVersion) {
             $args['progress'] = '';
         }
         if ($phpcpdNames) {
-            $namesOptions = $isOlderVersion ? 'names' : 'suffix';
-            $args[$namesOptions] = \Edge\QA\escapePath(implode(',', $phpcpdNames));
+            if ($isOlderVersion) {
+              $args['names'] = \Edge\QA\escapePath(implode(',', $phpcpdNames));
+            }
+            else {
+              foreach ($phpcpdNames as $name) {
+                $args[] = '--suffix "' . \Edge\QA\escapePath($name) . '"';
+              }
+            }
         }
         if ($this->options->isSavedToFiles) {
             $args['log-pmd'] = $this->tool->getEscapedXmlFile();

From ea6b1c5635365feb6d3a956da39270e888102430 Mon Sep 17 00:00:00 2001
From: Omar <omar.lopesino@metadrop.net>
Date: Tue, 17 Jan 2023 14:38:19 +0100
Subject: [PATCH 2/4] Coding style

---
 src/Tools/Analyzer/Phpcpd.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Tools/Analyzer/Phpcpd.php b/src/Tools/Analyzer/Phpcpd.php
index fb47db9..2cac5b9 100644
--- a/src/Tools/Analyzer/Phpcpd.php
+++ b/src/Tools/Analyzer/Phpcpd.php
@@ -31,12 +31,12 @@ function ($extension) use ($isOlderVersion) {
         }
         if ($phpcpdNames) {
             if ($isOlderVersion) {
-              $args['names'] = \Edge\QA\escapePath(implode(',', $phpcpdNames));
+                $args['names'] = \Edge\QA\escapePath(implode(',', $phpcpdNames));
             }
             else {
-              foreach ($phpcpdNames as $name) {
-                $args[] = '--suffix "' . \Edge\QA\escapePath($name) . '"';
-              }
+                foreach ($phpcpdNames as $name) {
+                    $args[] = '--suffix "' . \Edge\QA\escapePath($name) . '"';
+                }
             }
         }
         if ($this->options->isSavedToFiles) {

From 1abf845f11c1e7bf89bf6c0bd4aa88a598bb0c93 Mon Sep 17 00:00:00 2001
From: Omar <omar.lopesino@metadrop.net>
Date: Tue, 17 Jan 2023 14:51:17 +0100
Subject: [PATCH 3/4] Coding Style

---
 src/Tools/Analyzer/Phpcpd.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Tools/Analyzer/Phpcpd.php b/src/Tools/Analyzer/Phpcpd.php
index 2cac5b9..fbcdd13 100644
--- a/src/Tools/Analyzer/Phpcpd.php
+++ b/src/Tools/Analyzer/Phpcpd.php
@@ -32,8 +32,7 @@ function ($extension) use ($isOlderVersion) {
         if ($phpcpdNames) {
             if ($isOlderVersion) {
                 $args['names'] = \Edge\QA\escapePath(implode(',', $phpcpdNames));
-            }
-            else {
+            } else {
                 foreach ($phpcpdNames as $name) {
                     $args[] = '--suffix "' . \Edge\QA\escapePath($name) . '"';
                 }

From b9e71d4dab7cd7ed09d13e45a88555bcf2b1a7bc Mon Sep 17 00:00:00 2001
From: Omar <omar.lopesino@metadrop.net>
Date: Thu, 2 Feb 2023 10:45:22 +0100
Subject: [PATCH 4/4] Safer way to format the phpcpd arguments

---
 src/Tools/Analyzer/Phpcpd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tools/Analyzer/Phpcpd.php b/src/Tools/Analyzer/Phpcpd.php
index fbcdd13..9c136b2 100644
--- a/src/Tools/Analyzer/Phpcpd.php
+++ b/src/Tools/Analyzer/Phpcpd.php
@@ -34,7 +34,7 @@ function ($extension) use ($isOlderVersion) {
                 $args['names'] = \Edge\QA\escapePath(implode(',', $phpcpdNames));
             } else {
                 foreach ($phpcpdNames as $name) {
-                    $args[] = '--suffix "' . \Edge\QA\escapePath($name) . '"';
+                    $args[] = sprintf('--suffix %s', \Edge\QA\escapePath($name));
                 }
             }
         }