Merge remote-tracking branch 'monolog/master' into docblock_fixes

.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
 

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
     }
 }

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,

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).

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.

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);

src/Monolog/Utils.php

@@ -11,7 +11,7 @@
 
 namespace Monolog;
 
-class Utils
+final class Utils
 {
     /**
      * @internal