Prepare release v1.0.2

oanhnn · Nov 6, 2019 · 07a81f1 · 07a81f1
1 parent 64086ba
commit 07a81f1
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 
 
+## [1.0.2] - 2019-11-06
+
+### Added
+- Support `monolog/monolog:^2.0`
+
+### Changed
+- Change coding style from PSR-2 to PSR-12
+
+### Fixed
+- Logs wasn't send to Logz.io
+
+
+
+
 ## [1.0.1] - 2019-11-06
 
 ### Fixed
@@ -87,7 +101,8 @@ First release
 
 
 
-[Unreleased]: https://github.com/oanhnn/laravel-logzio/compare/v1.0.1...develop
+[Unreleased]: https://github.com/oanhnn/laravel-logzio/compare/v1.0.2...develop
+[1.0.2]:      https://github.com/oanhnn/laravel-logzio/compare/v1.0.1...v1.0.2
 [1.0.1]:      https://github.com/oanhnn/laravel-logzio/compare/v1.0.0...v1.0.1
 [1.0.0]:      https://github.com/oanhnn/laravel-logzio/compare/v0.2.0...v1.0.0
 [0.2.0]:      https://github.com/oanhnn/laravel-logzio/compare/v0.1.2...v0.2.0

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -41,7 +41,7 @@ Before submitting a pull request:
 
 If the project maintainer has any additional requirements, you will find them listed here.
 
-- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
+- **[PSR-12 Extended Coding Style](https://www.php-fig.org/psr/psr-12)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
 
 - **Add tests!** - Your patch won't be accepted if it doesn't have tests.
 

diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ return [
 	    'driver' => 'logzio',
 	    'name'   => 'channel-name',
 	    'token'  => 'logz-access-token',
-	    'type'   => 'https-bulk',
+	    'type'   => 'http-bulk',
 	    'ssl'    => true,
 	    'level'  => 'info',
 	    'bubble' => true,

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
   "require": {
     "php": "^7.1.3",
     "guzzlehttp/guzzle": "^6.4",
-    "monolog/monolog": "~1.12",
+    "monolog/monolog": "^1.12|^2.0",
     "psr/log": "^1.1"
   },
   "require-dev": {

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -9,7 +9,7 @@
     <arg value="p"/>
     <arg name="colors"/>
 
-    <rule ref="PSR2"/>
+    <rule ref="PSR12"/>
     <rule ref="Generic.PHP.DeprecatedFunctions"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
 

diff --git a/src/Log/Formatter.php b/src/Log/Formatter.php
@@ -18,7 +18,7 @@ class Formatter extends JsonFormatter
      * Datetime format for Logz.io
      * @see https://support.logz.io/hc/en-us/articles/210206885
      */
-    const DATETIME_FORMAT = 'c';
+    protected const DATETIME_FORMAT = 'c';
 
     /**
      * @param  int  $batchMode

diff --git a/src/Log/Handler.php b/src/Log/Handler.php
@@ -55,7 +55,7 @@ public function __construct($level = Logger::DEBUG, bool $bubble = true, array $
     /**
      * {@inheritdoc}
      */
-    public function handleBatch(array $records)
+    public function handleBatch(array $records): void
     {
         $processed = [];
 
@@ -134,7 +134,7 @@ protected function send($data)
         $headers = ['Content-Type: application/json'];
         $request = new Request('POST', $this->endpoint, $headers, $data);
 
-        $this->client->sendAsync($request);
+        $this->client->send($request);
     }
 
     /**
@@ -157,7 +157,7 @@ protected function validRegion(string $region): bool
     /**
      * {@inheritdoc}
      */
-    protected function write(array $record)
+    protected function write(array $record): void
     {
         $this->send($record['formatted']);
     }

diff --git a/tests/Unit/LogzioHandlerTest.php b/tests/Unit/LogzioHandlerTest.php
@@ -70,7 +70,7 @@ public function testItShouldProvidersDefaultFormatter()
     public function testItShouldHandleARecord()
     {
         $client = $this->createMock(Client::class);
-        $client->expects($this->once())->method('sendAsync');
+        $client->expects($this->once())->method('send');
 
         $handler = new Handler('debug', false, ['token' => 'abc', 'http_client' => $client]);
         $handler->handle($this->logRecord());
@@ -84,7 +84,7 @@ public function testItShouldHandleARecord()
     public function testItShouldHandleBatch()
     {
         $client = $this->createMock(Client::class);
-        $client->expects($this->once())->method('sendAsync');
+        $client->expects($this->once())->method('send');
 
         $handler = new Handler('notice', false, ['token' => 'abc', 'http_client' => $client]);
         $handler->handleBatch([