Add CONFLICTS to recognized sections

nikic · nikic · commit 3fa9f9cfae2c · 2019-07-10T13:09:06.000+02:00
It does nothing on 7.3, but this makes it easier to write tests in
3rd party extensions.
diff --git a/run-tests.php b/run-tests.php
@@ -1324,7 +1324,7 @@ function run_test($php, $file, $env)
 				'CAPTURE_STDIO', 'STDIN', 'CGI', 'PHPDBG',
 				'INI', 'ENV', 'EXTENSIONS',
 				'SKIPIF', 'XFAIL', 'CLEAN',
-				'CREDITS', 'DESCRIPTION',
+				'CREDITS', 'DESCRIPTION', 'CONFLICTS',
 			))) {
 				$bork_info = 'Unknown section "' . $section . '"';
 			}

Original file line number	Diff line number	Diff line change
`@@ -1324,7 +1324,7 @@ function run_test($php, $file, $env)`
`1324`	`1324`	`'CAPTURE_STDIO', 'STDIN', 'CGI', 'PHPDBG',`
`1325`	`1325`	`'INI', 'ENV', 'EXTENSIONS',`
`1326`	`1326`	`'SKIPIF', 'XFAIL', 'CLEAN',`
`1327`		`- 'CREDITS', 'DESCRIPTION',`
	`1327`	`+ 'CREDITS', 'DESCRIPTION', 'CONFLICTS',`
`1328`	`1328`	`))) {`
`1329`	`1329`	`$bork_info = 'Unknown section "' . $section . '"';`
`1330`	`1330`	`}`