feat: Bump For Laravel 7.x

MonologFormatter has a new signature.

Author: kangoo13

composer.json

@@ -28,8 +28,8 @@
     }
   ],
   "require": {
-    "php": ">=7.1",
-    "laravel/framework": "^5.6|^5.7|^5.8|^6.0|^7.0|^8.0",
+    "php": ">=7.2.5",
+    "laravel/framework": "^7.0|^8.0",
     "guzzlehttp/guzzle": "^6.0|^7.0"
   },
   "require-dev": {

src/DataDogFormatter.php

@@ -18,6 +18,14 @@ class DataDogFormatter extends JsonFormatter
 
     const LARAVEL_LOG_DATETIME_KEY = 'datetime';
 
+    public function __construct(
+        int $batchMode = self::BATCH_MODE_JSON,
+        bool $appendNewline = true,
+        bool $ignoreEmptyContextAndExtra = false
+    ) {
+        parent::__construct($batchMode, $appendNewline, $ignoreEmptyContextAndExtra);
+    }
+
     /**
      * Appends every variable needed by DataDog
      *
@@ -29,13 +37,10 @@ class DataDogFormatter extends JsonFormatter
      * @see  \Monolog\Formatter\JsonFormatter::format()
      * @see  https://docs.datadoghq.com/logs/processing/#reserved-attributes
      */
-    public function format(array $record)
+    public function format(array $record): string
     {
         if (isset($record[self::LARAVEL_LOG_DATETIME_KEY]) &&
             ($record[self::LARAVEL_LOG_DATETIME_KEY] instanceof DateTime)) {
-            /**
-             * @var DateTime $dateTimeObj
-             */
             $dateTimeObj              = $record[self::LARAVEL_LOG_DATETIME_KEY];
             $record['published_date'] = $dateTimeObj->format(DateTime::ISO8601);
         }

tests/Agent/DataDogAgentFormatterTest.php

@@ -72,7 +72,7 @@ public function recordProvider()
                     "datetime"   => new Carbon('2019-08-14 09:58:10.764107', 'UTC'),
                     "extra"      => []
                 ],
-                '{"message":"test","context":[],"level":200,"level_name":"INFO","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":[],"published_date":"2019-08-14T09:58:10+0000","status":"INFO","ddsource":"php-cli","source":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
+                '{"message":"test","context":{},"level":200,"level_name":"INFO","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":{},"published_date":"2019-08-14T09:58:10+0000","status":"INFO","ddsource":"php-cli","source":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
             ],
             [
                 [
@@ -86,7 +86,7 @@ public function recordProvider()
                     "datetime"   => new Carbon('2019-08-14 09:58:10.764107', 'UTC'),
                     "extra"      => []
                 ],
-                '{"message":"test","context":{"toto":"tata"},"level":100,"level_name":"DEBUG","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":[],"published_date":"2019-08-14T09:58:10+0000","status":"DEBUG","ddsource":"php-cli","source":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
+                '{"message":"test","context":{"toto":"tata"},"level":100,"level_name":"DEBUG","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":{},"published_date":"2019-08-14T09:58:10+0000","status":"DEBUG","ddsource":"php-cli","source":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
             ]
         ];
 

tests/DataDogFormatterTest.php

@@ -53,7 +53,7 @@ public function recordProvider()
                     "datetime"   => new Carbon('2019-08-14 09:58:10.764107', 'UTC'),
                     "extra"      => []
                 ],
-                '{"message":"test","context":[],"level":200,"level_name":"INFO","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":[],"published_date":"2019-08-14T09:58:10+0000","status":"INFO","ddsource":"php-cli","source":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
+                '{"message":"test","context":{},"level":200,"level_name":"INFO","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":{},"published_date":"2019-08-14T09:58:10+0000","status":"INFO","ddsource":"php-cli","source":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
             ],
             [
                 [
@@ -67,7 +67,7 @@ public function recordProvider()
                     "datetime"   => new Carbon('2019-08-14 09:58:10.764107', 'UTC'),
                     "extra"      => []
                 ],
-                '{"message":"test","context":{"toto":"tata"},"level":100,"level_name":"DEBUG","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":[],"published_date":"2019-08-14T09:58:10+0000","status":"DEBUG","ddsource":"php-cli","source":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
+                '{"message":"test","context":{"toto":"tata"},"level":100,"level_name":"DEBUG","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":{},"published_date":"2019-08-14T09:58:10+0000","status":"DEBUG","ddsource":"php-cli","source":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
             ]
         ];