fixes in f$preg_split

Shamzik · Shamzik · commit 36a4b888cb38 · 2025-11-26T12:06:31.000+03:00
diff --git a/runtime-light/stdlib/string/regex-functions.cpp b/runtime-light/stdlib/string/regex-functions.cpp
@@ -1029,11 +1029,11 @@ Optional<array<mixed>> f$preg_split(const string& pattern, const string& subject
   if (!compile_regex(regex_info)) {
     return false;
   }
-  auto output = split_regex(regex_info, limit, (flags & kphp::regex::PREG_SPLIT_NO_EMPTY) != 0, (flags & kphp::regex::PREG_SPLIT_DELIM_CAPTURE) != 0,
-                            (flags & kphp::regex::PREG_SPLIT_OFFSET_CAPTURE) != 0);
+  auto output{split_regex(regex_info, limit, (flags & kphp::regex::PREG_SPLIT_NO_EMPTY) != 0, (flags & kphp::regex::PREG_SPLIT_DELIM_CAPTURE) != 0,
+                          (flags & kphp::regex::PREG_SPLIT_OFFSET_CAPTURE) != 0)};
   if (!output.has_value()) [[unlikely]] {
     return false;
   }
 
-  return *output;
+  return *std::move(output);
 }

Original file line number	Diff line number	Diff line change
`@@ -1029,11 +1029,11 @@ Optional<array<mixed>> f$preg_split(const string& pattern, const string& subject`
`1029`	`1029`	`if (!compile_regex(regex_info)) {`
`1030`	`1030`	`return false;`
`1031`	`1031`	`}`
`1032`		`- auto output = split_regex(regex_info, limit, (flags & kphp::regex::PREG_SPLIT_NO_EMPTY) != 0, (flags & kphp::regex::PREG_SPLIT_DELIM_CAPTURE) != 0,`
`1033`		`- (flags & kphp::regex::PREG_SPLIT_OFFSET_CAPTURE) != 0);`
	`1032`	`+ auto output{split_regex(regex_info, limit, (flags & kphp::regex::PREG_SPLIT_NO_EMPTY) != 0, (flags & kphp::regex::PREG_SPLIT_DELIM_CAPTURE) != 0,`
	`1033`	`+ (flags & kphp::regex::PREG_SPLIT_OFFSET_CAPTURE) != 0)};`
`1034`	`1034`	`if (!output.has_value()) [[unlikely]] {`
`1035`	`1035`	`return false;`
`1036`	`1036`	`}`
`1037`	`1037`
`1038`		`- return *output;`
	`1038`	`+ return *std::move(output);`
`1039`	`1039`	`}`