feature #22296 Bump monolog to 1.19 and use the agent regex const from parent (redthor)

fabpot · fabpot · commit b65ebc7424e6 · 2017-04-05T06:53:23.000-07:00
This PR was merged into the 3.3-dev branch. Discussion ---------- Bump monolog to 1.19 and use the agent regex const from parent See #22264 | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | refer to #22264 | License | MIT | Doc PR | Bump monolog and use const from parent. See #22264 (comment) I went for `static` instead of `self` in case anyone wanted to easily override just the agent string. Commits ------- 69f9586 Bump monolog to 1.19 and use the agent regex const from parent, see #22264
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+)*|HeadlessChrome|Firefox/(?:4[3-9]|[5-9]\d|\d{3,})(?:\.\d)*)\b}', $event->getRequest()->headers->get('User-Agent'))) {
+        if (!preg_match(static::USER_AGENT_REGEX, $event->getRequest()->headers->get('User-Agent'))) {
             $this->sendHeaders = false;
             $this->headers = array();
 
diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "monolog/monolog": "~1.11",
+        "monolog/monolog": "~1.19",
         "symfony/http-kernel": "~2.8|~3.0"
     },
     "require-dev": {

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+)\|HeadlessChrome\|Firefox/(?:4[3-9]\|[5-9]\d\|\d{3,})(?:\.\d))\b}', $event->getRequest()->headers->get('User-Agent'))) {`
	`44`	`+ if (!preg_match(static::USER_AGENT_REGEX, $event->getRequest()->headers->get('User-Agent'))) {`
`45`	`45`	`$this->sendHeaders = false;`
`46`	`46`	`$this->headers = array();`
`47`	`47`