Skip to content

Commit

Permalink
Fix dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
veewee committed Sep 16, 2024
1 parent 60ac3f8 commit 1d283ab
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/grumphp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest, macos-latest] #windows-latest currently not working
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.2', '8.3']
composer-deps: ['highest', 'lowest']
composer-versions: ['composer:v2']
fail-fast: false
Expand Down Expand Up @@ -44,10 +44,10 @@ jobs:
restore-keys: ${{ runner.os }}-composer-
- name: Install dependencies (highest)
if: matrix.composer-deps == 'highest'
run: composer update --prefer-dist --no-progress --no-suggest
run: composer update --prefer-dist --no-progress
- name: Install dependencies (lowest)
if: matrix.composer-deps == 'lowest'
run: composer update --prefer-dist --no-progress --no-suggest --prefer-lowest
run: composer update --prefer-dist --no-progress --prefer-lowest
- name: Set git variables
run: |
git config --global user.email "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"require": {
"php": ">8.1",
"php": ">8.2",
"phpro/grumphp": "^2.8",
"symfony/process": "^7.0 || ^6.4"
},
Expand Down
3 changes: 3 additions & 0 deletions grumphp.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
grumphp:
tasks:
phpcsfixer:
config: .php-cs-fixer.php
config_contains_finder: true
phpunit:
coverage-php: cov/full.cov
clover_coverage:
Expand Down
11 changes: 7 additions & 4 deletions tests/fixtures/mock-phpcov.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
<?php

declare(strict_types=1);

$args = $_SERVER['argv'];
assert('merge' === $args[1]);
assert('--clover' === $args[2]);
assert('clover.xml' === $args[3]);
assert('php-coverage-dir' === $args[4]);
$assert = static fn (bool $predicate) => $predicate || throw new RuntimeException('Merging coverage failed');

$assert('merge' === $args[1]);
$assert('--clover' === $args[2]);
$assert('clover.xml' === $args[3]);
$assert('php-coverage-dir' === $args[4]);

exit(0);

0 comments on commit 1d283ab

Please sign in to comment.