From 280f6a131f4ea00718f353103bfe265462b607e6 Mon Sep 17 00:00:00 2001 From: Henrique Serrat Date: Fri, 13 Mar 2020 11:25:08 -0300 Subject: [PATCH 1/4] Check that is not null before calling preg_match --- src/Monolog/Processor/GitProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Processor/GitProcessor.php b/src/Monolog/Processor/GitProcessor.php index 9fc3f50f..cdf5ec73 100644 --- a/src/Monolog/Processor/GitProcessor.php +++ b/src/Monolog/Processor/GitProcessor.php @@ -52,7 +52,7 @@ class GitProcessor implements ProcessorInterface } $branches = `git branch -v --no-abbrev`; - if (preg_match('{^\* (.+?)\s+([a-f0-9]{40})(?:\s|$)}m', $branches, $matches)) { + if ($branches && preg_match('{^\* (.+?)\s+([a-f0-9]{40})(?:\s|$)}m', $branches, $matches)) { return self::$cache = array( 'branch' => $matches[1], 'commit' => $matches[2], From a14890834a39bb860e1cdb8872e42bf0dbe9f2dd Mon Sep 17 00:00:00 2001 From: jambert Date: Sat, 4 Apr 2020 15:37:48 +0200 Subject: [PATCH 2/4] Registry class not used in ErrorHandler --- src/Monolog/ErrorHandler.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php index adc55bdf..36ec0098 100644 --- a/src/Monolog/ErrorHandler.php +++ b/src/Monolog/ErrorHandler.php @@ -14,7 +14,6 @@ namespace Monolog; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; use Monolog\Handler\AbstractHandler; -use Monolog\Registry; /** * Monolog error handler From 21c7b7610d3ba84bcd13c5d7eb10de352071b295 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 11 May 2020 21:33:22 +0200 Subject: [PATCH 3/4] Remove abandoned dep, fixes #1445 --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 097df878..346ef883 100644 --- a/composer.json +++ b/composer.json @@ -26,10 +26,8 @@ "php-amqplib/php-amqplib": "~2.4", "swiftmailer/swiftmailer": "^5.3|^6.0", "php-console/php-console": "^3.1.3", - "phpunit/phpunit-mock-objects": "2.3.0", - "jakub-onderka/php-parallel-lint": "0.9" + "php-parallel-lint/php-parallel-lint": "^1.0" }, - "_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223 - needs hhvm 3.8+ on travis", "suggest": { "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "sentry/sentry": "Allow sending log messages to a Sentry server", From 74f92ea154eed179700960111970234f00b1a56b Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 11 May 2020 21:42:25 +0200 Subject: [PATCH 4/4] Remove lock file --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 346ef883..e171e202 100644 --- a/composer.json +++ b/composer.json @@ -60,5 +60,6 @@ "parallel-lint . --exclude vendor --exclude src/Monolog/Handler/FormattableHandlerInterface.php --exclude src/Monolog/Handler/FormattableHandlerTrait.php --exclude src/Monolog/Handler/ProcessableHandlerInterface.php --exclude src/Monolog/Handler/ProcessableHandlerTrait.php", "phpunit" ] - } + }, + "lock": false }