From 04fe4cdec15f3c8d45641b29fc3a2c93d2984d68 Mon Sep 17 00:00:00 2001 From: George Mponos Date: Sun, 9 Dec 2018 21:04:20 +0200 Subject: [PATCH 1/8] Make CURL util final and internal --- src/Monolog/Handler/Curl/Util.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Monolog/Handler/Curl/Util.php b/src/Monolog/Handler/Curl/Util.php index f1d0c17d..5a8abef3 100644 --- a/src/Monolog/Handler/Curl/Util.php +++ b/src/Monolog/Handler/Curl/Util.php @@ -11,7 +11,12 @@ namespace Monolog\Handler\Curl; -class Util +/** + * This class is marked as internal and it is not under the BC promise of the package. + * + * @internal + */ +final class Util { private static $retriableErrorCodes = [ CURLE_COULDNT_RESOLVE_HOST, From 61021a535d4c2143070f3f2d0655f32e87fcee0f Mon Sep 17 00:00:00 2001 From: George Mponos Date: Sun, 9 Dec 2018 21:32:59 +0200 Subject: [PATCH 2/8] Added missing bubble property --- src/Monolog/Handler/FingersCrossedHandler.php | 1 + src/Monolog/Handler/GroupHandler.php | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Monolog/Handler/FingersCrossedHandler.php b/src/Monolog/Handler/FingersCrossedHandler.php index aba1b1d7..11f3b505 100644 --- a/src/Monolog/Handler/FingersCrossedHandler.php +++ b/src/Monolog/Handler/FingersCrossedHandler.php @@ -43,6 +43,7 @@ class FingersCrossedHandler extends Handler implements ProcessableHandlerInterfa protected $buffer = []; protected $stopBuffering; protected $passthruLevel; + protected $bubble; /** * @param callable|HandlerInterface $handler Handler or factory callable($record, $fingersCrossedHandler). diff --git a/src/Monolog/Handler/GroupHandler.php b/src/Monolog/Handler/GroupHandler.php index 3aa1201c..0d0c9c9a 100644 --- a/src/Monolog/Handler/GroupHandler.php +++ b/src/Monolog/Handler/GroupHandler.php @@ -24,6 +24,7 @@ class GroupHandler extends Handler implements ProcessableHandlerInterface, Reset use ProcessableHandlerTrait; protected $handlers; + protected $bubble; /** * @param HandlerInterface[] $handlers Array of Handlers. From e2a3122e10c5bffe76e4c6cc6f41d46355effc66 Mon Sep 17 00:00:00 2001 From: George Mponos Date: Sun, 9 Dec 2018 22:17:36 +0200 Subject: [PATCH 3/8] Parameter formatter was never set.. would cause fatal --- src/Monolog/Handler/HandlerWrapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Handler/HandlerWrapper.php b/src/Monolog/Handler/HandlerWrapper.php index dfbc16d1..3f2c7a1a 100644 --- a/src/Monolog/Handler/HandlerWrapper.php +++ b/src/Monolog/Handler/HandlerWrapper.php @@ -119,7 +119,7 @@ class HandlerWrapper implements HandlerInterface, ProcessableHandlerInterface, F public function getFormatter(): FormatterInterface { if ($this->handler instanceof FormattableHandlerInterface) { - return $this->handler->getFormatter($formatter); + return $this->handler->getFormatter(); } throw new \LogicException('The wrapped handler does not implement ' . FormattableHandlerInterface::class); From ee221811100f14dafbffffef2fa77c5b207fa679 Mon Sep 17 00:00:00 2001 From: George Mponos Date: Sun, 9 Dec 2018 23:22:56 +0200 Subject: [PATCH 4/8] Mark Utils of getclass as final --- src/Monolog/Utils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Utils.php b/src/Monolog/Utils.php index ed2d45bb..14b76661 100644 --- a/src/Monolog/Utils.php +++ b/src/Monolog/Utils.php @@ -11,7 +11,7 @@ namespace Monolog; -class Utils +final class Utils { /** * @internal From befa91fa36f99186759172b80e62c91579e4f6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 10 Dec 2018 11:13:24 +0100 Subject: [PATCH 5/8] Enhancement: Keep packages sorted in composer.json (#1248) --- composer.json | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 2545c164..76ff33ad 100644 --- a/composer.json +++ b/composer.json @@ -17,20 +17,20 @@ "psr/log": "^1.0.1" }, "require-dev": { - "phpunit/phpunit": "^7.3", - "graylog2/gelf-php": "^1.4.2", - "sentry/sentry": "^1.9", - "ruflin/elastica": ">=0.90 <3.0", - "doctrine/couchdb": "~1.0@dev", "aws/aws-sdk-php": "^2.4.9 || ^3.0", - "php-amqplib/php-amqplib": "~2.4", - "swiftmailer/swiftmailer": "^5.3|^6.0", - "php-console/php-console": "^3.1.3", - "jakub-onderka/php-parallel-lint": "^0.9", - "predis/predis": "^1.1", - "phpspec/prophecy": "^1.6.1", + "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^6.0", - "rollbar/rollbar": "^1.3" + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", + "php-amqplib/php-amqplib": "~2.4", + "php-console/php-console": "^3.1.3", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^7.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", + "ruflin/elastica": ">=0.90 <3.0", + "sentry/sentry": "^1.9", + "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", @@ -65,5 +65,8 @@ "parallel-lint . --exclude vendor", "phpunit" ] + }, + "config": { + "sort-packages": true } } From b46967e74ca067c059f2753a586ca981cac8ee39 Mon Sep 17 00:00:00 2001 From: Mponos George Date: Mon, 10 Dec 2018 12:13:43 +0200 Subject: [PATCH 6/8] Add 7.3 to v1 also (#1246) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 07bad617..9adcf749 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ php: - 7.0 - 7.1 - 7.2 + - 7.3 - nightly matrix: From b7c0e7142df01a66bc86c12e1ef66e04d24fa120 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 10 Dec 2018 11:49:48 +0100 Subject: [PATCH 7/8] Bump phpunit minimum version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 76ff33ad..868b378e 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.6.1", - "phpunit/phpunit": "^7.3", + "phpunit/phpunit": "^7.5", "predis/predis": "^1.1", "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", From a774caa99f7a82493894843db30cfefcc785b4b8 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 10 Dec 2018 11:53:00 +0100 Subject: [PATCH 8/8] Remove invalid ext from travis build --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0bc3dc92..a3a715a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ matrix: before_script: - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - echo "extension = amqp.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - if [ "$deps" == "low" ]; then composer update --prefer-dist --prefer-lowest --prefer-stable; fi - if [ "$deps" != "low" ]; then composer install --prefer-dist; fi