Skip to content

Commit

Permalink
[10.x] Update Symfony and PHPUnit dependencies (#285)
Browse files Browse the repository at this point in the history
* [10.x] Update Symfony and PHPUnit dependencies

Laravel PR: laravel/framework#54019

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

* wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

---------

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
  • Loading branch information
crynobone authored Dec 26, 2024
1 parent 0bfa4b2 commit 73a9fb2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 36 deletions.
1 change: 0 additions & 1 deletion .github/workflows/strict-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
- 8.3
- 8.4
phpunit:
- "~10.5.35"
- "~11.3.6"
- "~11.4.0"
- "~11.5.0"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
- 8.3
- 8.4
phpunit:
- "~10.5.35"
- "~11.3.6"
- "~11.4.0"
- "~11.5.0"
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"laravel/serializable-closure": "^1.3 || ^2.0",
"mockery/mockery": "^1.6.10",
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^10.5.35 || ^11.3.6",
"symfony/process": "^7.0.3",
"symfony/yaml": "^7.0.3",
"phpunit/phpunit": "^11.3.6",
"symfony/process": "^7.2.0",
"symfony/yaml": "^7.2.0",
"vlucas/phpdotenv": "^5.6.1"
},
"conflict": {
Expand All @@ -59,7 +59,7 @@
"laravel/serializable-closure": "<1.3.0 || >=3.0.0",
"nunomaduro/collision": "<8.0.0 || >=9.0.0",
"orchestra/testbench-dusk": "<10.0.0 || >=11.0.0",
"phpunit/phpunit": "<10.5.35 || >=11.0.0 <11.3.6 || >=11.6.0"
"phpunit/phpunit": "<11.3.6 || >=11.6.0"
},
"suggest": {
"ext-pcntl": "Required to use all features of the console signal trapping.",
Expand Down
29 changes: 0 additions & 29 deletions src/Support/PhpExecutableFinder.php

This file was deleted.

3 changes: 2 additions & 1 deletion src/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Orchestra\Testbench\Foundation\Env;
use PHPUnit\Runner\Version;
use RuntimeException;
use Symfony\Component\Process\PhpExecutableFinder;
use Symfony\Component\Process\Process;

/**
Expand Down Expand Up @@ -462,7 +463,7 @@ function phpunit_version_compare(string $version, ?string $operator = null): int
*/
function php_binary(bool $escape = false): string
{
$phpBinary = (new Support\PhpExecutableFinder)->find(false) ?: 'php';
$phpBinary = (new PhpExecutableFinder)->find(false) ?: 'php';

return $escape === true ? ProcessUtils::escapeArgument((string) $phpBinary) : $phpBinary;
}
Expand Down

0 comments on commit 73a9fb2

Please sign in to comment.