From 71a83aa3844c82b3e3363a315e99e4455ee3478c Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 19 Dec 2020 10:04:00 +0100 Subject: [PATCH 1/2] Added PHP 8 on mutation tests --- .github/workflows/ci.yml | 4 +--- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e5ff5b7..0442604b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -239,12 +239,10 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - php-version: ['7.4'] + php-version: ['7.4', '8.0'] steps: - name: Checkout code uses: actions/checkout@v2 - - name: Start database server - run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db - name: Use PHP uses: shivammathur/setup-php@v2 with: diff --git a/composer.json b/composer.json index 19c4097e..652ff9b0 100644 --- a/composer.json +++ b/composer.json @@ -34,14 +34,14 @@ "laminas/laminas-stdlib": "^3.2", "lcobucci/jwt": "^4.0", "league/uri": "^6.2", - "lstrojny/functional-php": "^1.9", + "lstrojny/functional-php": "dev-master#5b78132 as 1.15", "mezzio/mezzio": "^3.2", "mezzio/mezzio-fastroute": "^3.0", "mezzio/mezzio-helpers": "^5.3", "mezzio/mezzio-problem-details": "^1.1", "mezzio/mezzio-swoole": "^2.6.4", "monolog/monolog": "^2.0", - "nikolaposa/monolog-factory": "^3.0", + "nikolaposa/monolog-factory": "^3.1", "ocramius/proxy-manager": "^2.7.0", "php-middleware/request-id": "^4.1", "predis/predis": "^1.1", From 3a4a2e4483b306e29fdd24e50fc235e50c662792 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 19 Dec 2020 10:25:19 +0100 Subject: [PATCH 2/2] Replaced scrutinizer with codecov --- .gitattributes | 1 - .github/workflows/ci.yml | 10 ++++++---- .scrutinizer.yml | 16 ---------------- README.md | 2 +- 4 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 .scrutinizer.yml diff --git a/.gitattributes b/.gitattributes index 53b0a935..4d66fe58 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,7 +10,6 @@ .gitattributes export-ignore .gitignore export-ignore .phpstorm.meta.php export-ignore -.scrutinizer.yml export-ignore .travis.yml export-ignore build.sh export-ignore CHANGELOG.md export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0442604b..c426f4a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -284,10 +284,12 @@ jobs: - run: mv build/coverage-unit/coverage-unit.cov build/coverage-unit.cov - run: mv build/coverage-db/coverage-db.cov build/coverage-db.cov - run: mv build/coverage-api/coverage-api.cov build/coverage-api.cov - - run: wget https://phar.phpunit.de/phpcov-7.0.2.phar - - run: php phpcov-7.0.2.phar merge build --clover build/clover.xml - - run: wget https://scrutinizer-ci.com/ocular.phar - - run: php ocular.phar code-coverage:upload --format=php-clover build/clover.xml + - run: wget https://phar.phpunit.de/phpcov-8.2.0.phar + - run: php phpcov-8.2.0.phar merge build --clover build/clover.xml + - name: Publish coverage + uses: codecov/codecov-action@v1 + with: + file: ./build/clover.xml delete-artifacts: needs: diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index ed831706..00000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,16 +0,0 @@ -tools: - external_code_coverage: - timeout: 600 -checks: - php: - code_rating: true - duplication: true -build: - dependencies: - override: - - composer install --no-interaction --no-scripts --ignore-platform-reqs - nodes: - analysis: - tests: - override: - - php-scrutinizer-run diff --git a/README.md b/README.md index 7756c063..d8263f6b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ![Shlink](https://raw.githubusercontent.com/shlinkio/shlink.io/main/public/images/shlink-hero.png) [![Build Status](https://img.shields.io/github/workflow/status/shlinkio/shlink/Continuous%20integration/develop?logo=github&style=flat-square)](https://github.com/shlinkio/shlink/actions?query=workflow%3A%22Continuous+integration%22) +[![Code Coverage](https://img.shields.io/codecov/c/gh/shlinkio/shlink/develop?style=flat-square)](https://app.codecov.io/gh/shlinkio/shlink) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/) -[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/) [![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink) [![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?logo=docker&style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/) [![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/main/LICENSE)