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 diff --git a/composer.json b/composer.json index 2545c164..868b378e 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.5", + "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 } } 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, 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. 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); 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