From 39c7e04ad4dcb186fca7a87229fc005839f2e992 Mon Sep 17 00:00:00 2001
From: Fabien <fbnfgc@users.noreply.github.com>
Date: Thu, 12 Dec 2019 15:11:15 +0100
Subject: [PATCH 1/3] Set phpredis multi() mode parameter

---
 src/Monolog/Handler/RedisHandler.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Monolog/Handler/RedisHandler.php b/src/Monolog/Handler/RedisHandler.php
index 590f9965..bb00db50 100644
--- a/src/Monolog/Handler/RedisHandler.php
+++ b/src/Monolog/Handler/RedisHandler.php
@@ -73,7 +73,8 @@ class RedisHandler extends AbstractProcessingHandler
     protected function writeCapped(array $record)
     {
         if ($this->redisClient instanceof \Redis) {
-            $this->redisClient->multi()
+            $mode = defined('\Redis::MULTI') ? \Redis::MULTI : 1;
+            $this->redisClient->multi($mode)
                 ->rpush($this->redisKey, $record["formatted"])
                 ->ltrim($this->redisKey, -$this->capSize, -1)
                 ->exec();

From 96ec86aaa1866b17488b5e3deaaa8f174f2bd996 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Fri, 20 Dec 2019 09:59:49 +0000
Subject: [PATCH 2/3] Update .travis.yml

---
 .travis.yml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c258b68c..9df224ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,29 @@
 language: php
 
-sudo: false
-dist: trusty
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4snapshot
-
 matrix:
+  fast_finish: true
   include:
     - dist: precise
       php: 5.3
+      env: deps=low
     - dist: precise
       php: 5.3
-      env: deps=low
-  fast_finish: true
+    - php: 5.4
+      dist: trusty
+    - php: 5.5
+      dist: trusty
+    - php: 5.6
+      dist: xenial
+    - php: 7.0
+      dist: xenial
+    - php: 7.1
+      dist: bionic
+    - php: 7.2
+      dist: bionic
+    - php: 7.3
+      dist: bionic
+    - php: 7.4
+      dist: bionic
 
 before_script:
   - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi

From 9621075c0fbab6ec7adadf87e35e7b47d138baee Mon Sep 17 00:00:00 2001
From: theravel <tarasovdyu@gmail.com>
Date: Tue, 10 Dec 2019 23:20:58 +0100
Subject: [PATCH 3/3] Fix JSON formatting of resource type, closes #1410

---
 src/Monolog/Formatter/JsonFormatter.php       | 4 ++++
 tests/Monolog/Formatter/JsonFormatterTest.php | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/Monolog/Formatter/JsonFormatter.php b/src/Monolog/Formatter/JsonFormatter.php
index 96a05917..86966b07 100644
--- a/src/Monolog/Formatter/JsonFormatter.php
+++ b/src/Monolog/Formatter/JsonFormatter.php
@@ -165,6 +165,10 @@ class JsonFormatter extends NormalizerFormatter
             return $this->normalizeException($data);
         }
 
+        if (is_resource($data)) {
+            return parent::normalize($data);
+        }
+
         return $data;
     }
 
diff --git a/tests/Monolog/Formatter/JsonFormatterTest.php b/tests/Monolog/Formatter/JsonFormatterTest.php
index 24b06cc9..db07a4cd 100644
--- a/tests/Monolog/Formatter/JsonFormatterTest.php
+++ b/tests/Monolog/Formatter/JsonFormatterTest.php
@@ -114,6 +114,14 @@ class JsonFormatterTest extends TestCase
         $this->assertContextContainsFormattedException($formattedThrowable, $message);
     }
 
+    public function testDefFormatWithResource()
+    {
+        $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false);
+        $record = $this->getRecord();
+        $record['context'] = array('field_resource' => curl_init());
+        $this->assertEquals('{"message":"test","context":{"field_resource":"[resource] (curl)"},"level":300,"level_name":"WARNING","channel":"test","datetime":'.json_encode($record['datetime']).',"extra":[]}', $formatter->format($record));
+    }
+
     /**
      * @param string $expected
      * @param string $actual