Skip to content

Commit cfe521f

Browse files
vjikvjik
authored
Bump PHP to 8.3 + CS (#14)
1 parent 4a588d7 commit cfe521f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+225
-200
lines changed

‎.github/workflows/build.yml

+17-25
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,35 @@ name: build
2525
jobs:
2626
phpunit:
2727
name: PHP ${{ matrix.php }}-${{ matrix.os }}
28+
2829
runs-on: ${{ matrix.os }}
30+
2931
strategy:
3032
matrix:
3133
os: [ 'ubuntu-latest', 'windows-latest' ]
32-
php: [ '8.2' ]
34+
php: [ '8.3', '8.4' ]
35+
3336
steps:
3437
- name: Checkout
35-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3639

3740
- name: Install PHP with extensions
3841
uses: shivammathur/setup-php@v2
42+
env:
43+
update: true
3944
with:
40-
ini-values: date.timezone='UTC'
4145
php-version: ${{ matrix.php }}
42-
tools: composer:v2
46+
ini-values: date.timezone='UTC'
47+
coverage: xdebug
4348

44-
- name: Determine composer cache directory on Linux
45-
if: matrix.os == 'ubuntu-latest'
46-
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
49+
- name: Install Composer dependencies
50+
uses: ramsey/composer-install@v3
4751

48-
- name: Determine composer cache directory on Windows
49-
if: matrix.os == 'windows-latest'
50-
run: echo "COMPOSER_CACHE_DIR=~\AppData\Local\Composer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
52+
- name: Run tests with PHPUnit
53+
run: vendor/bin/phpunit --colors=always --coverage-clover=coverage.xml
5154

52-
- name: Cache dependencies installed with composer
53-
uses: actions/cache@v3
55+
- name: Upload coverage to Coveralls
56+
if: matrix.os == 'ubuntu-latest'
57+
uses: coverallsapp/github-action@v2
5458
with:
55-
path: ${{ env.COMPOSER_CACHE_DIR }}
56-
key: php${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
57-
restore-keys: |
58-
php${{ matrix.php }}-composer-
59-
60-
- name: Update composer
61-
run: composer self-update
62-
63-
- name: Install dependencies with composer
64-
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
65-
66-
- name: Run tests with PHPUnit
67-
run: vendor/bin/phpunit --configuration phpunit.xml.dist
59+
file: ./coverage.xml

‎.github/workflows/composer-require-checker.yml

+8-20
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,26 @@ name: Composer require checker
2727
jobs:
2828
composer-require-checker:
2929
name: PHP ${{ matrix.php }}-${{ matrix.os }}
30+
3031
runs-on: ${{ matrix.os }}
32+
3133
strategy:
3234
matrix:
3335
os: [ 'ubuntu-latest' ]
34-
php: [ '8.2' ]
36+
php: [ '8.3', '8.4' ]
37+
3538
steps:
3639
- name: Checkout
37-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
3841

3942
- name: Install PHP with extensions
4043
uses: shivammathur/setup-php@v2
4144
with:
42-
ini-values: date.timezone='UTC'
4345
php-version: ${{ matrix.php }}
44-
tools: composer:v2
45-
46-
- name: Determine composer cache directory on Linux
47-
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
48-
49-
- name: Cache dependencies installed with composer
50-
uses: actions/cache@v3
51-
with:
52-
path: ${{ env.COMPOSER_CACHE_DIR }}
53-
key: php${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
54-
restore-keys: |
55-
php${{ matrix.php }}-composer-
56-
57-
- name: Update composer
58-
run: composer self-update
46+
coverage: none
5947

60-
- name: Install dependencies with composer
61-
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
48+
- name: Install Composer dependencies
49+
uses: ramsey/composer-install@v3
6250

6351
- name: Check dependencies
6452
run: vendor/bin/composer-require-checker

‎.github/workflows/cs.yml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: cs fixer
2+
3+
on: [ pull_request_target ]
4+
5+
jobs:
6+
php-cs-fixer:
7+
runs-on: ubuntu-latest
8+
permissions:
9+
contents: write
10+
steps:
11+
- name: Checkout code
12+
uses: actions/checkout@v4
13+
with:
14+
ref: ${{ github.head_ref }}
15+
repository: ${{ github.event.pull_request.head.repo.full_name }}
16+
17+
- name: Install PHP
18+
uses: shivammathur/setup-php@v2
19+
with:
20+
php-version: 8.3
21+
tools: composer:v2
22+
coverage: none
23+
24+
- name: Install Composer dependencies
25+
uses: "ramsey/composer-install@v3"
26+
27+
- name: Run PHP CS Fixer
28+
run: composer php-cs-fixer
29+
30+
- name: Run Rector
31+
run: composer rector
32+
33+
- name: Commit changes
34+
uses: stefanzweifel/git-auto-commit-action@v5
35+
with:
36+
commit_message: "Apply PHP CS Fixer and Rector changes (CI)"
37+
file_pattern: '*.php'
38+
disable_globbing: true

‎.github/workflows/mutation.yml

+11-25
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,29 @@ name: mutation test
2525
jobs:
2626
roave-infection:
2727
name: PHP ${{ matrix.php }}-${{ matrix.os }}
28+
2829
runs-on: ${{ matrix.os }}
30+
2931
strategy:
3032
matrix:
3133
os: [ 'ubuntu-latest' ]
32-
php: [ '8.2' ]
34+
php: [ '8.4' ]
3335

3436
steps:
3537
- name: Checkout
36-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3739

3840
- name: Install PHP with extensions
3941
uses: shivammathur/setup-php@v2
4042
with:
41-
ini-values: date.timezone='UTC'
42-
php-version: ${{ matrix.php }}
43-
tools: composer:v2
44-
45-
- name: Determine composer cache directory on Linux
46-
if: matrix.os == 'ubuntu-latest'
47-
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
48-
49-
- name: Cache dependencies installed with composer
50-
uses: actions/cache@v3
51-
with:
52-
path: ${{ env.COMPOSER_CACHE_DIR }}
53-
key: php${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
54-
restore-keys: |
55-
php${{ matrix.php }}-composer-
56-
57-
- name: Update composer
58-
run: composer self-update
43+
php-version: "${{ matrix.php }}"
44+
ini-values: memory_limit=-1
45+
coverage: xdebug
5946

60-
- name: Install dependencies with composer
61-
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
47+
- name: Install Composer dependencies
48+
uses: ramsey/composer-install@v3
6249

63-
- name: Run roave infection
64-
run: |
65-
vendor/bin/roave-infection-static-analysis-plugin -j2 --min-msi=100 --min-covered-msi=100 --ignore-msi-with-no-mutations --only-covered
50+
- name: Run infection
51+
run: vendor/bin/infection --threads=2 --ignore-msi-with-no-mutations --only-covered
6652
env:
6753
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

‎.github/workflows/static.yml

+9-20
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,27 @@ name: static analysis
2525
jobs:
2626
psalm:
2727
name: PHP ${{ matrix.php }}-${{ matrix.os }}
28+
2829
runs-on: ${{ matrix.os }}
30+
2931
strategy:
3032
matrix:
3133
os: [ 'ubuntu-latest' ]
32-
php: [ '8.2' ]
34+
php: [ '8.3', '8.4' ]
35+
3336
steps:
3437
- name: Checkout
3538
uses: actions/checkout@v3
3639

3740
- name: Install PHP with extensions
3841
uses: shivammathur/setup-php@v2
3942
with:
40-
ini-values: date.timezone='UTC'
41-
php-version: ${{ matrix.php }}
42-
tools: composer:v2
43-
44-
- name: Determine composer cache directory on Linux
45-
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
46-
47-
- name: Cache dependencies installed with composer
48-
uses: actions/cache@v3
49-
with:
50-
path: ${{ env.COMPOSER_CACHE_DIR }}
51-
key: php${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
52-
restore-keys: |
53-
php${{ matrix.php }}-composer-
54-
55-
- name: Update composer
56-
run: composer self-update
43+
php-version: "${{ matrix.php }}"
44+
ini-values: memory_limit=-1
45+
coverage: xdebug
5746

58-
- name: Install dependencies with composer
59-
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
47+
- name: Install Composer dependencies
48+
uses: ramsey/composer-install@v3
6049

6150
- name: Static analysis
6251
run: vendor/bin/psalm --config=psalm.xml --shepherd --stats --output-format=github --php-version=${{ matrix.php }}

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33

44
# PHPUnit
55
.phpunit.cache
6+
7+
# PHP CS Fixer
8+
/.php-cs-fixer.cache

‎.php-cs-fixer.dist.php

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use PhpCsFixer\Config;
6+
use PhpCsFixer\Finder;
7+
use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
8+
9+
$finder = (new Finder())->in([
10+
__DIR__ . '/src',
11+
__DIR__ . '/tests',
12+
]);
13+
14+
return (new Config())
15+
->setParallelConfig(ParallelConfigFactory::detect())
16+
->setRules([
17+
'@PER-CS2.0' => true,
18+
'no_unused_imports' => true,
19+
])
20+
->setFinder($finder);

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[![Latest Stable Version](https://poser.pugx.org/php-finance/double-entry/v)](https://packagist.org/packages/php-finance/double-entry)
44
[![Total Downloads](https://poser.pugx.org/php-finance/double-entry/downloads)](https://packagist.org/packages/php-finance/double-entry)
55
[![Build status](https://github.com/php-finance/double-entry/actions/workflows/build.yml/badge.svg)](https://github.com/php-finance/double-entry/actions/workflows/build.yml)
6+
[![Coverage Status](https://coveralls.io/repos/github/php-finance/double-entry/badge.svg)](https://coveralls.io/github/php-finance/double-entry)
67
[![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fphp-finance%2Fdouble-entry%2Fmaster)](https://dashboard.stryker-mutator.io/reports/github.com/php-finance/double-entry/master)
78
[![type-coverage](https://shepherd.dev/github/php-finance/double-entry/coverage.svg)](https://shepherd.dev/github/php-finance/double-entry)
89
[![static analysis](https://github.com/php-finance/double-entry/workflows/static%20analysis/badge.svg)](https://github.com/php-finance/double-entry/actions?query=workflow%3A%22static+analysis%22)

‎composer.json

+14-6
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,28 @@
1515
},
1616
"minimum-stability": "stable",
1717
"require": {
18-
"php": "^8.2",
18+
"php": "~8.3.0 || ~8.4.0",
1919
"ext-mbstring": "*",
20-
"brick/money": "^0.8.0"
20+
"brick/money": "^0.10.0"
2121
},
2222
"require-dev": {
23-
"maglnet/composer-require-checker": "^4.6",
24-
"phpunit/phpunit": "^10.2",
25-
"roave/infection-static-analysis-plugin": "^1.32",
26-
"vimeo/psalm": "^5.13"
23+
"friendsofphp/php-cs-fixer": "^3.69",
24+
"infection/infection": "^0.29.12",
25+
"maglnet/composer-require-checker": "^4.16.1",
26+
"phpunit/phpunit": "^12.0.3",
27+
"rector/rector": "^2.0",
28+
"vimeo/psalm": "^6.8"
2729
},
2830
"config": {
2931
"sort-packages": true,
32+
"bump-after-update": "dev",
3033
"allow-plugins": {
3134
"infection/extension-installer": false
3235
}
36+
},
37+
"scripts": {
38+
"php-cs-fixer": "php-cs-fixer fix",
39+
"infection": "infection --ignore-msi-with-no-mutations --only-covered",
40+
"rector": "rector"
3341
}
3442
}

‎infection.json.dist

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
"PhpFinance\\DoubleEntry\\Domain\\Transaction\\Transaction::getDate"
1515
]
1616
}
17-
}
17+
},
18+
"minCoveredMsi": 100
1819
}

‎phpunit.xml.dist

+19-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"
4-
bootstrap="vendor/autoload.php"
5-
cacheDirectory=".phpunit.cache"
6-
executionOrder="depends,defects"
7-
requireCoverageMetadata="false"
8-
beStrictAboutCoverageMetadata="true"
9-
beStrictAboutOutputDuringTests="true"
10-
failOnRisky="true"
11-
failOnWarning="true"
12-
colors="true"
2+
<phpunit
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd"
5+
bootstrap="vendor/autoload.php"
6+
cacheDirectory=".phpunit.cache"
7+
executionOrder="depends,defects"
8+
requireCoverageMetadata="false"
9+
beStrictAboutCoverageMetadata="true"
10+
beStrictAboutOutputDuringTests="true"
11+
failOnRisky="true"
12+
failOnWarning="true"
13+
colors="true"
14+
displayDetailsOnPhpunitDeprecations="true"
1315
>
16+
<php>
17+
<ini name="error_reporting" value="-1" />
18+
</php>
19+
1420
<testsuites>
15-
<testsuite name="default">
21+
<testsuite name="PHP Finance Double Entry tests">
1622
<directory>tests</directory>
1723
</testsuite>
1824
</testsuites>
1925

20-
<source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
26+
<source restrictNotices="true" restrictWarnings="true" ignoreIndirectDeprecations="true">
2127
<include>
2228
<directory suffix=".php">src</directory>
2329
</include>

‎psalm.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
99
>
1010
<projectFiles>
11-
<directory name="src"/>
12-
<ignoreFiles>
13-
<directory name="vendor"/>
14-
</ignoreFiles>
11+
<directory name="src" />
1512
</projectFiles>
1613
<issueHandlers>
1714
<MixedAssignment errorLevel="suppress" />

0 commit comments

Comments
 (0)