PhpSubprocess: Add flag PREG_OFFSET_CAPTURE to preg_match to identify the offset

M-arcus · nicolas-grekas · commit 6fd79ab51c83 · 2024-09-11T09:50:33.000+02:00
diff --git a/PhpSubprocess.php b/PhpSubprocess.php
@@ -106,7 +106,7 @@ private function writeTmpIni(array $iniFiles, string $tmpDir): string
                 throw new RuntimeException('Unable to read ini: '.$file);
             }
             // Check and remove directives after HOST and PATH sections
-            if (preg_match('/^\s*\[(?:PATH|HOST)\s*=/mi', $data, $matches)) {
+            if (preg_match('/^\s*\[(?:PATH|HOST)\s*=/mi', $data, $matches, \PREG_OFFSET_CAPTURE)) {
                 $data = substr($data, 0, $matches[0][1]);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private function writeTmpIni(array $iniFiles, string $tmpDir): string`
`106`	`106`	`throw new RuntimeException('Unable to read ini: '.$file);`
`107`	`107`	`}`
`108`	`108`	`// Check and remove directives after HOST and PATH sections`
`109`		`- if (preg_match('/^\s\[(?:PATH\|HOST)\s=/mi', $data, $matches)) {`
	`109`	`+ if (preg_match('/^\s\[(?:PATH\|HOST)\s=/mi', $data, $matches, \PREG_OFFSET_CAPTURE)) {`
`110`	`110`	`$data = substr($data, 0, $matches[0][1]);`
`111`	`111`	`}`
`112`	`112`