Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates dependencies and PHP from 8.2 to 8.3. #11

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,55 +1,49 @@
name: CI

on:
push:
pull_request:

permissions:
contents: read

env:
PHP_VERSION: '8.3'

jobs:
auto-review:
name: Auto review
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use PHP 8.2
- name: Configure PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: ${{ env.PHP_VERSION }}

- name: Install dependencies
run: composer update --no-progress --optimize-autoloader

- name: Run phpcs
run: composer phpcs

- name: Run phpmd
run: composer phpmd
- name: Run review
run: composer review

tests:
name: Tests
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use PHP 8.2
- name: Use PHP ${{ env.PHP_VERSION }}
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: ${{ env.PHP_VERSION }}

- name: Install dependencies
run: composer update --no-progress --optimize-autoloader

- name: Run unit tests
env:
XDEBUG_MODE: coverage
run: composer test

- name: Run mutation tests
run: composer test-mutation
- name: Run tests
run: composer tests
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
DOCKER_RUN = docker run --rm -it --net=host -v ${PWD}:/app -w /app gustavofreze/php:8.2
DOCKER_RUN = docker run --rm -it --net=host -v ${PWD}:/app -w /app gustavofreze/php:8.3

.PHONY: configure test test-file test-no-coverage review show-reports clean
.PHONY: configure test test-no-coverage review show-reports clean

configure:
@${DOCKER_RUN} composer update --optimize-autoloader

test:
@${DOCKER_RUN} composer tests

test-file:
@${DOCKER_RUN} composer tests-file-no-coverage ${FILE}

test-no-coverage:
@${DOCKER_RUN} composer tests-no-coverage

Expand All @@ -22,4 +19,4 @@ show-reports:

clean:
@sudo chown -R ${USER}:${USER} ${PWD}
@rm -rf report vendor .phpunit.cache
@rm -rf report vendor .phpunit.cache .lock
23 changes: 11 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"psr",
"currency",
"iso-4217",
"currencies",
"tiny-blocks",
"value-object"
],
Expand Down Expand Up @@ -41,35 +42,33 @@
}
},
"require": {
"php": "^8.2"
"php": "^8.3"
},
"require-dev": {
"phpmd/phpmd": "^2.15",
"phpunit/phpunit": "^11",
"phpstan/phpstan": "^1",
"infection/infection": "^0.29",
"squizlabs/php_codesniffer": "^3.10"
"phpunit/phpunit": "^11",
"infection/infection": "^0",
"squizlabs/php_codesniffer": "^3.11"
},
"scripts": {
"test": "phpunit --configuration phpunit.xml tests",
"phpcs": "phpcs --standard=PSR12 --extensions=php ./src",
"phpmd": "phpmd ./src text phpmd.xml --suffixes php --exclude /src/Currency.php --ignore-violations-on-exit",
"phpmd": "phpmd ./src text phpmd.xml --suffixes php --ignore-violations-on-exit",
"phpstan": "phpstan analyse -c phpstan.neon.dist --quiet --no-progress",
"test": "phpunit --log-junit=report/coverage/junit.xml --coverage-xml=report/coverage/coverage-xml --coverage-html=report/coverage/coverage-html tests",
"test-mutation": "infection --only-covered --logger-html=report/coverage/mutation-report.html --coverage=report/coverage --min-msi=100 --min-covered-msi=100 --threads=4",
"test-no-coverage": "phpunit --no-coverage",
"test-mutation-no-coverage": "infection --only-covered --min-msi=100 --threads=4",
"mutation-test": "infection --only-covered --threads=max --logger-html=report/coverage/mutation-report.html --coverage=report/coverage",
"test-no-coverage": "phpunit --configuration phpunit.xml --no-coverage tests",
"review": [
"@phpcs",
"@phpmd",
"@phpstan"
],
"tests": [
"@test",
"@test-mutation"
"@mutation-test"
],
"tests-no-coverage": [
"@test-no-coverage",
"@test-mutation-no-coverage"
"@test-no-coverage"
]
}
}
20 changes: 11 additions & 9 deletions infection.json.dist
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
{
"timeout": 10,
"testFramework": "phpunit",
"logs": {
"text": "report/infection/logs/infection-text.log",
"summary": "report/infection/logs/infection-summary.log"
},
"tmpDir": "report/infection/",
"minMsi": 100,
"timeout": 30,
"source": {
"directories": [
"src"
]
},
"logs": {
"text": "report/infection/logs/infection-text.log",
"summary": "report/infection/logs/infection-summary.log"
"phpUnit": {
"configDir": "",
"customPath": "./vendor/bin/phpunit"
},
"mutators": {
"@default": true
},
"phpUnit": {
"configDir": "",
"customPath": "./vendor/bin/phpunit"
}
"minCoveredMsi": 100,
"testFramework": "phpunit"
}
6 changes: 4 additions & 2 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
failOnRisky="true"
failOnWarning="true"
cacheDirectory=".phpunit.cache"
executionOrder="random"
beStrictAboutOutputDuringTests="true">

<source>
Expand All @@ -22,14 +23,15 @@

<coverage>
<report>
<xml outputDirectory="report/coverage/coverage-xml"/>
<html outputDirectory="report/coverage/coverage-html"/>
<text outputFile="report/coverage.txt"/>
<html outputDirectory="report/html/"/>
<clover outputFile="report/coverage-clover.xml"/>
</report>
</coverage>

<logging>
<junit outputFile="report/execution-result.xml"/>
<junit outputFile="report/coverage/junit.xml"/>
</logging>

</phpunit>
13 changes: 9 additions & 4 deletions src/Currency.php
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,16 @@ enum Currency: string
case ZMW = 'ZMW';
case ZWL = 'ZWL';

private const FRACTION_DIGITS_TWO = 2;
private const FRACTION_DIGITS_ZERO = 0;
private const FRACTION_DIGITS_FOUR = 4;
private const FRACTION_DIGITS_THREE = 3;
private const int FRACTION_DIGITS_TWO = 2;
private const int FRACTION_DIGITS_ZERO = 0;
private const int FRACTION_DIGITS_FOUR = 4;
private const int FRACTION_DIGITS_THREE = 3;

/**
* Returns the number of decimal places for the current currency.
*
* @return int The number of decimal places.
*/
public function getFractionDigits(): int
{
return match ($this) {
Expand Down
Loading