From 652eb92f76f79f1680851cf796d7bc58a53ec417 Mon Sep 17 00:00:00 2001 From: Claudiu Pintiuta Date: Mon, 21 Aug 2023 15:09:35 +0300 Subject: [PATCH 1/5] codecov, bump http-message, bug fix --- .github/workflows/codecov.yml | 53 +++++++++++++++++++++++++++ .github/workflows/cs-tests.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- composer.json | 2 +- src/AuthenticationInterface.php | 2 +- 5 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/codecov.yml diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml new file mode 100644 index 0000000..c90cf08 --- /dev/null +++ b/.github/workflows/codecov.yml @@ -0,0 +1,53 @@ +on: + - push + +name: Run Codecov checks + +jobs: + code-coverage: + name: Code Coverage + + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: + - ubuntu-latest + + php: + - "8.1" + - "8.2" + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Install PHP + uses: shivammathur/setup-php@v2 + with: + php-version: "${{ matrix.php }}" + coverage: pcov + ini-values: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On + tools: composer:v2, cs2pr + + - name: Determine composer cache directory + run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV + + - name: Cache dependencies installed with composer + uses: actions/cache@v3 + with: + path: ${{ env.COMPOSER_CACHE_DIR }} + key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }} + restore-keys: | + php${{ matrix.php }}-composer- + + - name: Install dependencies with composer + run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi + + - name: Collect code coverage with PHPUnit + run: vendor/bin/phpunit --colors=always --coverage-clover clover.xml + + - name: Send code coverage report to Codecov.io + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/cs-tests.yml b/.github/workflows/cs-tests.yml index 3da9965..e4032b1 100644 --- a/.github/workflows/cs-tests.yml +++ b/.github/workflows/cs-tests.yml @@ -40,7 +40,7 @@ jobs: restore-keys: | php${{ matrix.php }}-composer- - name: Install dependencies with composer - run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi + run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi - name: Run phpcs checks run: vendor/bin/phpcs diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 74550fc..134ff5b 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -40,7 +40,7 @@ jobs: restore-keys: | php${{ matrix.php }}-composer- - name: Install dependencies with composer - run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi + run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi - name: Run static analysis run: vendor/bin/psalm --no-cache --output-format=github --show-info=false --threads=4 diff --git a/composer.json b/composer.json index e432a9d..4860ebc 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": "~8.1.0 || ~8.2.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.1 || ^2.0" }, "require-dev": { "phpunit/phpunit": "^10.2", diff --git a/src/AuthenticationInterface.php b/src/AuthenticationInterface.php index ff20176..b1ef8a1 100644 --- a/src/AuthenticationInterface.php +++ b/src/AuthenticationInterface.php @@ -39,5 +39,5 @@ public function setIdentity(IdentityInterface $identity): IdentityInterface; /** * Clears the stored identity */ - public function clearIdentity(): IdentityInterface; + public function clearIdentity(): void; } From a667de22054a01460ff9f3bc04b82764b4687df1 Mon Sep 17 00:00:00 2001 From: Claudiu Pintiuta Date: Mon, 21 Aug 2023 15:12:49 +0300 Subject: [PATCH 2/5] new line --- .github/workflows/codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index c90cf08..f5980e7 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -50,4 +50,4 @@ jobs: - name: Send code coverage report to Codecov.io uses: codecov/codecov-action@v3 with: - token: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file + token: ${{ secrets.CODECOV_TOKEN }} From 6f30256f3ce467d881ca59a601d2b2d881766376 Mon Sep 17 00:00:00 2001 From: Claudiu Pintiuta Date: Mon, 21 Aug 2023 15:21:32 +0300 Subject: [PATCH 3/5] bug fix on return type --- src/AuthenticationInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AuthenticationInterface.php b/src/AuthenticationInterface.php index b1ef8a1..a7892b9 100644 --- a/src/AuthenticationInterface.php +++ b/src/AuthenticationInterface.php @@ -34,7 +34,7 @@ public function getIdentity(): ?IdentityInterface; /** * Sets the identity directly, useful for auto-login */ - public function setIdentity(IdentityInterface $identity): IdentityInterface; + public function setIdentity(IdentityInterface $identity): void; /** * Clears the stored identity From 13e14256e12e42b4b629efeffe0d97cc34ac7a75 Mon Sep 17 00:00:00 2001 From: Claudiu Pintiuta Date: Mon, 21 Aug 2023 15:36:13 +0300 Subject: [PATCH 4/5] review changes --- README.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ece526b..ad765ae 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Authentication base package defining interfaces for authentication services to be used with DotKernel applications. ![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-authentication) -![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-authentication/2.3.0) +![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-authentication/2.3.2) [![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-authentication)](https://github.com/dotkernel/dot-authentication/issues) [![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-authentication)](https://github.com/dotkernel/dot-authentication/network) diff --git a/composer.json b/composer.json index 4860ebc..358eb82 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": "~8.1.0 || ~8.2.0", - "psr/http-message": "^1.1 || ^2.0" + "psr/http-message": "^1.0 || ^2.0" }, "require-dev": { "phpunit/phpunit": "^10.2", From 147fedd53b12eb4a356ced104603fc2bb45754ae Mon Sep 17 00:00:00 2001 From: Claudiu Pintiuta Date: Mon, 21 Aug 2023 15:42:57 +0300 Subject: [PATCH 5/5] codecov fix --- phpunit.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpunit.xml b/phpunit.xml index 76304d8..cb13649 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,4 +7,10 @@ ./test + + + + ./src + +