Merge branch '2.7' into 2.8

fabpot · fabpot · commit f92ada80f44f · 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/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
@@ -41,7 +41,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        if (!preg_match('{\b(?:Chrome/\d+(?:\.\d+)*|Firefox/(?:4[3-9]|[5-9]\d|\d{3,})(?:\.\d)*)\b}', $event->getRequest()->headers->get('User-Agent'))) {
+        if (!preg_match('{\b(?:Chrome/\d+(?:\.\d+)*|HeadlessChrome|Firefox/(?:4[3-9]|[5-9]\d|\d{3,})(?:\.\d)*)\b}', $event->getRequest()->headers->get('User-Agent'))) {
             $this->sendHeaders = false;
             $this->headers = array();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -169,11 +169,11 @@ protected function getContainerBuilder()
         }
 
         if (!$this->getApplication()->getKernel()->isDebug()) {
-            throw new \LogicException(sprintf('Debug information about the container is only available in debug mode.'));
+            throw new \LogicException('Debug information about the container is only available in debug mode.');
         }
 
         if (!is_file($cachedFile = $this->getContainer()->getParameter('debug.container.dump'))) {
-            throw new \LogicException(sprintf('Debug information about the container could not be found. Please clear the cache and try again.'));
+            throw new \LogicException('Debug information about the container could not be found. Please clear the cache and try again.');
         }
 
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -379,7 +379,7 @@ public function setMethodCalls(array $calls = array())
     public function addMethodCall($method, array $arguments = array())
     {
         if (empty($method)) {
-            throw new InvalidArgumentException(sprintf('Method name cannot be empty.'));
+            throw new InvalidArgumentException('Method name cannot be empty.');
         }
         $this->calls[] = array($method, $arguments);
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -93,11 +93,11 @@ private function addService($id, $definition)
         }
 
         if ($definition->isSynthetic()) {
-            $code .= sprintf("        synthetic: true\n");
+            $code .= "        synthetic: true\n";
         }
 
         if ($definition->isSynchronized(false)) {
-            $code .= sprintf("        synchronized: true\n");
+            $code .= "        synchronized: true\n";
         }
 
         if ($definition->isDeprecated()) {
@@ -121,7 +121,7 @@ private function addService($id, $definition)
         }
 
         if ($definition->isLazy()) {
-            $code .= sprintf("        lazy: true\n");
+            $code .= "        lazy: true\n";
         }
 
         if ($definition->getFactoryMethod(false)) {
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -135,7 +135,7 @@ public function get($key, $default = null, $deep = false)
         }
 
         if (null !== $currentKey) {
-            throw new \InvalidArgumentException(sprintf('Malformed path. Path must end with "]".'));
+            throw new \InvalidArgumentException('Malformed path. Path must end with "]".');
         }
 
         return $value;
diff --git a/src/Symfony/Component/Validator/Validator.php b/src/Symfony/Component/Validator/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
`@@ -41,7 +41,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`41`	`41`	`return;`
`42`	`42`	`}`
`43`	`43`
`44`		`- if (!preg_match('{\b(?:Chrome/\d+(?:\.\d+)\|Firefox/(?:4[3-9]\|[5-9]\d\|\d{3,})(?:\.\d))\b}', $event->getRequest()->headers->get('User-Agent'))) {`
	`44`	`+ if (!preg_match('{\b(?:Chrome/\d+(?:\.\d+)\|HeadlessChrome\|Firefox/(?:4[3-9]\|[5-9]\d\|\d{3,})(?:\.\d))\b}', $event->getRequest()->headers->get('User-Agent'))) {`
`45`	`45`	`$this->sendHeaders = false;`
`46`	`46`	`$this->headers = array();`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -169,11 +169,11 @@ protected function getContainerBuilder()`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`if (!$this->getApplication()->getKernel()->isDebug()) {`
`172`		`- throw new \LogicException(sprintf('Debug information about the container is only available in debug mode.'));`
	`172`	`+ throw new \LogicException('Debug information about the container is only available in debug mode.');`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`if (!is_file($cachedFile = $this->getContainer()->getParameter('debug.container.dump'))) {`
`176`		`- throw new \LogicException(sprintf('Debug information about the container could not be found. Please clear the cache and try again.'));`
	`176`	`+ throw new \LogicException('Debug information about the container could not be found. Please clear the cache and try again.');`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`$container = new ContainerBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ public function setMethodCalls(array $calls = array())`
`379`	`379`	`public function addMethodCall($method, array $arguments = array())`
`380`	`380`	`{`
`381`	`381`	`if (empty($method)) {`
`382`		`- throw new InvalidArgumentException(sprintf('Method name cannot be empty.'));`
	`382`	`+ throw new InvalidArgumentException('Method name cannot be empty.');`
`383`	`383`	`}`
`384`	`384`	`$this->calls[] = array($method, $arguments);`
`385`	`385`
Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,11 @@ private function addService($id, $definition)`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if ($definition->isSynthetic()) {`
`96`		`- $code .= sprintf(" synthetic: true\n");`
	`96`	`+ $code .= " synthetic: true\n";`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if ($definition->isSynchronized(false)) {`
`100`		`- $code .= sprintf(" synchronized: true\n");`
	`100`	`+ $code .= " synchronized: true\n";`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if ($definition->isDeprecated()) {`
`@@ -121,7 +121,7 @@ private function addService($id, $definition)`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`if ($definition->isLazy()) {`
`124`		`- $code .= sprintf(" lazy: true\n");`
	`124`	`+ $code .= " lazy: true\n";`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if ($definition->getFactoryMethod(false)) {`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function get($key, $default = null, $deep = false)`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if (null !== $currentKey) {`
`138`		`- throw new \InvalidArgumentException(sprintf('Malformed path. Path must end with "]".'));`
	`138`	`+ throw new \InvalidArgumentException('Malformed path. Path must end with "]".');`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`return $value;`
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`