minor #40419 [Console] Avoid unneeded preg_replace_callback (bnf)

fabpot · fabpot · commit 6dd2d7b288b2 · 2021-03-09T07:19:07.000+01:00
This PR was merged into the 5.3-dev branch. Discussion ---------- [Console] Avoid unneeded preg_replace_callback | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | no | New feature? | no | Deprecations? | no | License | MIT Motivations for this change: * Avoid an unneded preg call, explode+implode is faster * The previous regex created to suboptimal expressions, due to the pipe that caused empty to be matched. That means an input like `foo:bar` was translated into `foo[^:]*[^:]*:bar[^:]*[^:]*` instead of simply `foo[^:]*:bar[^:]*` Commits ------- daaa760 Avoid unneeded preg_replace_callback in console application
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -589,7 +589,7 @@ public function getNamespaces()
     public function findNamespace(string $namespace)
     {
         $allNamespaces = $this->getNamespaces();
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $namespace);
+        $expr = implode('[^:]*:', array_map('preg_quote', explode(':', $namespace))).'[^:]*';
         $namespaces = preg_grep('{^'.$expr.'}', $allNamespaces);
 
         if (empty($namespaces)) {
@@ -645,7 +645,7 @@ public function find(string $name)
         }
 
         $allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands);
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);
+        $expr = implode('[^:]*:', array_map('preg_quote', explode(':', $name))).'[^:]*';
         $commands = preg_grep('{^'.$expr.'}', $allCommands);
 
         if (empty($commands)) {

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ public function getNamespaces()`
`589`	`589`	`public function findNamespace(string $namespace)`
`590`	`590`	`{`
`591`	`591`	`$allNamespaces = $this->getNamespaces();`
`592`		`- $expr = preg_replace_callback('{([^:]+\|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $namespace);`
	`592`	`+ $expr = implode('[^:]:', array_map('preg_quote', explode(':', $namespace))).'[^:]';`
`593`	`593`	`$namespaces = preg_grep('{^'.$expr.'}', $allNamespaces);`
`594`	`594`
`595`	`595`	`if (empty($namespaces)) {`
`@@ -645,7 +645,7 @@ public function find(string $name)`
`645`	`645`	`}`
`646`	`646`
`647`	`647`	`$allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands);`
`648`		`- $expr = preg_replace_callback('{([^:]+\|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);`
	`648`	`+ $expr = implode('[^:]:', array_map('preg_quote', explode(':', $name))).'[^:]';`
`649`	`649`	`$commands = preg_grep('{^'.$expr.'}', $allCommands);`
`650`	`650`
`651`	`651`	`if (empty($commands)) {`