Skip to content

Commit

Permalink
Merge branch 'main' into eiriksm-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
eiriksm authored Sep 11, 2024
2 parents 5bed579 + 8ca437b commit 49afc76
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ jobs:
- name: Install dependencies
run: composer --verbose install

- name: Run phpstan
if: matrix.php-version != 7.0
run: composer phpstan

- name: Run tests
run: composer test
env:
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
}
},
"require": {
"symfony/process": "^4.0 || ^5.4",
"violinist-dev/process-factory": "^2.0",
"violinist-dev/process-factory": "^3.0",
"violinist-dev/composer-lock-data": "^1.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/ProcessFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ProcessFactory implements ProcessFactoryInterface
/**
* {@inheritdoc}
*/
public function getProcess(array $commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = null)
public function getProcess(array $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60)
{
return new Process($commandline, $cwd, $env, $input, $timeout);
return new Process($command, $cwd, $env, $input, $timeout);
}
}

0 comments on commit 49afc76

Please sign in to comment.