Skip to content

Commit 2c35971

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: [HttpFoundation] Make test pass without Xdebug. [Mime] Leverage PHP 8's detection of CSV files. [HttpFoundation] Make sure we reuse the current PHP binary for the webserver process in functional tests. [FrameworkBundle] TextDescriptor::formatControllerLink checked method… Fix CS [HttpClient] throw clearer error when no scheme is provided Fix github pr template and include 5.2 for bugfixes [HttpFoundation] Ignore stack trace printed by Xdebug 3. fix lexing backslashes in single quoted strings
2 parents 1e6e9e2 + d852399 commit 2c35971

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Tests/Fixtures/response-functional/cookie_max_age.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Warning: Expiry date cannot have a year greater than 9999 in %scookie_max_age.php on line 10
3-
3+
%A
44
Array
55
(
66
[0] => Content-Type: text/plain; charset=utf-8

Tests/ResponseFunctionalTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static function setUpBeforeClass(): void
2323
1 => ['file', '/dev/null', 'w'],
2424
2 => ['file', '/dev/null', 'w'],
2525
];
26-
if (!self::$server = @proc_open('exec php -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/response-functional')) {
26+
if (!self::$server = @proc_open('exec '.\PHP_BINARY.' -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/response-functional')) {
2727
self::markTestSkipped('PHP server unable to start.');
2828
}
2929
sleep(1);

Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static function setUpBeforeClass(): void
2323
1 => ['file', '/dev/null', 'w'],
2424
2 => ['file', '/dev/null', 'w'],
2525
];
26-
if (!self::$server = @proc_open('exec php -S localhost:8053', $spec, $pipes, __DIR__.'/Fixtures')) {
26+
if (!self::$server = @proc_open('exec '.\PHP_BINARY.' -S localhost:8053', $spec, $pipes, __DIR__.'/Fixtures')) {
2727
self::markTestSkipped('PHP server unable to start.');
2828
}
2929
sleep(1);

0 commit comments

Comments
 (0)