Skip to content

Commit

Permalink
Merge branch '9.x' into 9/symfony-72
Browse files Browse the repository at this point in the history
  • Loading branch information
crynobone authored Nov 22, 2024
2 parents a460c8c + f02e658 commit 36d87f3
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/collision-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
php:
- 8.2
- 8.3
- 8.4
experimental:
- false

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/parallel-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
php:
- 8.2
- 8.3
- 8.4
collision:
- "^8.0"
paratest:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/strict-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
- 8.3
- 8.4
phpunit:
- "~10.5.0"
- "~11.3.0"
- "~10.5.35"
- "~11.3.6"
- "~11.4.0"
experimental:
- false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
- 8.3
- 8.4
phpunit:
- "~10.5.0"
- "~11.3.0"
- "~10.5.35"
- "~11.3.6"
- "~11.4.0"
dependencies:
- "highest"
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
composer show -D
- name: Execute tests (with deprecations)
run: vendor/bin/phpunit
run: vendor/bin/phpunit --display-deprecations ${{ matrix.dependencies == 'highest' && '--fail-on-deprecation' || '' }}
env:
RAY_ENABLED: false
if: matrix.os != 'windows-latest'
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"symfony/polyfill-php84": "^1.31"
},
"require-dev": {
"fakerphp/faker": "^1.23",
"laravel/framework": "^11.34",
"fakerphp/faker": "^1.24",
"laravel/framework": "^11.33.2",
"laravel/pint": "^1.17",
"laravel/serializable-closure": "^1.3 || ^2.0",
"mockery/mockery": "^1.6.10",
Expand Down
11 changes: 9 additions & 2 deletions src/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@ function artisan(Contracts\TestCase|ApplicationContract $context, string $comman
*
* @param array<int, string>|string $command
* @param array<string, mixed>|string $env
* @param bool|null $tty
* @return \Symfony\Component\Process\Process
*/
function remote(array|string $command, array|string $env = []): Process
function remote(array|string $command, array|string $env = [], ?bool $tty = null): Process
{
$binary = \defined('TESTBENCH_DUSK') ? 'testbench-dusk' : 'testbench';

Expand All @@ -88,11 +89,17 @@ function remote(array|string $command, array|string $env = []): Process

Arr::add($env, 'TESTBENCH_PACKAGE_REMOTE', '(true)');

return Process::fromShellCommandline(
$process = Process::fromShellCommandline(
command: Arr::join([php_binary(true), $commander, ...Arr::wrap($command)], ' '),
cwd: package_path(),
env: array_merge(defined_environment_variables(), $env)
);

if (\is_bool($tty)) {
$process->setTty($tty);
}

return $process;
}

/**
Expand Down

0 comments on commit 36d87f3

Please sign in to comment.