From a73b4036c5f4f4721e74b66904e5da00096fd788 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Fri, 22 May 2020 09:10:51 +0200
Subject: [PATCH 1/4] Build updates

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9df224ad..c40fb38c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,8 @@ matrix:
 
 before_script:
   - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-  - if [ "$deps" == "low" ]; then composer update --prefer-source --prefer-lowest --prefer-stable; fi
-  - if [ "$deps" != "low" ]; then composer install --prefer-source; fi
+  - composer self-update --snapshot
+  - if [ "$deps" == "low" ]; then composer update -n --prefer-dist --prefer-lowest --prefer-stable; fi
+  - if [ "$deps" != "low" ]; then composer update -n --prefer-dist; fi
 
 script: composer test

From 6f9b0a5ff2eb12cf560577b8963539ac1767a1f9 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Fri, 22 May 2020 09:27:32 +0200
Subject: [PATCH 2/4] Remove deprecation warnings on 7.4

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c40fb38c..fe999c20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ matrix:
 
 before_script:
   - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "7.4" ]; then echo "error_reporting = E_ALL & ~E_DEPRECATED" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
   - composer self-update --snapshot
   - if [ "$deps" == "low" ]; then composer update -n --prefer-dist --prefer-lowest --prefer-stable; fi
   - if [ "$deps" != "low" ]; then composer update -n --prefer-dist; fi

From b5260af0d1f62feb72ee6b3b3ed7faf2e41f78d6 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Fri, 22 May 2020 09:30:27 +0200
Subject: [PATCH 3/4] Also remove deprecation warnings when running outside of
 travis on php 7.4

---
 phpunit.xml.dist    | 2 +-
 tests/bootstrap.php | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 tests/bootstrap.php

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 20d82b63..54da2818 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php" colors="true">
+<phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="Monolog Test Suite">
             <directory>tests/Monolog/</directory>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 00000000..fedc5caf
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,9 @@
+<?php
+
+if (PHP_VERSION_ID >= 70400) {
+    error_reporting(E_ALL & ~E_DEPRECATED);
+} else {
+    error_reporting(E_ALL);
+}
+
+include __DIR__.'/../vendor/autoload.php';
\ No newline at end of file

From 3022efff205e2448b560c833c6fbbf91c3139168 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Fri, 22 May 2020 09:31:27 +0200
Subject: [PATCH 4/4] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 255297c6..31512f01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.25.4 (2020-05-22)
+
+  * Fixed GitProcessor type error when there is no git repo present
+  * Fixed normalization of SoapFault objects containing deeply nested objects as "detail"
+  * Fixed support for relative paths in RotatingFileHandler
+
 ### 1.25.3 (2019-12-20)
 
   * Fixed formatting of resources in JsonFormatter