Commit: 48687fe70e2a2001d9e542e7fa1cc475b19f9689
Author: Sara Golemon <poll...@php.net> Fri, 24 Aug 2018 20:03:27
-0400
Parents: 2f721ce62a302e7506a68191114247973ca88af6
Branches: master
Link:
http://git.php.net/?p=web/qa.git;a=commitdiff;h=48687fe70e2a2001d9e542e7fa1cc475b19f9689
Log:
Refactor build.php
Changed paths:
M build.php
diff --git a/build.php b/build.php
index 54e97cb..9c58912 100755
--- a/build.php
+++ b/build.php
@@ -1,117 +1,106 @@
-<?php
-
-define('BASE_REPORT_DIR', dirname($_SERVER['SCRIPT_FILENAME'])."/reports/db/");
-
-$branch = $_GET['branch'];
-$revision = $_GET['revision'];
-if (substr($branch, 0, 3)!='PHP') {
- $branch = "PHP_5_6";
-}
-if (substr($revision, 0, 1)!='r' and strpos($revision, ".")===FALSE) {
- $revision = "";
-}
-
-
-
-include("include/functions.php");
-
-$TITLE = htmlentities("PHP: QA: PFTT: $branch: $revision");
-$SITE_UPDATE = date("D M d H:i:s Y T", filectime(__FILE__));
-/* $Id$ */
-
-common_header(NULL, $TITLE);
-
-$branchHTML = htmlentities($branch);
-$branchURL = urlencode($branch);
-$revisionHTML = htmlentities($revision);
-$revisionURL = urlencode($revision);
-
-?>
-<h1><a href="list_builds.php?branch=<?php echo $branchURL; ?>">
-<?php echo $branchHTML; ?></a> <?php echo $revisionHTML; ?></h1>
-
-<h2>Summary</h2>
-
-<table>
- <tr>
- <td><?php echo $branchHTML; ?> <?php echo $revisionHTML; ?>
</td>
- </tr>
-</table>
-
-<br/>
-
-<h2>Comparison Reports</h2>
-
-<table>
- <tr>
- <td><strong>PHPT</strong> <a href="howto_phpt.php"
target="_blank">How to</a></td>
- </tr>
- <?php
-foreach ( scandir(BASE_REPORT_DIR."/$branch/$revision") as $report ) {
- if (substr($report, 0, 4)=="PHPT" &&
is_file(BASE_REPORT_DIR."/$branch/$revision/$report")) {
- $report_name = $report;
- if (substr($report_name, strlen($report_name)-5, 5)==".html")
- $report_name = substr($report_name, 0, strlen($report_name)-5);
-
- $has_fails_crashes = is_file("$report_name.txt");
-
- ?>
- <tr<?php if ($has_fails_crashes) { echo ' style="background:#ff0000"';
} ?>>
- <td>with <a href="/reports/db/<?php echo $branchURL; ?>/<?php
echo $revisionURL; ?>/<?php echo urlencode($report); ?>" target="_blank"><?php
echo htmlentities($report_name); ?></a></td>
- </tr>
- <?php
-
- } // end if
-}
-
- ?>
-</table>
-<br/>
-<table>
- <tr>
- <td><strong>PhpUnit</strong> <a href="howto_phpunit.php"
target="_blank">How to</a></td>
- </tr>
- <?php
-
-foreach ( scandir(BASE_REPORT_DIR."/$branch/$revision") as $report ) {
- if (substr($report, 0, 7)=="PhpUnit" &&
is_file(BASE_REPORT_DIR."/$branch/$revision/$report")) {
- $report_name = $report;
- if (substr($report_name, strlen($report_name)-5, 5)==".html")
- $report_name = substr($report_name, 0, strlen($report_name)-5);
-
- ?>
- <tr>
- <td>with <a href="/reports/db/<?php echo $branchURL; ?>/<?php
echo $revisionURL; ?>/<?php echo urlencode($report); ?>" target="_blank"><?php
echo htmlentities($report_name); ?></a></td>
- </tr>
- <?php
-
- } // end if
-}
-
-?>
-</table>
-<br/>
-<h2>Abbreviations</h2>
-<p><b>NTS</b> - Non-Thread Safe build, use for CLI or IIS (PHP on Windows uses
2 types of builds, TS and NTS)</p>
-<p><b>TS</b> - Thread Safe build, use for CLI or Apache mod_php on Windows</p>
-<p><b>VC11</b> - Build compiled using VC11 (Visual Studio 2012)</p>
-<p><b>VC9</b> - Build compiled using VC9 (Visual Studio 2008)</p>
-<p><b>GCC</b> - Build compiled using GCC</p>
-<br/>
-<h2>Common Scenario Sets</h2>
-<p><b>Local-FileSystem_MySQL_Apache-ModPHP-ApacheLounge-2.4.4-VC9-OpenSS</b> -
Tests run on local file system, using Apache with MySQL</p>
-<p><b>Local-FileSystem_MySQL_CLI</b> - Tests run on local file system on CLI
with MySQL</p>
-<p><b>Opcache_Local-FileSystem_MySQL_Apache-ModPHP-ApacheLounge-2</b> - Tests
run on local file system, using Apache with Opcache, MySQL</p>
-<p><b>Opcache_Local-FileSystem_MySQL_CLI</b> - Tests run on local file system
on CLI with MySQL</p>
-<p><b>Opcache_Local-FileSystem_MySQL_CLI_WinCacheU</b> - Tests run on local
file system on CLI with Opcache, MySQL and WinCache (user & file caches)</p>
-<p><b>SMB-DFS_MySQL_Apache-ModPHP-ApacheLounge-2.4.4-VC9-OpenSS</b> - Tests
run on remote DFS file system, using Apache with MySQL</p>
-<p><b>SMB-DFS_MySQL_CLI</b> - Tests run on remote DFS file system on CLI with
MySQL</p>
-<p><b>Opcache_SMB-DFS_MySQL_Apache-ModPHP-ApacheLounge-2</b> - Tests run on
remote DFS file system, using Apache with Opcache, MySQL</p>
-<p><b>Opcache_SMB-DFS_MySQL_CLI</b> - Tests run on remote DFS file system on
CLI with MySQL</p>
-<p><b>Opcache_SMB-DFS_MySQL_CLI_WinCacheU</b> - Tests run on remote DFS file
system on CLI with Opcache, MySQL and WinCache (user & file caches)</p>
-
-<?php
-
-common_footer();
-
-?>
+<?php
+
+$branch = $_GET['branch'] ?? '';
+if ((substr($branch, 0, 3) !== 'PHP') || strpbrk($branch, './\\') !== false) {
+ $branch = "PHP_5_6";
+}
+
+$revision = $_GET['revision'] ?? '';
+if ((substr($revision, 0, 1)!='r') && (strpos($revision, ".") === false)) {
+ // $revision may be an svn ID (i.e. r12345),
+ // or a release version (i.e 7.2.9)
+ $revision = '';
+}
+if (strpbrk($revision, '/\\') !== false) {
+ // Lightweight directory traversal guard
+ $revision = '';
+}
+
+include("include/functions.php");
+
+$TITLE = htmlentities("PHP: QA: PFTT: $branch: $revision");
+$SITE_UPDATE = date("D M d H:i:s Y T", filectime(__FILE__));
+/* $Id$ */
+
+common_header(NULL, $TITLE);
+
+echo '<h1><a href="list_builds.php?branch=', urlencode($branch), '">',
+ htmlentities($branch), '</a>', htmlentities($revision), "</h1>\n";
+
+echo "<h2>Summary</h2>\n";
+echo '<table><tr><td>',
+ htmlentities($branch), ' ', htmlentities($revision),
+ "</td></tr></table>\n";
+echo "<br/>\n";
+echo "<h2>Comparison Reports</h2>\n";
+
+outputReportTable('PHPT', $branch, $revision);
+outputReportTable('PhpUnit', $branch, $revision);
+
+?>
+
+<h2>Abbreviations</h2>
+<p><b>NTS</b> - Non-Thread Safe build, use for CLI or IIS (PHP on Windows uses
2 types of builds, TS and NTS)</p>
+<p><b>TS</b> - Thread Safe build, use for CLI or Apache mod_php on Windows</p>
+<p><b>VC11</b> - Build compiled using VC11 (Visual Studio 2012)</p>
+<p><b>VC9</b> - Build compiled using VC9 (Visual Studio 2008)</p>
+<p><b>GCC</b> - Build compiled using GCC</p>
+<br/>
+<h2>Common Scenario Sets</h2>
+<p><b>Local-FileSystem_MySQL_Apache-ModPHP-ApacheLounge-2.4.4-VC9-OpenSS</b> -
Tests run on local file system, using Apache with MySQL</p>
+<p><b>Local-FileSystem_MySQL_CLI</b> - Tests run on local file system on CLI
with MySQL</p>
+<p><b>Opcache_Local-FileSystem_MySQL_Apache-ModPHP-ApacheLounge-2</b> - Tests
run on local file system, using Apache with Opcache, MySQL</p>
+<p><b>Opcache_Local-FileSystem_MySQL_CLI</b> - Tests run on local file system
on CLI with MySQL</p>
+<p><b>Opcache_Local-FileSystem_MySQL_CLI_WinCacheU</b> - Tests run on local
file system on CLI with Opcache, MySQL and WinCache (user & file caches)</p>
+<p><b>SMB-DFS_MySQL_Apache-ModPHP-ApacheLounge-2.4.4-VC9-OpenSS</b> - Tests
run on remote DFS file system, using Apache with MySQL</p>
+<p><b>SMB-DFS_MySQL_CLI</b> - Tests run on remote DFS file system on CLI with
MySQL</p>
+<p><b>Opcache_SMB-DFS_MySQL_Apache-ModPHP-ApacheLounge-2</b> - Tests run on
remote DFS file system, using Apache with Opcache, MySQL</p>
+<p><b>Opcache_SMB-DFS_MySQL_CLI</b> - Tests run on remote DFS file system on
CLI with MySQL</p>
+<p><b>Opcache_SMB-DFS_MySQL_CLI_WinCacheU</b> - Tests run on remote DFS file
system on CLI with Opcache, MySQL and WinCache (user & file caches)</p>
+
+<?php
+
+common_footer();
+
+// Generator function to ennumerate structured data from reports/db
+function genReports(string $type, string $branch, string $revision) {
+ $dir = __DIR__ . "/reports/db/$branch/$revision/";
+ if (!is_dir($dir)) { return; }
+
+ $baseURL = '/reports/db/' . urlencode($branch) . '/' .
urlencode($revision) . '/';
+
+ foreach (scandir($dir) as $report) {
+ if (!strncmp($report, $type, strlen($type)) &&
+ is_file("$dir/$report")) {
+ $reportName = $report;
+ if (substr($reportName, -5) === '.html') {
+ $reportName = substr($reportName, 0, -5);
+ }
+
+ yield [
+ 'url' => $baseURL . urlencode($report),
+ 'name' => $reportName,
+ 'has_fails_crashes' =>
file_exists("$dir/$reportName.txt"),
+ ];
+ }
+ }
+}
+
+function outputReportTable(string $type, string $branch, string $revision) {
+ echo "<table>\n";
+ echo '<tr><td><strong>', htmlentities($type, ENT_QUOTES), '</strong> ',
+ '<a href="howto_', urlencode(strtolower($type)), '.php"
target="_blank">How to</a>',
+ "</td></tr>\n";
+ foreach (genReports($type, $branch, $revision) as $report) {
+ $url = htmlentities($report['url'], ENT_QUOTES);
+ $name = htmlentities($report['name'], ENT_QUOTES);
+ $style = '';
+ if ($report['has_fails_crashes']) {
+ $style = ' style="background:#ff0000"';
+ }
+ echo "<tr{$style}><td>with <a href=\"$url\"
target=\"_blank\">$name</a></td></tr>\n";
+ }
+ echo "</table>\n";
+ echo "<br/>\n";
+}
+
