minor #13583 [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex (dunglas)

fabpot · fabpot · commit a6f1e8ca07fa · 2015-02-04T08:33:11.000+01:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13583). Discussion ---------- [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT | Doc PR | n/a The current notation used is confusing and displays an error in PHPStorm (probably a false positive). This PR clarify the notation. Commits ------- 1aba7b4 [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1847,7 +1847,7 @@ private function getUrlencodedPrefix($string, $prefix)
 
         $len = strlen($prefix);
 
-        if (preg_match("#^(%[[:xdigit:]]{2}|.){{$len}}#", $string, $match)) {
+        if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $len), $string, $match)) {
             return $match[0];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1847,7 +1847,7 @@ private function getUrlencodedPrefix($string, $prefix)`
`1847`	`1847`
`1848`	`1848`	`$len = strlen($prefix);`
`1849`	`1849`
`1850`		`- if (preg_match("#^(%[[:xdigit:]]{2}\|.){{$len}}#", $string, $match)) {`
	`1850`	`+ if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}\|.){%d}#', $len), $string, $match)) {`
`1851`	`1851`	`return $match[0];`
`1852`	`1852`	`}`
`1853`	`1853`