Optimize perf by replacing call_user_func with dynamic vars

ostrolucky · ostrolucky · commit fa2dab1d8529 · 2018-12-09T23:58:21.000+01:00
diff --git a/XPath/Translator.php b/XPath/Translator.php
@@ -155,7 +155,7 @@ public function nodeToXPath(NodeInterface $node): XPathExpr
             throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
         }
 
-        return \call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);
+        return $this->nodeTranslators[$node->getNodeName()]($node, $this);
     }
 
     /**
@@ -167,7 +167,7 @@ public function addCombination(string $combiner, NodeInterface $xpath, NodeInter
             throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
         }
 
-        return \call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
+        return $this->combinationTranslators[$combiner]($this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
     }
 
     /**
@@ -179,7 +179,7 @@ public function addFunction(XPathExpr $xpath, FunctionNode $function): XPathExpr
             throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
         }
 
-        return \call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);
+        return $this->functionTranslators[$function->getName()]($xpath, $function);
     }
 
     /**
@@ -191,7 +191,7 @@ public function addPseudoClass(XPathExpr $xpath, string $pseudoClass): XPathExpr
             throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
         }
 
-        return \call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);
+        return $this->pseudoClassTranslators[$pseudoClass]($xpath);
     }
 
     /**
@@ -203,7 +203,7 @@ public function addAttributeMatching(XPathExpr $xpath, string $operator, string
             throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
         }
 
-        return \call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);
+        return $this->attributeMatchingTranslators[$operator]($xpath, $attribute, $value);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function nodeToXPath(NodeInterface $node): XPathExpr`
`155`	`155`	`throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));`
`156`	`156`	`}`
`157`	`157`
`158`		`- return \call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);`
	`158`	`+ return $this->nodeTranslators[$node->getNodeName()]($node, $this);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`/**`
`@@ -167,7 +167,7 @@ public function addCombination(string $combiner, NodeInterface $xpath, NodeInter`
`167`	`167`	`throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));`
`168`	`168`	`}`
`169`	`169`
`170`		`- return \call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));`
	`170`	`+ return $this->combinationTranslators[$combiner]($this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`/**`
`@@ -179,7 +179,7 @@ public function addFunction(XPathExpr $xpath, FunctionNode $function): XPathExpr`
`179`	`179`	`throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));`
`180`	`180`	`}`
`181`	`181`
`182`		`- return \call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);`
	`182`	`+ return $this->functionTranslators[$function->getName()]($xpath, $function);`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/**`
`@@ -191,7 +191,7 @@ public function addPseudoClass(XPathExpr $xpath, string $pseudoClass): XPathExpr`
`191`	`191`	`throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));`
`192`	`192`	`}`
`193`	`193`
`194`		`- return \call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);`
	`194`	`+ return $this->pseudoClassTranslators[$pseudoClass]($xpath);`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`/**`
`@@ -203,7 +203,7 @@ public function addAttributeMatching(XPathExpr $xpath, string $operator, string`
`203`	`203`	`throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));`
`204`	`204`	`}`
`205`	`205`
`206`		`- return \call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);`
	`206`	`+ return $this->attributeMatchingTranslators[$operator]($xpath, $attribute, $value);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`/**`