Merge branch '2.8' into 3.2

fabpot · fabpot · commit f53e81dd6a72 · 2017-04-05T06:44:24.000-07:00
* 2.8: Fixes #22264 - add support for Chrome headless, see also Seldaek/monolog#966 bumped Symfony version to 2.8.20 updated VERSION for 2.8.19 updated CHANGELOG for 2.8.19 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
@@ -173,11 +173,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
@@ -269,7 +269,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,7 +93,7 @@ private function addService($id, $definition)
         }
 
         if ($definition->isSynthetic()) {
-            $code .= sprintf("        synthetic: true\n");
+            $code .= "        synthetic: true\n";
         }
 
         if ($definition->isDeprecated()) {
@@ -113,7 +113,7 @@ private function addService($id, $definition)
         }
 
         if ($definition->isLazy()) {
-            $code .= sprintf("        lazy: true\n");
+            $code .= "        lazy: true\n";
         }
 
         if ($definition->getArguments()) {

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
`@@ -173,11 +173,11 @@ protected function getContainerBuilder()`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`if (!$this->getApplication()->getKernel()->isDebug()) {`
`176`		`- throw new \LogicException(sprintf('Debug information about the container is only available in debug mode.'));`
	`176`	`+ throw new \LogicException('Debug information about the container is only available in debug mode.');`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if (!is_file($cachedFile = $this->getContainer()->getParameter('debug.container.dump'))) {`
`180`		`- throw new \LogicException(sprintf('Debug information about the container could not be found. Please clear the cache and try again.'));`
	`180`	`+ throw new \LogicException('Debug information about the container could not be found. Please clear the cache and try again.');`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`$container = new ContainerBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ public function setMethodCalls(array $calls = array())`
`269`	`269`	`public function addMethodCall($method, array $arguments = array())`
`270`	`270`	`{`
`271`	`271`	`if (empty($method)) {`
`272`		`- throw new InvalidArgumentException(sprintf('Method name cannot be empty.'));`
	`272`	`+ throw new InvalidArgumentException('Method name cannot be empty.');`
`273`	`273`	`}`
`274`	`274`	`$this->calls[] = array($method, $arguments);`
`275`	`275`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ 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->isDeprecated()) {`
`@@ -113,7 +113,7 @@ private function addService($id, $definition)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if ($definition->isLazy()) {`
`116`		`- $code .= sprintf(" lazy: true\n");`
	`116`	`+ $code .= " lazy: true\n";`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`if ($definition->getArguments()) {`