Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit e0a8a7f6310c · 2018-08-08T09:59:30.000+02:00
* 4.1:
  [Config] minor fix that removes a PHP 7.3 deprecation
  [Translation] fix perf of lint:xliff command
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -499,7 +499,7 @@ private static function resolvePlaceholderValue($value)
                 return self::$placeholders[$value];
             }
 
-            if (0 === strpos($value, self::$placeholderUniquePrefix)) {
+            if (self::$placeholderUniquePrefix && 0 === strpos($value, self::$placeholderUniquePrefix)) {
                 return array();
             }
         }
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -134,10 +134,10 @@ private function validate($content, $file = null)
 
         foreach (XliffUtils::validateSchema($document) as $xmlError) {
             $errors[] = array(
-                    'line' => $xmlError['line'],
-                    'column' => $xmlError['column'],
-                    'message' => $xmlError['message'],
-                );
+                'line' => $xmlError['line'],
+                'column' => $xmlError['column'],
+                'message' => $xmlError['message'],
+            );
         }
 
         return array('file' => $file, 'valid' => 0 === \count($errors), 'messages' => $errors);

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ private static function resolvePlaceholderValue($value)`
`499`	`499`	`return self::$placeholders[$value];`
`500`	`500`	`}`
`501`	`501`
`502`		`- if (0 === strpos($value, self::$placeholderUniquePrefix)) {`
	`502`	`+ if (self::$placeholderUniquePrefix && 0 === strpos($value, self::$placeholderUniquePrefix)) {`
`503`	`503`	`return array();`
`504`	`504`	`}`
`505`	`505`	`}`