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

support money 4.0, remove prophecy deprecation warnings #112

Merged
merged 9 commits into from
Jan 10, 2022
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
20 changes: 11 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ jobs:
strategy:
matrix:
php-version:
- '7.2'
- '7.3'
- '7.4'
- '8.0'
- '8.1'
Expand All @@ -31,6 +29,10 @@ jobs:
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Remove lock for older PHP
if: matrix.php-version == '7.4'
run: rm composer.lock

- name: Install dependencies
run: composer install

Expand All @@ -52,7 +54,7 @@ jobs:
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
frederikbosch marked this conversation as resolved.
Show resolved Hide resolved
coverage: none
tools: cs2pr

Expand All @@ -78,7 +80,7 @@ jobs:
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
coverage: none

- name: Cache composer dependencies
Expand All @@ -103,7 +105,7 @@ jobs:
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
coverage: pcov

- name: Cache composer dependencies
Expand All @@ -119,10 +121,10 @@ jobs:
- name: Code coverage
run: ./vendor/bin/phpunit --coverage-clover coverage-clover.xml

- name: Upload code coverage
run: |
curl -LO https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover coverage-clover.xml
- name: Upload Scrutinizer coverage
uses: sudo-bot/action-scrutinizer@latest
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change is totally fine with me, but I was curious if there are any advantages of using an action here ?

with:
cli-args: --format=php-clover coverage-clover.xml

release:
runs-on: ubuntu-latest
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
]
},
"require": {
"php": "^7.2 || ^8.0",
"php": "^7.4 || ^8.0",
"ext-dom": "*",
"ext-libxml": "*",
"ext-simplexml": "*",
"jschaedl/iban-validation": "^1.7",
"moneyphp/money": "^3.3"
"moneyphp/money": "^3.3 || ^4.0"
},
"autoload": {
"psr-4": {
Expand All @@ -37,6 +37,7 @@
"require-dev": {
"friendsofphp/php-cs-fixer": "@stable",
"phpstan/phpstan": "@stable",
"phpunit/phpunit": "@stable"
"phpunit/phpunit": "@stable",
"phpspec/prophecy-phpunit": "@stable"
}
}
Loading