clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3'

Browse Source
This commit is contained in:
Jakub Zelenka 2023-12-09 13:26:29 +00:00
commit 2ffd040ffd
No known key found for this signature in database
GPG Key ID: 1C0779DC5C0A9DE4
4 changed files with 156 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sapi/fpm/tests/logreader.inc
View File

@ -116,8 +116,11 @@ class LogReader
*/
public function printLogs(): void
{
if (empty($this->sources)) {
return;
}
$hasMultipleDescriptors = count($this->sources) > 1;
echo "LOGS:\n";
echo "\nLOGS:\n";
foreach ($this->sources as $name => $source) {
if ($hasMultipleDescriptors) {
echo ">>> source: $name\n";
@ -128,6 +131,7 @@ class LogReader
}
$this->printSeparator();
}
echo "\n";
}
/**
@ -142,9 +146,8 @@ class LogReader
if (is_null($errorMessage)) {
return false;
}
echo "ERROR: " . $errorMessage . "\n\n";
echo "ERROR: " . $errorMessage . "\n";
$this->printLogs();
echo "\n";
return false;
}

130
sapi/fpm/tests/response.inc
View File

@ -2,14 +2,68 @@
namespace FPM;
class Response
abstract class BaseResponse
{
/**
* Tester instance
* @var Tester
*/
private Tester $tester;
/**
* @var bool
*/
protected bool $debugOutputted = false;
/**
* @param Tester $tester
*/
public function __construct(Tester $tester)
{
$this->tester = $tester;
}
/**
* Debug response output.
*
* @return void
*/
abstract function debugOutput(): void;
/**
* Emit error message
*
* @param string $message
* @param bool $throw
*
* @return bool
* @throws \Exception
*/
protected function error(string $message, bool $throw = false): bool
{
$errorMessage = "ERROR: $message\n";
if ($throw) {
throw new \Exception($errorMessage);
}
if ( ! $this->debugOutputted) {
$this->debugOutput();
}
echo $errorMessage;
$this->tester->printLogs();
return false;
}
}
class Response extends BaseResponse
{
const HEADER_SEPARATOR = "\r\n\r\n";
/**
* @var array
*/
private $data;
private array $data;
/**
* @var string
@ -39,19 +93,17 @@ class Response
/**
* @var bool
*/
private $expectInvalid;
/**
* @var bool
*/
private bool $debugOutputted = false;
private bool $expectInvalid;
/**
* @param Tester $tester
* @param string|array|null $data
* @param bool $expectInvalid
*/
public function __construct($data = null, $expectInvalid = false)
public function __construct(Tester $tester, $data = null, bool $expectInvalid = false)
{
parent::__construct($tester);
if ( ! is_array($data)) {
$data = [
'response' => $data,
@ -105,7 +157,7 @@ class Response
*
* @return Response
*/
public function expectJsonBodyPatternForStatusProcessField(string $fieldName, string $pattern)
public function expectJsonBodyPatternForStatusProcessField(string $fieldName, string $pattern): Response
{
$rawData = $this->getBody('application/json');
$data = json_decode($rawData, true);
@ -281,7 +333,7 @@ class Response
/**
* Debug response output
*/
public function debugOutput()
public function debugOutput(): void
{
echo ">>> Response\n";
echo "----------------- OUT -----------------\n";
@ -442,26 +494,9 @@ class Response
);
}
}
/**
* Emit error message
*
* @param string $message
*
* @return bool
*/
private function error(string $message): bool
{
if ( ! $this->debugOutputted) {
$this->debugOutput();
}
echo "ERROR: $message\n";
return false;
}
}
class ValuesResponse
class ValuesResponse extends BaseResponse
{
/**
* @var array
@ -469,10 +504,14 @@ class ValuesResponse
private array $values;
/**
* @param Tester $tester
* @param string|array|null $values
* @throws \Exception
*/
public function __construct($values = null)
public function __construct(Tester $tester, $values = null)
{
parent::__construct($tester);
if ( ! is_array($values)) {
if ( ! is_null($values) ) {
$this->error('Invalid values supplied', true);
@ -489,14 +528,15 @@ class ValuesResponse
* @param string $name
* @param mixed $value
* @return ValuesResponse
* @throws \Exception
*/
public function expectValue(string $name, $value = null)
{
if ( ! isset($this->values[$name])) {
return $this->error("Value $name not found in values");
$this->error("Value $name not found in values");
}
if ( ! is_null($value) && $value !== $this->values[$name]) {
return $this->error("Value $name is {$this->values[$name]} but expected $value");
$this->error("Value $name is {$this->values[$name]} but expected $value");
}
return $this;
}
@ -513,36 +553,12 @@ class ValuesResponse
/**
* Debug output data.
*
* @return ValuesResponse
*/
public function debugOutput()
public function debugOutput(): void
{
echo ">>> ValuesResponse\n";
echo "----------------- Values -----------------\n";
var_dump($this->values);
echo "---------------------------------------\n\n";
return $this;
}
/**
* Emit error message
*
* @param string $message
* @param bool $throw
*
* @return ValuesResponse
*/
private function error(string $message, $throw = false): bool
{
$errorMessage = "ERROR: $message\n";
if ($throw) {
throw new \Exception($errorMessage);
}
$this->debugOutput();
echo $errorMessage;
return $this;
}
}

40
sapi/fpm/tests/status.inc
View File

@ -37,6 +37,34 @@ class Status
'slow requests' => '\d+',
];
/**
* @var Tester
*/
private Tester $tester;
/**
* @param Tester $tester
*/
public function __construct(Tester $tester)
{
$this->tester = $tester;
}
/**
* @param string $body
* @param string $pattern
* @return void
*/
private function matchError(string $body, string $pattern): void
{
echo "ERROR: Expected body does not match pattern\n";
echo "BODY:\n";
var_dump($body);
echo "PATTERN:\n";
var_dump($pattern);
$this->tester->printLogs();
}
/**
* Check status page.
*
@ -106,11 +134,7 @@ class Status
$pattern .= $footer . ')';
if (!preg_match($pattern, $body)) {
echo "ERROR: Expected body does not match pattern\n";
echo "BODY:\n";
var_dump($body);
echo "PATTERN:\n";
var_dump($pattern);
$this->matchError($body, $pattern);
}
}
@ -245,11 +269,7 @@ class Status
"# EOF)\n";
if (!preg_match($pattern, $body)) {
echo "ERROR: Expected body does not match pattern\n";
echo "BODY:\n";
var_dump($body);
echo "PATTERN:\n";
var_dump($pattern);
$this->matchError($body, $pattern);
}
}
}

57
sapi/fpm/tests/tester.inc
View File

@ -672,7 +672,7 @@ class Tester
}
require_once "status.inc";
$status = new Status();
$status = new Status($this);
foreach ($formats as $format) {
$query = $format === 'plain' ? '' : $format;
$response = $this->request($query, [], $statusPath, $address);
@ -838,7 +838,7 @@ class Tester
int $writeDelay = 0,
): Response {
if ($this->hasError()) {
return new Response(null, true);
return $this->createResponse(expectInvalid: true);
}
if (is_array($stdin)) {
@ -849,7 +849,7 @@ class Tester
$this->trace('Request params', $params);
try {
$this->response = new Response(
$this->response = $this->createResponse(
$this->getClient($address, $connKeepAlive, $socketKeepAlive)
->request_data($params, $stdin, $readLimit, $writeDelay)
);
@ -866,7 +866,7 @@ class Tester
} else {
$this->message($errorMessage);
}
$this->response = new Response();
$this->response = $this->createResponse();
}
if ($this->debug) {
$this->response->debugOutput();
@ -905,7 +905,7 @@ class Tester
}
if ($this->hasError()) {
return array_map(fn($request) => new Response(null, true), $requests);
return array_map(fn($request) => $this->createResponse(expectInvalid: true), $requests);
}
try {
@ -931,7 +931,9 @@ class Tester
);
$responses = array_map(function ($conn) use ($readTimeout) {
$response = new Response($conn['client']->wait_for_response_data($conn['requestId'], $readTimeout));
$response = $this->createResponse(
$conn['client']->wait_for_response_data($conn['requestId'], $readTimeout)
);
if ($this->debug) {
$response->debugOutput();
}
@ -948,7 +950,7 @@ class Tester
$this->message($errorMessage);
}
return array_map(fn($request) => new Response(null, true), $requests);
return array_map(fn($request) => $this->createResponse(expectInvalid: true), $requests);
}
}
@ -968,11 +970,11 @@ class Tester
bool $socketKeepAlive = false
): ValuesResponse {
if ($this->hasError()) {
return new Response(null, true);
return $this->createValueResponse();
}
try {
$valueResponse = new ValuesResponse(
$valueResponse = $this->createValueResponse(
$this->getClient($address, $connKeepAlive)->getValues(['FCGI_MPXS_CONNS'])
);
if ($this->debug) {
@ -980,7 +982,7 @@ class Tester
}
} catch (\Exception $exception) {
$this->error("Request for getting values failed", $exception);
$valueResponse = new ValuesResponse();
$valueResponse = $this->createValueResponse();
}
return $valueResponse;
@ -1492,6 +1494,30 @@ class Tester
return [$sourceFile, '/' . basename($sourceFile)];
}
/**
* Create a new response.
*
* @param mixed $data
* @param bool $expectInvalid
* @return Response
*/
private function createResponse($data = null, bool $expectInvalid = false): Response
{
return new Response($this, $data, $expectInvalid);
}
/**
* Create a new values response.
*
* @param mixed $values
* @return ValuesResponse
* @throws \Exception
*/
private function createValueResponse($values = null): ValuesResponse
{
return new ValuesResponse($this, $values);
}
/**
* @param string|null $msg
*/
@ -1502,6 +1528,16 @@ class Tester
}
}
/**
* Print log reader logs.
*
* @return void
*/
public function printLogs(): void
{
$this->logReader->printLogs();
}
/**
* Display error.
*
@ -1520,6 +1556,7 @@ class Tester
$this->error .= "\n";
echo $this->error;
$this->printLogs();
return false;
}