Skip to content

Declare missing types and other minor improvements in run-tests.php #12573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 31, 2023
Merged

Declare missing types and other minor improvements in run-tests.php #12573

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f83ce3
refactor: declare missing types and other minor improvements.
marcosmarcolin Oct 30, 2023
697923c
refactor: declare missing types and other minor improvements.
marcosmarcolin Oct 30, 2023
afa3fdb
refactor: declare missing types and other minor improvements.
marcosmarcolin Oct 30, 2023
95d19bc
refactor: declare missing types and other minor improvements.
marcosmarcolin Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions run-tests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

/* Temporary variables while this file is being refactored. */
/** @var ?JUnit */
/** @var ?JUnit $junit */
$junit = null;

/* End temporary variables. */
Expand Down Expand Up @@ -143,6 +143,7 @@ function show_usage(): void
* This is the entry point and exit point überfunction. It contains all the
* code that was previously found at the top level. It could and should be
* refactored to be smaller and more manageable.
* @throws Exception
*/
function main(): void
{
Expand All @@ -166,7 +167,7 @@ function main(): void
global $context_line_count;

// Temporary for the duration of refactoring
/** @var JUnit */
/** @var JUnit $junit */
global $junit;

define('IS_WINDOWS', substr(PHP_OS, 0, 3) == "WIN");
Expand Down Expand Up @@ -465,7 +466,6 @@ function main(): void
case 'g':
$SHOW_ONLY_GROUPS = explode(",", $argv[++$i]);
break;
//case 'h'
case '--keep-all':
foreach ($cfgfiles as $file) {
$cfg['keep'][$file] = true;
Expand Down Expand Up @@ -1825,6 +1825,7 @@ function skip_test(string $tested, string $tested_file, string $shortname, strin
//
/**
* @param string|array $file
* @throws Exception
*/
function run_test(string $php, $file, array $env): string
{
Expand All @@ -1842,7 +1843,7 @@ function run_test(string $php, $file, array $env): string
global $show_progress;

// Temporary
/** @var JUnit */
/** @var JUnit $junit */
global $junit;

static $skipCache;
Expand Down Expand Up @@ -3354,9 +3355,8 @@ public function saveXML(): void
fwrite($this->fp, $xml);
}

private function getSuitesXML(string $suite_name = ''): string
private function getSuitesXML(): string
{
// FIXME: $suite_name gets overwritten
$result = '';

foreach ($this->suites as $suite_name => $suite) {
Expand Down Expand Up @@ -3649,10 +3649,10 @@ public function getExtensions(string $php): array

class RuntestsValgrind
{
protected $version = '';
protected $header = '';
protected $version_3_8_0 = false;
protected $tool = null;
protected string $version = '';
protected string $header = '';
protected bool $version_3_8_0 = false;
protected string $tool = '';

public function getHeader(): string
{
Expand All @@ -3665,17 +3665,17 @@ public function __construct(array $environment, string $tool = 'memcheck')
$header = system_with_timeout("valgrind --tool={$this->tool} --version", $environment);
if (!$header) {
error("Valgrind returned no version info for {$this->tool}, cannot proceed.\n".
"Please check if Valgrind is installed and the tool is named correctly.");
"Please check if Valgrind is installed and the tool is named correctly.");
}
$count = 0;
$version = preg_replace("/valgrind-(\d+)\.(\d+)\.(\d+)([.\w_-]+)?(\s+)/", '$1.$2.$3', $header, 1, $count);
if ($count != 1) {
error("Valgrind returned invalid version info (\"{$header}\") for {$this->tool}, cannot proceed.");
}
$this->version = $version;
$this->version = (string) $version;
$this->header = sprintf(
"%s (%s)", trim($header), $this->tool);
$this->version_3_8_0 = version_compare($version, '3.8.0', '>=');
$this->version_3_8_0 = (bool) version_compare($version, '3.8.0', '>=');
}

public function wrapCommand(string $cmd, string $memcheck_filename, bool $check_all): string
Expand Down Expand Up @@ -3753,6 +3753,9 @@ public function getSection(string $name): string
return $this->sections[$name];
}

/**
* @throws Exception
*/
public function getName(): string
{
return trim($this->getSection('TEST'));
Expand Down Expand Up @@ -3846,6 +3849,7 @@ private function readFile(): void

/**
* @throws BorkageException
* @throws Exception
*/
private function validateAndProcess(bool $inRedirect): void
{
Expand Down Expand Up @@ -4193,4 +4197,8 @@ public function getDiff(array $diffs): string
}
}

main();
try {
main();
}catch (Exception $exception){
error($exception->getMessage());
}