Merge branch '2.7' into 2.8

fabpot · fabpot · commit b1e28d059246 · 2017-04-05T06:42:13.000-07:00
* 2.7: Fixes #22264 - add support for Chrome headless, see also Seldaek/monolog#966 Dont call sprintf() when no placeholders are used
diff --git a/Validator.php b/Validator.php
@@ -151,7 +151,7 @@ public function validatePropertyValue($containingValue, $property, $value, $grou
                 ? '"'.$containingValue.'"'
                 : 'the value of type '.gettype($containingValue);
 
-            throw new ValidatorException(sprintf('The metadata for '.$valueAsString.' does not support properties.'));
+            throw new ValidatorException(sprintf('The metadata for %s does not support properties.', $valueAsString));
         }
 
         // If $containingValue is passed as class name, take $value as root

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public function validatePropertyValue($containingValue, $property, $value, $grou`
`151`	`151`	`? '"'.$containingValue.'"'`
`152`	`152`	`: 'the value of type '.gettype($containingValue);`
`153`	`153`
`154`		`- throw new ValidatorException(sprintf('The metadata for '.$valueAsString.' does not support properties.'));`
	`154`	`+ throw new ValidatorException(sprintf('The metadata for %s does not support properties.', $valueAsString));`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`// If $containingValue is passed as class name, take $value as root`