Merge branch '4.4' into 5.0

fabpot · fabpot · commit 69b29d6615b5 · 2020-03-15T15:33:06.000+01:00
* 4.4:
  Add missing dots at the end of exception messages
  [DI][Form] Fixed test suite (TimeType changes &amp; unresolved merge conflict)
  Fix bad merge
  Add missing dots at the end of exception messages
diff --git a/XPath/Extension/FunctionExtension.php b/XPath/Extension/FunctionExtension.php
@@ -53,7 +53,7 @@ public function translateNthChild(XPathExpr $xpath, FunctionNode $function, bool
         try {
             list($a, $b) = Parser::parseSeries($function->getArguments());
         } catch (SyntaxErrorException $e) {
-            throw new ExpressionErrorException(sprintf('Invalid series: %s', implode(', ', $function->getArguments())), 0, $e);
+            throw new ExpressionErrorException(sprintf('Invalid series: %s.', implode(', ', $function->getArguments())), 0, $e);
         }
 
         $xpath->addStarPrefix();

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function translateNthChild(XPathExpr $xpath, FunctionNode $function, bool`
`53`	`53`	`try {`
`54`	`54`	`list($a, $b) = Parser::parseSeries($function->getArguments());`
`55`	`55`	`} catch (SyntaxErrorException $e) {`
`56`		`- throw new ExpressionErrorException(sprintf('Invalid series: %s', implode(', ', $function->getArguments())), 0, $e);`
	`56`	`+ throw new ExpressionErrorException(sprintf('Invalid series: %s.', implode(', ', $function->getArguments())), 0, $e);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`$xpath->addStarPrefix();`