Skip to content

Commit 2755171

Browse files
Merge branch '7.4' into 8.0
* 7.4: skip legacy extractor test with symfony/property-info 8.0+ chore: heredoc indentation as of PHP 7.3 [Actions] remove dead code from integration-test We can always revisit later if needed.From 2021 its there and not in use
2 parents 4baf81e + 3c2c957 commit 2755171

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

OptionsResolver.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,28 +1183,28 @@ private function verifyTypes(string $type, mixed $value, ?array &$invalidTypes =
11831183
private function splitOutsideParenthesis(string $type): array
11841184
{
11851185
return preg_split(<<<'EOF'
1186-
/
1187-
# Define a recursive subroutine for matching balanced parentheses
1188-
(?(DEFINE)
1189-
(?<balanced>
1190-
\( # Match an opening parenthesis
1191-
(?: # Start a non-capturing group for the contents
1192-
[^()] # Match any character that is not a parenthesis
1193-
| # OR
1194-
(?&balanced) # Recursively match a nested balanced group
1195-
)* # Repeat the group for all contents
1196-
\) # Match the final closing parenthesis
1186+
/
1187+
# Define a recursive subroutine for matching balanced parentheses
1188+
(?(DEFINE)
1189+
(?<balanced>
1190+
\( # Match an opening parenthesis
1191+
(?: # Start a non-capturing group for the contents
1192+
[^()] # Match any character that is not a parenthesis
1193+
| # OR
1194+
(?&balanced) # Recursively match a nested balanced group
1195+
)* # Repeat the group for all contents
1196+
\) # Match the final closing parenthesis
1197+
)
11971198
)
1198-
)
11991199
1200-
# Match any balanced parenthetical group, then skip it
1201-
(?&balanced)(*SKIP)(*FAIL) # Use the defined subroutine and discard the match
1200+
# Match any balanced parenthetical group, then skip it
1201+
(?&balanced)(*SKIP)(*FAIL) # Use the defined subroutine and discard the match
12021202
1203-
| # OR
1203+
| # OR
12041204
1205-
\| # Match the pipe delimiter (only if not inside a skipped group)
1206-
/x
1207-
EOF, $type);
1205+
\| # Match the pipe delimiter (only if not inside a skipped group)
1206+
/x
1207+
EOF, $type);
12081208
}
12091209

12101210
/**

0 commit comments

Comments
 (0)