From 06c6a1ff1b8555dadd3248fc6dc1f290d881884c Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 10 Nov 2022 13:35:54 +0100 Subject: [PATCH] Cosmetic changes (#34) * cosmetic: update phpunit config file * cosmetic: php version check for different phpunit config * cosmetic: update workflow * cosmetic: removed sonarqube badges * cosmetic: disabled sonarqube in workflow --- .github/workflows/ci.yml | 35 ++++++++++++++++++++++++----------- README.md | 11 ----------- phpunit.xml.dist | 14 +++++--------- phpunit.xml.dist8 | 27 +++++++++++++++++++++++++++ sonar-project.properties | 2 +- 5 files changed, 57 insertions(+), 32 deletions(-) create mode 100644 phpunit.xml.dist8 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8469e9e..53d1347 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: branches: - master - dev + - main jobs: build: @@ -21,28 +22,40 @@ jobs: php-version: ${{ matrix.php }} coverage: xdebug tools: composer + - uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Install Composer dependencies run: composer install + + - name: Prepare PHPUnit config file for PHP < 8 + run: cp phpunit.xml.dist8 phpunit.xml.dist + if: "matrix.php < 8" + - name: PHPUnit tests (PHP ${{ matrix.php }}) run: php${{ matrix.php }} ./vendor/bin/phpunit --testdox --verbose --stop-on-failure + - uses: symfonycorp/security-checker-action@v3 + - name: Coding standard (PHP ${{ matrix.php }}) run: php${{ matrix.php }} ./vendor/bin/ecs check src tests + - name: Code coverage run: php${{ matrix.php }} -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-clover=var/coverage.xml + - name: Fix code coverage paths run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' var/coverage.xml - - name: Analyze with SonarQube - uses: sonarsource/sonarqube-scan-action@master - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} - # If you wish to fail your job when the Quality Gate is red, uncomment the - # following lines. This would typically be used to fail a deployment. - # - uses: sonarsource/sonarqube-quality-gate-action@master - # timeout-minutes: 5 - # env: - # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + +# - name: Analyze with SonarQube +# uses: sonarsource/sonarqube-scan-action@master +# env: +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} +# SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} +# # If you wish to fail your job when the Quality Gate is red, uncomment the +# # following lines. This would typically be used to fail a deployment. +# # - uses: sonarsource/sonarqube-quality-gate-action@master +# # timeout-minutes: 5 +# # env: +# # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/README.md b/README.md index 5e75f8b..92427c8 100644 --- a/README.md +++ b/README.md @@ -9,17 +9,6 @@ [![PHP Version Require](http://poser.pugx.org/mysiar/omnipay-przelewy24v1/require/php)](https://packagist.org/packages/mysiar/omnipay-przelewy24v1) [![GitHub stars](https://img.shields.io/github/stars/mysiar-org/omnipay-przelewy24v1)](https://github.com/mysiar-org/omnipay-przelewy24v1/stargazers) -[![Coverage](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=coverage&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Maintainability Rating](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=sqale_rating&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Quality Gate Status](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=alert_status&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Reliability Rating](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=reliability_rating&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Security Rating](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=security_rating&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Bugs](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=bugs&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Code Smells](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=code_smells&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Duplicated Lines (%)](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=duplicated_lines_density&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Lines of Code](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=ncloc&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Technical Debt](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=sqale_index&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) -[![Vulnerabilities](https://sq.mysiar.dev/api/project_badges/measure?project=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc&metric=vulnerabilities&token=e3ee022dee8869d296c924b840b66e0aefb86f62)](https://sq.mysiar.dev/dashboard?id=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc) ## API endpoints implemented diff --git a/phpunit.xml.dist b/phpunit.xml.dist index bc15944..6a9b19a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,19 +14,15 @@ ./src + + + + ./tests/ - - - ./src - - - - - - + diff --git a/phpunit.xml.dist8 b/phpunit.xml.dist8 new file mode 100644 index 0000000..8959611 --- /dev/null +++ b/phpunit.xml.dist8 @@ -0,0 +1,27 @@ + + + + + ./tests/ + + + + + ./src + + + + + + + diff --git a/sonar-project.properties b/sonar-project.properties index acbbcc7..43d25f9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,5 @@ sonar.projectKey=mysiar-org_omnipay-przelewy24v1_AYKYVbX_XdtDi-mnE6gc sonar.sources=src/ sonar.tests=tests/ -sonar.verbose=true +sonar.verbose=false sonar.php.coverage.reportPaths=var/coverage.xml