Add support for PCRE n modifier

Felipe Pena · nikic · commit e089a50f53c8 · 2021-11-03T15:17:54.000+01:00
Add support for /n (NO_AUTO_CAPTURE) modifier, which makes simple `(xyz)` groups non-capturing. Closes GH-7583.
diff --git a/UPGRADING b/UPGRADING
@@ -27,6 +27,13 @@ PHP 8.2 UPGRADE NOTES
   . Added CURLINFO_EFFECTIVE_METHOD option and returning the effective
     HTTP method in curl_getinfo() return value.
 
+- PCRE:
+  . Added support for the "n" (NO_AUTO_CAPTURE) modifier, which makes simple
+    `(xyz)` groups non-capturing. Only named groups like `(?<name>xyz)` are
+    capturing. This only affects which groups are capturing, it is still
+    possible to use numbered subpattern references, and the matches array will
+    still contain numbered results.
+
 ========================================
 3. Changes in SAPI modules
 ========================================
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
@@ -734,6 +734,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 			/* Perl compatible options */
 			case 'i':	coptions |= PCRE2_CASELESS;		break;
 			case 'm':	coptions |= PCRE2_MULTILINE;		break;
+			case 'n':	coptions |= PCRE2_NO_AUTO_CAPTURE;	break;
 			case 's':	coptions |= PCRE2_DOTALL;		break;
 			case 'x':	coptions |= PCRE2_EXTENDED;		break;
 
diff --git a/ext/pcre/tests/preg_match_non_capture.phpt b/ext/pcre/tests/preg_match_non_capture.phpt
@@ -0,0 +1,25 @@
+--TEST--
+testing /n modifier in preg_match()
+--FILE--
+<?php
+
+preg_match('/.(.)./n', 'abc', $m);
+var_dump($m);
+
+preg_match('/.(?P<test>.)./n', 'abc', $m);
+var_dump($m);
+
+?>
+--EXPECT--
+array(1) {
+  [0]=>
+  string(3) "abc"
+}
+array(3) {
+  [0]=>
+  string(3) "abc"
+  ["test"]=>
+  string(1) "b"
+  [1]=>
+  string(1) "b"
+}
