Skip to content

Commit 43900bd

Browse files
bukkabukka
committed
Merge branch 'PHP-8.2' into PHP-8.3
2 parents ed40004 + 62682cb commit 43900bd

File tree

4 files changed

+156
-80
lines changed

4 files changed

+156
-80
lines changed

‎sapi/fpm/tests/logreader.inc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,11 @@ class LogReader
116116
*/
117117
public function printLogs(): void
118118
{
119+
if (empty($this->sources)) {
120+
return;
121+
}
119122
$hasMultipleDescriptors = count($this->sources) > 1;
120-
echo "LOGS:\n";
123+
echo "\nLOGS:\n";
121124
foreach ($this->sources as $name => $source) {
122125
if ($hasMultipleDescriptors) {
123126
echo ">>> source: $name\n";
@@ -128,6 +131,7 @@ class LogReader
128131
}
129132
$this->printSeparator();
130133
}
134+
echo "\n";
131135
}
132136

133137
/**
@@ -142,9 +146,8 @@ class LogReader
142146
if (is_null($errorMessage)) {
143147
return false;
144148
}
145-
echo "ERROR: " . $errorMessage . "\n\n";
149+
echo "ERROR: " . $errorMessage . "\n";
146150
$this->printLogs();
147-
echo "\n";
148151

149152
return false;
150153
}

‎sapi/fpm/tests/response.inc‎

Lines changed: 73 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,68 @@
22

33
namespace FPM;
44

5-
class Response
5+
abstract class BaseResponse
6+
{
7+
/**
8+
* Tester instance
9+
* @var Tester
10+
*/
11+
private Tester $tester;
12+
13+
/**
14+
* @var bool
15+
*/
16+
protected bool $debugOutputted = false;
17+
18+
/**
19+
* @param Tester $tester
20+
*/
21+
public function __construct(Tester $tester)
22+
{
23+
$this->tester = $tester;
24+
}
25+
26+
/**
27+
* Debug response output.
28+
*
29+
* @return void
30+
*/
31+
abstract function debugOutput(): void;
32+
33+
/**
34+
* Emit error message
35+
*
36+
* @param string $message
37+
* @param bool $throw
38+
*
39+
* @return bool
40+
* @throws \Exception
41+
*/
42+
protected function error(string $message, bool $throw = false): bool
43+
{
44+
$errorMessage = "ERROR: $message\n";
45+
if ($throw) {
46+
throw new \Exception($errorMessage);
47+
}
48+
if ( ! $this->debugOutputted) {
49+
$this->debugOutput();
50+
}
51+
echo $errorMessage;
52+
53+
$this->tester->printLogs();
54+
55+
return false;
56+
}
57+
}
58+
59+
class Response extends BaseResponse
660
{
761
const HEADER_SEPARATOR = "\r\n\r\n";
862

963
/**
1064
* @var array
1165
*/
12-
private $data;
66+
private array $data;
1367

1468
/**
1569
* @var string
@@ -39,19 +93,17 @@ class Response
3993
/**
4094
* @var bool
4195
*/
42-
private $expectInvalid;
43-
44-
/**
45-
* @var bool
46-
*/
47-
private bool $debugOutputted = false;
96+
private bool $expectInvalid;
4897

4998
/**
99+
* @param Tester $tester
50100
* @param string|array|null $data
51101
* @param bool $expectInvalid
52102
*/
53-
public function __construct($data = null, $expectInvalid = false)
103+
public function __construct(Tester $tester, $data = null, bool $expectInvalid = false)
54104
{
105+
parent::__construct($tester);
106+
55107
if ( ! is_array($data)) {
56108
$data = [
57109
'response' => $data,
@@ -105,7 +157,7 @@ class Response
105157
*
106158
* @return Response
107159
*/
108-
public function expectJsonBodyPatternForStatusProcessField(string $fieldName, string $pattern)
160+
public function expectJsonBodyPatternForStatusProcessField(string $fieldName, string $pattern): Response
109161
{
110162
$rawData = $this->getBody('application/json');
111163
$data = json_decode($rawData, true);
@@ -281,7 +333,7 @@ class Response
281333
/**
282334
* Debug response output
283335
*/
284-
public function debugOutput()
336+
public function debugOutput(): void
285337
{
286338
echo ">>> Response\n";
287339
echo "----------------- OUT -----------------\n";
@@ -442,37 +494,24 @@ class Response
442494
);
443495
}
444496
}
445-
446-
/**
447-
* Emit error message
448-
*
449-
* @param string $message
450-
*
451-
* @return bool
452-
*/
453-
private function error(string $message): bool
454-
{
455-
if ( ! $this->debugOutputted) {
456-
$this->debugOutput();
457-
}
458-
echo "ERROR: $message\n";
459-
460-
return false;
461-
}
462497
}
463498

464-
class ValuesResponse
499+
class ValuesResponse extends BaseResponse
465500
{
466501
/**
467502
* @var array
468503
*/
469504
private array $values;
470505

471506
/**
507+
* @param Tester $tester
472508
* @param string|array|null $values
509+
* @throws \Exception
473510
*/
474-
public function __construct($values = null)
511+
public function __construct(Tester $tester, $values = null)
475512
{
513+
parent::__construct($tester);
514+
476515
if ( ! is_array($values)) {
477516
if ( ! is_null($values) ) {
478517
$this->error('Invalid values supplied', true);
@@ -489,14 +528,15 @@ class ValuesResponse
489528
* @param string $name
490529
* @param mixed $value
491530
* @return ValuesResponse
531+
* @throws \Exception
492532
*/
493533
public function expectValue(string $name, $value = null)
494534
{
495535
if ( ! isset($this->values[$name])) {
496-
return $this->error("Value $name not found in values");
536+
$this->error("Value $name not found in values");
497537
}
498538
if ( ! is_null($value) && $value !== $this->values[$name]) {
499-
return $this->error("Value $name is {$this->values[$name]} but expected $value");
539+
$this->error("Value $name is {$this->values[$name]} but expected $value");
500540
}
501541
return $this;
502542
}
@@ -513,36 +553,12 @@ class ValuesResponse
513553

514554
/**
515555
* Debug output data.
516-
*
517-
* @return ValuesResponse
518556
*/
519-
public function debugOutput()
557+
public function debugOutput(): void
520558
{
521559
echo ">>> ValuesResponse\n";
522560
echo "----------------- Values -----------------\n";
523561
var_dump($this->values);
524562
echo "---------------------------------------\n\n";
525-
526-
return $this;
527-
}
528-
529-
/**
530-
* Emit error message
531-
*
532-
* @param string $message
533-
* @param bool $throw
534-
*
535-
* @return ValuesResponse
536-
*/
537-
private function error(string $message, $throw = false): bool
538-
{
539-
$errorMessage = "ERROR: $message\n";
540-
if ($throw) {
541-
throw new \Exception($errorMessage);
542-
}
543-
$this->debugOutput();
544-
echo $errorMessage;
545-
546-
return $this;
547563
}
548564
}

‎sapi/fpm/tests/status.inc‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,34 @@ class Status
3737
'slow requests' => '\d+',
3838
];
3939

40+
/**
41+
* @var Tester
42+
*/
43+
private Tester $tester;
44+
45+
/**
46+
* @param Tester $tester
47+
*/
48+
public function __construct(Tester $tester)
49+
{
50+
$this->tester = $tester;
51+
}
52+
53+
/**
54+
* @param string $body
55+
* @param string $pattern
56+
* @return void
57+
*/
58+
private function matchError(string $body, string $pattern): void
59+
{
60+
echo "ERROR: Expected body does not match pattern\n";
61+
echo "BODY:\n";
62+
var_dump($body);
63+
echo "PATTERN:\n";
64+
var_dump($pattern);
65+
$this->tester->printLogs();
66+
}
67+
4068
/**
4169
* Check status page.
4270
*
@@ -106,11 +134,7 @@ class Status
106134
$pattern .= $footer . ')';
107135

108136
if (!preg_match($pattern, $body)) {
109-
echo "ERROR: Expected body does not match pattern\n";
110-
echo "BODY:\n";
111-
var_dump($body);
112-
echo "PATTERN:\n";
113-
var_dump($pattern);
137+
$this->matchError($body, $pattern);
114138
}
115139
}
116140

@@ -245,11 +269,7 @@ class Status
245269
"# EOF)\n";
246270

247271
if (!preg_match($pattern, $body)) {
248-
echo "ERROR: Expected body does not match pattern\n";
249-
echo "BODY:\n";
250-
var_dump($body);
251-
echo "PATTERN:\n";
252-
var_dump($pattern);
272+
$this->matchError($body, $pattern);
253273
}
254274
}
255275
}

0 commit comments

Comments
 (0)