Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 9ac515bde3c7 · 2018-09-08T15:24:10.000+02:00
* 3.4:
  [DI] configure inlined services before injecting them when dumping the container
  Consistently throw exceptions on a single line
  fix fopen calls
  Update .editorconfig
diff --git a/XPath/Extension/FunctionExtension.php b/XPath/Extension/FunctionExtension.php
@@ -133,10 +133,7 @@ public function translateContains(XPathExpr $xpath, FunctionNode $function): XPa
         $arguments = $function->getArguments();
         foreach ($arguments as $token) {
             if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :contains(), got '
-                    .implode(', ', $arguments)
-                );
+                throw new ExpressionErrorException('Expected a single string or identifier for :contains(), got '.implode(', ', $arguments));
             }
         }
 
@@ -154,10 +151,7 @@ public function translateLang(XPathExpr $xpath, FunctionNode $function): XPathEx
         $arguments = $function->getArguments();
         foreach ($arguments as $token) {
             if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :lang(), got '
-                    .implode(', ', $arguments)
-                );
+                throw new ExpressionErrorException('Expected a single string or identifier for :lang(), got '.implode(', ', $arguments));
             }
         }
 
diff --git a/XPath/Extension/HtmlExtension.php b/XPath/Extension/HtmlExtension.php
@@ -158,10 +158,7 @@ public function translateLang(XPathExpr $xpath, FunctionNode $function)
         $arguments = $function->getArguments();
         foreach ($arguments as $token) {
             if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :lang(), got '
-                    .implode(', ', $arguments)
-                );
+                throw new ExpressionErrorException('Expected a single string or identifier for :lang(), got '.implode(', ', $arguments));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,7 @@ public function translateContains(XPathExpr $xpath, FunctionNode $function): XPa`
`133`	`133`	`$arguments = $function->getArguments();`
`134`	`134`	`foreach ($arguments as $token) {`
`135`	`135`	`if (!($token->isString() \|\| $token->isIdentifier())) {`
`136`		`- throw new ExpressionErrorException(`
`137`		`- 'Expected a single string or identifier for :contains(), got '`
`138`		`- .implode(', ', $arguments)`
`139`		`- );`
	`136`	`+ throw new ExpressionErrorException('Expected a single string or identifier for :contains(), got '.implode(', ', $arguments));`
`140`	`137`	`}`
`141`	`138`	`}`
`142`	`139`
`@@ -154,10 +151,7 @@ public function translateLang(XPathExpr $xpath, FunctionNode $function): XPathEx`
`154`	`151`	`$arguments = $function->getArguments();`
`155`	`152`	`foreach ($arguments as $token) {`
`156`	`153`	`if (!($token->isString() \|\| $token->isIdentifier())) {`
`157`		`- throw new ExpressionErrorException(`
`158`		`- 'Expected a single string or identifier for :lang(), got '`
`159`		`- .implode(', ', $arguments)`
`160`		`- );`
	`154`	`+ throw new ExpressionErrorException('Expected a single string or identifier for :lang(), got '.implode(', ', $arguments));`
`161`	`155`	`}`
`162`	`156`	`}`
`163`	`157`
Original file line number	Diff line number	Diff line change
`@@ -158,10 +158,7 @@ public function translateLang(XPathExpr $xpath, FunctionNode $function)`
`158`	`158`	`$arguments = $function->getArguments();`
`159`	`159`	`foreach ($arguments as $token) {`
`160`	`160`	`if (!($token->isString() \|\| $token->isIdentifier())) {`
`161`		`- throw new ExpressionErrorException(`
`162`		`- 'Expected a single string or identifier for :lang(), got '`
`163`		`- .implode(', ', $arguments)`
`164`		`- );`
	`161`	`+ throw new ExpressionErrorException('Expected a single string or identifier for :lang(), got '.implode(', ', $arguments));`
`165`	`162`	`}`
`166`	`163`	`}`
`167`	`164`