From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 25 Nov 2020 15:07:56 +0000 (+0100)
Subject: Fix phpt reindentation in tidy script
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=367f8452c4e356bd7742ff369204af9869c2bb6a;p=php

Fix phpt reindentation in tidy script

This was missing adjacent SKIPIF/FILE/CLEAN sections.
---

diff --git a/scripts/dev/tidy.php b/scripts/dev/tidy.php
index 967f83bcb3..c7f6591e2f 100644
--- a/scripts/dev/tidy.php
+++ b/scripts/dev/tidy.php
@@ -126,9 +126,9 @@ function transformTestCode(string $code, callable $transformer): string {
     }
 
     return preg_replace_callback(
-        '/(--(?:FILE|SKIPIF|CLEAN)--)(.+?)(--[A-Z_]+--)/s',
+        '/(--(?:FILE|SKIPIF|CLEAN)--)(.+?)(?=--[A-Z_]+--)/s',
         function(array $matches) use($transformer) {
-            return $matches[1] . $transformer($matches[2]) . $matches[3];
+            return $matches[1] . $transformer($matches[2]);
         },
         $code
     );