From ccb56037370bd98b6957e4799384351dd96132e7 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 13:19:20 +0200 Subject: [PATCH 01/22] [PW-6785] - Coverage report for SonarCloud --- .github/workflows/main.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0691b6896..49814906d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,8 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} - tools: composer:v1, + tools: composer:v1 + coverage: xdebug - name: Test plugin installation run: | echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > auth.json @@ -27,5 +28,20 @@ jobs: MAGENTO_PASSWORD: ${{ secrets.MAGENTO_PASSWORD }} - name: Code Sniffer run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations + - name: Run PHPUnit - run: vendor/bin/phpunit Test/Unit + run: vendor/bin/phpunit --coverage-clover build/clover.xml Test/Unit + + # PHPUnit generates absolute file paths and SonarCloud expects relative file paths. This command removes the + # current working directory from the report files. + - name: Clean up code coverage reports + run: sed -i "s;`pwd`/;;g" build/*.xml + + - name: Fix code coverage paths + run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml + + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 9d581a20a31a10c1fa01b45f379795255f9a2c72 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 13:25:19 +0200 Subject: [PATCH 02/22] [PW-6785] - Coverage report for SonarCloud --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 49814906d..d3cc58d90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,10 +35,10 @@ jobs: # PHPUnit generates absolute file paths and SonarCloud expects relative file paths. This command removes the # current working directory from the report files. - name: Clean up code coverage reports - run: sed -i "s;`pwd`/;;g" build/*.xml + run: sed -i "s;`pwd`/;;g" build/clover.xml - name: Fix code coverage paths - run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml + run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' clover.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master From c8cd0f273e8cc9a1f687587fbeada2cda5f5fc65 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 13:27:05 +0200 Subject: [PATCH 03/22] [PW-6785] - Coverage report for SonarCloud --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d3cc58d90..cda33b4d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: run: sed -i "s;`pwd`/;;g" build/clover.xml - name: Fix code coverage paths - run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' clover.xml + run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' build/clover.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master From af4172ae11fbab392d52abad71b1df18cf1d5a98 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 13:29:01 +0200 Subject: [PATCH 04/22] [PW-6785] - Coverage report for SonarCloud --- .github/workflows/main.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cda33b4d6..22271defd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,15 +30,10 @@ jobs: run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations - name: Run PHPUnit - run: vendor/bin/phpunit --coverage-clover build/clover.xml Test/Unit - - # PHPUnit generates absolute file paths and SonarCloud expects relative file paths. This command removes the - # current working directory from the report files. - - name: Clean up code coverage reports - run: sed -i "s;`pwd`/;;g" build/clover.xml + run: vendor/bin/phpunit --coverage-clover clover.xml Test/Unit - name: Fix code coverage paths - run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' build/clover.xml + run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' clover.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master From dea4110f54e975f1751508165e440700b606e4e8 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 13:33:36 +0200 Subject: [PATCH 05/22] [PW-6785] - Coverage report for SonarCloud --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 22271defd..8f0f1f546 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,11 +26,12 @@ jobs: CI: true MAGENTO_USERNAME: ${{ secrets.MAGENTO_USERNAME }} MAGENTO_PASSWORD: ${{ secrets.MAGENTO_PASSWORD }} + - name: Code Sniffer run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations - name: Run PHPUnit - run: vendor/bin/phpunit --coverage-clover clover.xml Test/Unit + run: vendor/bin/phpunit --coverage-clover=clover.xml Test/Unit - name: Fix code coverage paths run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' clover.xml From 13d68d9c8cfd209ee205dcf7bc70bc6f3c3038b2 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 13:40:15 +0200 Subject: [PATCH 06/22] [PW-6785] - Coverage report for SonarCloud --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f0f1f546..e0f23d6d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: run: vendor/bin/phpunit --coverage-clover=clover.xml Test/Unit - name: Fix code coverage paths - run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' clover.xml + run: sed -i "s;`pwd`/;;g" clover.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master From 3402e91d582b1639f55b10efa5878eca96cdfad6 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 15:42:36 +0200 Subject: [PATCH 07/22] [PW-6785] - Coverage report for SonarCloud --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e0f23d6d6..03c36d766 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,7 @@ jobs: php-version: ${{ matrix.php-version }} tools: composer:v1 coverage: xdebug + - name: Test plugin installation run: | echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > auth.json @@ -31,10 +32,10 @@ jobs: run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations - name: Run PHPUnit - run: vendor/bin/phpunit --coverage-clover=clover.xml Test/Unit + run: vendor/bin/phpunit --coverage-clover ./clover.xml Test/Unit - name: Fix code coverage paths - run: sed -i "s;`pwd`/;;g" clover.xml + run: sed -i "s;`pwd`/;;g" ./clover.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master From 0bd0bcf07697c4e83032c2c43471731cd576937b Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 15:42:44 +0200 Subject: [PATCH 08/22] [PW-6785] - Coverage report for SonarCloud --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index a7099c487..3619f8294 100755 --- a/composer.json +++ b/composer.json @@ -21,6 +21,7 @@ }, "require-dev": { "phpunit/phpunit": "^9", + "php-coveralls/php-coveralls": "2.5.2", "magento/magento-coding-standard": "*", "squizlabs/php_codesniffer": "~3.5.3" }, From 8e8f2e41cc72f4da6be44fd4de568129780daf38 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Fri, 12 Aug 2022 16:00:35 +0200 Subject: [PATCH 09/22] [PW-6785] - Coverage report for SonarCloud --- .github/workflows/main.yml | 4 ++-- Test/phpunit.xml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03c36d766..2541bef15 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,10 +32,10 @@ jobs: run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations - name: Run PHPUnit - run: vendor/bin/phpunit --coverage-clover ./clover.xml Test/Unit + run: vendor/bin/phpunit --coverage-clover=clover.xml Test/Unit - name: Fix code coverage paths - run: sed -i "s;`pwd`/;;g" ./clover.xml + run: sed -i "s;`pwd`/;;g" clover.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master diff --git a/Test/phpunit.xml b/Test/phpunit.xml index 15e8cb216..2ab32b93e 100644 --- a/Test/phpunit.xml +++ b/Test/phpunit.xml @@ -18,4 +18,10 @@ . + + + ../. + + + From f371f340f76cda29e62bbe3486ea842fa2ef4e38 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 12:02:14 +0200 Subject: [PATCH 10/22] [PW-6785] - Refactor phpunit.xml for configuration and main.yml for pipeline --- .github/workflows/main.yml | 4 ++-- Test/phpunit.xml | 29 ++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2541bef15..8438aa590 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,10 +32,10 @@ jobs: run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations - name: Run PHPUnit - run: vendor/bin/phpunit --coverage-clover=clover.xml Test/Unit + run: vendor/bin/phpunit --coverage-clover=build/clover.xml -c Test/phpunit.xml Test/Unit - name: Fix code coverage paths - run: sed -i "s;`pwd`/;;g" clover.xml + run: sed -i "s;`pwd`/;;g" build/clover.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master diff --git a/Test/phpunit.xml b/Test/phpunit.xml index 2ab32b93e..a7cd903af 100644 --- a/Test/phpunit.xml +++ b/Test/phpunit.xml @@ -12,16 +12,39 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd" bootstrap="./bootstrap.php" + forceCoversAnnotation="false" + beStrictAboutCoversAnnotation="false" + beStrictAboutOutputDuringTests="true" + beStrictAboutTodoAnnotatedTests="true" + convertDeprecationsToExceptions="true" + failOnRisky="false" + failOnWarning="false" + verbose="true" > + + + + + + + + + + . - + + - ../. + ../Block + ../Comment + ../Gateway + ../Helper + ../Model + ../Ui - From 9d9b8aa1aa6341a52c503773df4ab279161e4eb4 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 13:17:40 +0200 Subject: [PATCH 11/22] [PW-6785] - Add sonar-project.properties file --- .github/workflows/main.yml | 4 ++-- sonar-project.properties | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 sonar-project.properties diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8438aa590..5cf84e607 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,10 +32,10 @@ jobs: run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations - name: Run PHPUnit - run: vendor/bin/phpunit --coverage-clover=build/clover.xml -c Test/phpunit.xml Test/Unit + run: vendor/bin/phpunit --coverage-clover=build/clover.xml --log-junit build/tests-log.xml -c Test/phpunit.xml Test/Unit - name: Fix code coverage paths - run: sed -i "s;`pwd`/;;g" build/clover.xml + run: sed -i "s;`pwd`/;;g" build/*.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 000000000..7820778a8 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,5 @@ +sonar.organization=adyen +sonar.projectKey=Adyen_adyen-magento2 +sonar.sources=. +sonar.php.coverage.reportPaths=build/clover.xml +sonar.php.tests.reportPath=build/tests-log.xml From 6a297f6b426f612cc4799041ec8100d4706ba2e9 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 13:23:04 +0200 Subject: [PATCH 12/22] [PW-6785] - Remove sonar analysis from CI --- .github/workflows/main.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5cf84e607..909071912 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,13 +32,8 @@ jobs: run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations - name: Run PHPUnit - run: vendor/bin/phpunit --coverage-clover=build/clover.xml --log-junit build/tests-log.xml -c Test/phpunit.xml Test/Unit + run: vendor/bin/phpunit --coverage-clover=build/clover.xml --log-junit=build/tests-log.xml -c Test/phpunit.xml Test/Unit - name: Fix code coverage paths run: sed -i "s;`pwd`/;;g" build/*.xml - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 410bddb848ba59ba0a217ca98f9d0a12eee929cd Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 13:52:18 +0200 Subject: [PATCH 13/22] [PW-6785] - Remove unnecessary dependencies --- .github/workflows/main.yml | 1 - composer.json | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 909071912..81bc13644 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,6 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer:v1 - coverage: xdebug - name: Test plugin installation run: | diff --git a/composer.json b/composer.json index 3619f8294..a7099c487 100755 --- a/composer.json +++ b/composer.json @@ -21,7 +21,6 @@ }, "require-dev": { "phpunit/phpunit": "^9", - "php-coveralls/php-coveralls": "2.5.2", "magento/magento-coding-standard": "*", "squizlabs/php_codesniffer": "~3.5.3" }, From bd74dd3195742d4950f266b1cf275cdd5617ac01 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 14:00:45 +0200 Subject: [PATCH 14/22] [PW-6785] - Coverage test function --- Helper/Address.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Helper/Address.php b/Helper/Address.php index a0a1f5a93..55944bb9a 100644 --- a/Helper/Address.php +++ b/Helper/Address.php @@ -89,6 +89,11 @@ public function getStreetAndHouseNumberFromAddress( } } + public function getHouseNameSonarTest(array $addressArray) + { + return implode(',', $addressArray); + } + /** * @param string[] $addressArray * @return array From dfd5c930b72a6d6449f2b27c9dbf234b2c886865 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 14:29:31 +0200 Subject: [PATCH 15/22] [PW-6785] - Enable CI based sonar analysis --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 81bc13644..1d161ac13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,3 +36,8 @@ jobs: - name: Fix code coverage paths run: sed -i "s;`pwd`/;;g" build/*.xml + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From d9ea7bf70efa52f5a5f26e06a72978aee23a8b9d Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 14:32:26 +0200 Subject: [PATCH 16/22] [PW-6785] - Code formatting --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d161ac13..6a2f998b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,8 @@ jobs: run: sed -i "s;`pwd`/;;g" build/*.xml - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + if: ${{ env.SONAR_TOKEN }} + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 6f6ca5dee634ea3722f720d94f75c0950c33ab3d Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 14:37:27 +0200 Subject: [PATCH 17/22] [PW-6785] - Temporarily disable PHP8.1 matrix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a2f998b3..9c584c1bd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - php-version: [7.3, 7.4, 8.1] + php-version: [7.3, 7.4] steps: - uses: actions/checkout@v2 From effcf6b77335f447e6dadc550bfc377ee47d3244 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 14:50:29 +0200 Subject: [PATCH 18/22] [PW-6785] - Change allowed list for scan --- Test/phpunit.xml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Test/phpunit.xml b/Test/phpunit.xml index a7cd903af..9f3f08093 100644 --- a/Test/phpunit.xml +++ b/Test/phpunit.xml @@ -37,14 +37,12 @@ - - - ../Block - ../Comment - ../Gateway - ../Helper - ../Model - ../Ui - - + + + .. + + vendor + + + From 10a735da4e5392024c21671eda91bcec9b7b0dab Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 15:02:28 +0200 Subject: [PATCH 19/22] [PW-6785] - Change allowed list for scan --- Test/phpunit.xml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/Test/phpunit.xml b/Test/phpunit.xml index 9f3f08093..61312bced 100644 --- a/Test/phpunit.xml +++ b/Test/phpunit.xml @@ -10,16 +10,9 @@ --> @@ -37,12 +30,14 @@ - - - .. - - vendor - - - + + + ../Block + ../Comment + ../Gateway + ../Helper + ../Model + ../Ui + + From e7d1f630d9f79e1b18c5265e74d36eda558262e8 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 15:09:06 +0200 Subject: [PATCH 20/22] [PW-6785] - Exclude vendor directory from sonar analysis --- sonar-project.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/sonar-project.properties b/sonar-project.properties index 7820778a8..b7ff9ca0b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,6 @@ sonar.organization=adyen sonar.projectKey=Adyen_adyen-magento2 sonar.sources=. +sonar.exclusions=vendor/**/* sonar.php.coverage.reportPaths=build/clover.xml sonar.php.tests.reportPath=build/tests-log.xml From 9483d5e8e15f792e0e2c1c2639f853a6e4313798 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 15:27:53 +0200 Subject: [PATCH 21/22] [PW-6785] - Remove the filter for sonar analysis and include all the project files --- Test/phpunit.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Test/phpunit.xml b/Test/phpunit.xml index 61312bced..590d23719 100644 --- a/Test/phpunit.xml +++ b/Test/phpunit.xml @@ -32,12 +32,10 @@ - ../Block - ../Comment - ../Gateway - ../Helper - ../Model - ../Ui + ../. + + ../vendor + From 8941768417bbef7aefc09b70e42857942f1ff69d Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Mon, 15 Aug 2022 15:36:27 +0200 Subject: [PATCH 22/22] [PW-6785] - Revert commits 6f6ca5d and bd74dd3 --- .github/workflows/main.yml | 2 +- Helper/Address.php | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c584c1bd..6a2f998b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - php-version: [7.3, 7.4] + php-version: [7.3, 7.4, 8.1] steps: - uses: actions/checkout@v2 diff --git a/Helper/Address.php b/Helper/Address.php index 55944bb9a..a0a1f5a93 100644 --- a/Helper/Address.php +++ b/Helper/Address.php @@ -89,11 +89,6 @@ public function getStreetAndHouseNumberFromAddress( } } - public function getHouseNameSonarTest(array $addressArray) - { - return implode(',', $addressArray); - } - /** * @param string[] $addressArray * @return array