Update to monolog v2

.scrutinizer.yml

@@ -1,7 +1,7 @@
 build:
   environment:
     php:
-      version: 7.1.0
+      version: 7.4.0
   tests:
     override:
       -

.travis.yml

@@ -21,49 +21,49 @@ jobs:
   include:
     - stage: test
       name: 'Lint Syntax'
-      php: 7.1
+      php: 7.3
       script:
         - composer lint:syntax
     - stage: test
       name: 'Lint Style'
-      php: 7.1
+      php: 7.3
       script:
         - composer lint:style
     - stage: test
       name: 'Coverage'
-      php: 7.1
+      php: 7.3
       script:
         - composer test:coverage
     - stage: test
       name: 'Mutations'
-      php: 7.1
+      php: 7.3
       script:
         - composer require --dev infection/infection
         - composer test:mutations
     - stage: test
       name: 'ZF2 Integration, DEPS=LATEST'
-      php: 7.1
+      php: 7.3
       script:
         - cd test/ZF2
         - composer install --no-interaction
         - vendor/bin/phpunit
     - stage: test
       name: 'ZF2 Integration, DEPS=LOWEST'
-      php: 7.1
+      php: 7.3
       script:
         - cd test/ZF2
         - composer update --prefer-lowest --no-interaction
         - vendor/bin/phpunit
     - stage: test
       name: 'ZF3 Integration, DEPS=LATEST'
-      php: 7.1
+      php: 7.3
       script:
         - cd test/ZF3
         - composer install --no-interaction
         - vendor/bin/phpunit
     - stage: test
       name: 'ZF3 Integration, DEPS=LOWEST'
-      php: 7.1
+      php: 7.3
       script:
         - cd test/ZF3
         - composer update --prefer-lowest --no-interaction

README.md

@@ -19,7 +19,7 @@ USAGE
 
 ```php
 // usage over service locator
-$serviceLocator->get('EnliteMonologService')->addDebug('hello world');
+$serviceLocator->get('EnliteMonologService')->debug('hello world');
 
 use EnliteMonolog\Service\MonologServiceAwareInterface,
     EnliteMonolog\Service\MonologServiceAwareTrait;
@@ -31,7 +31,7 @@ class MyService implements MonologServiceAwareInterface
 
     public function whatever()
     {
-        $this->getMonologService()->addDebug('hello world');
+        $this->getMonologService()->debug('hello world');
     }
 }
 
@@ -87,8 +87,8 @@ By default it write logs to `data/logs/application.log`. If you want change this
 now you can use it
 
 ```php
-$serviceLocator->get('EnliteMonologService')->addDebug('hello world');
-$serviceLocator->get('MyChromeLogger')->addInfo('hello world');
+$serviceLocator->get('EnliteMonologService')->debug('hello world');
+$serviceLocator->get('MyChromeLogger')->debug('hello world');
 ```
 
 ## Contributing

composer.json

@@ -21,7 +21,7 @@
     "require": {
         "php": "^7.1",
         "container-interop/container-interop": "^1.0",
-        "monolog/monolog": "^1.0.2",
+        "monolog/monolog": "^1.3 || ^2.0",
         "zendframework/zend-modulemanager": "^2",
         "zendframework/zend-stdlib": "^2 || ^3",
         "zendframework/zend-servicemanager": "^2 || ^3"
@@ -30,7 +30,7 @@
         "jakub-onderka/php-parallel-lint": "^1.0",
         "johnkary/phpunit-speedtrap": "^3.0",
         "squizlabs/php_codesniffer": "^3.0",
-        "phpunit/phpunit": "^8 | ^7.5.15"
+        "phpunit/phpunit": "^7.5.20 || ^8.5.2"
     },
     "autoload": {
         "psr-4": {

src/EnliteMonolog/Service/MonologServiceFactory.php

@@ -11,6 +11,7 @@
 use Interop\Container\Exception\ContainerException;
 use Interop\Container\Exception\NotFoundException;
 use InvalidArgumentException;
+use Monolog\Handler\FormattableHandlerInterface;
 use Monolog\Handler\HandlerInterface;
 use Monolog\Logger;
 use Monolog\Formatter\FormatterInterface;
@@ -93,7 +94,6 @@ public function createHandler($container, MonologOptions $options, $handler)
             return $container->get($handler);
         }
 
-
         if (!isset($handler['name'])) {
             throw new RuntimeException('Cannot create logger handler');
         }
@@ -130,8 +130,18 @@ public function createHandler($container, MonologOptions $options, $handler)
         }
 
         if (isset($handler['formatter'])) {
-            $formatter = $this->createFormatter($container, $handler['formatter']);
-            $instance->setFormatter($formatter);
+            if ($instance instanceof FormattableHandlerInterface
+                || !defined('Monolog\Logger::API')
+                || \Monolog\Logger::API === 1) {
+                $formatter = $this->createFormatter($container, $handler['formatter']);
+                $instance->setFormatter($formatter);
+            } else {
+                throw new RuntimeException(sprintf(
+                    'Handler(%s) doesn\'t implements %s to attach formatter.',
+                    $handlerClassName,
+                    FormattableHandlerInterface::class
+                ));
+            }
         }
 
         return $instance;

test/EnliteMonologTest/Service/FormatterMock.php

@@ -1,46 +1,92 @@
 <?php
 
+// @codingStandardsIgnoreFile
+
 namespace EnliteMonologTest\Service;
 
 use Monolog\Formatter\FormatterInterface;
 
-class FormatterMock implements FormatterInterface
-{
-    /** @var callable */
-    private $encoder;
-
-    /**
-     * FormatterMock constructor.
-     * @param callable $encoder
-     */
-    public function __construct($encoder)
+if (interface_exists(FormatterInterface::class)) {
+    class FormatterMock implements FormatterInterface
     {
-        if (!is_callable($encoder)) {
-            throw new \RuntimeException('Encoder must be callable.');
+        /** @var callable */
+        private $encoder;
+
+        /**
+         * FormatterMock constructor.
+         * @param callable $encoder
+         */
+        public function __construct($encoder)
+        {
+            if (!is_callable($encoder)) {
+                throw new \RuntimeException('Encoder must be callable.');
+            }
+
+            $this->encoder = $encoder;
         }
 
-        $this->encoder = $encoder;
-    }
+        /**
+         * Formats a log record.
+         *
+         * @param  array $record A record to format
+         * @return mixed The formatted record
+         */
+        public function format(array $record)
+        {
+            return call_user_func($this->encoder, $record);
+        }
 
-    /**
-     * Formats a log record.
-     *
-     * @param  array $record A record to format
-     * @return mixed The formatted record
-     */
-    public function format(array $record)
-    {
-        return call_user_func($this->encoder, $record);
+        /**
+         * Formats a set of log records.
+         *
+         * @param  array $records A set of records to format
+         * @return mixed The formatted set of records
+         */
+        public function formatBatch(array $records)
+        {
+            return array_map(array($this, 'format'), $records);
+        }
     }
 
-    /**
-     * Formats a set of log records.
-     *
-     * @param  array $records A set of records to format
-     * @return mixed The formatted set of records
-     */
-    public function formatBatch(array $records)
+} else {
+    class FormatterMock
     {
-        return array_map(array($this, 'format'), $records);
+        /** @var callable */
+        private $encoder;
+
+        /**
+         * FormatterMock constructor.
+         * @param callable $encoder
+         */
+        public function __construct($encoder)
+        {
+            if (!is_callable($encoder)) {
+                throw new \RuntimeException('Encoder must be callable.');
+            }
+
+            $this->encoder = $encoder;
+        }
+
+        /**
+         * Formats a log record.
+         *
+         * @param  array $record A record to format
+         * @return mixed The formatted record
+         */
+        public function format(array $record)
+        {
+            return call_user_func($this->encoder, $record);
+        }
+
+        /**
+         * Formats a set of log records.
+         *
+         * @param  array $records A set of records to format
+         * @return mixed The formatted set of records
+         */
+        public function formatBatch(array $records)
+        {
+            return array_map(array($this, 'format'), $records);
+        }
     }
 }

test/EnliteMonologTest/Service/FormatterPrivateConstructorMock.php

@@ -1,43 +1,84 @@
 <?php
+// @codingStandardsIgnoreFile
 
 namespace EnliteMonologTest\Service;
 
 use Monolog\Formatter\FormatterInterface;
 
-final class FormatterPrivateConstructorMock implements FormatterInterface
-{
-    /**
-     * FormatterNamedFactoryMock constructor.
-     */
-    private function __construct()
+if (interface_exists(FormatterInterface::class)) {
+    final class FormatterPrivateConstructorMock implements FormatterInterface
     {
-    }
+        /**
+         * FormatterNamedFactoryMock constructor.
+         */
+        private function __construct()
+        {
+        }
 
-    public static function create()
-    {
-        return new self;
-    }
+        public static function create()
+        {
+            return new self;
+        }
 
 
-    /**
-     * Formats a log record.
-     *
-     * @param  array $record A record to format
-     * @return mixed The formatted record
-     */
-    public function format(array $record)
-    {
-        return json_encode($record);
-    }
+        /**
+         * Formats a log record.
+         *
+         * @param  array $record A record to format
+         * @return mixed The formatted record
+         */
+        public function format(array $record)
+        {
+            return json_encode($record);
+        }
 
-    /**
-     * Formats a set of log records.
-     *
-     * @param  array $records A set of records to format
-     * @return mixed The formatted set of records
-     */
-    public function formatBatch(array $records)
+        /**
+         * Formats a set of log records.
+         *
+         * @param  array $records A set of records to format
+         * @return mixed The formatted set of records
+         */
+        public function formatBatch(array $records)
+        {
+            return array_map(array($this, 'format'), $records);
+        }
+    }
+} else {
+    final class FormatterPrivateConstructorMock
     {
-        return array_map(array($this, 'format'), $records);
+        /**
+         * FormatterNamedFactoryMock constructor.
+         */
+        private function __construct()
+        {
+        }
+
+        public static function create()
+        {
+            return new self;
+        }
+
+
+        /**
+         * Formats a log record.
+         *
+         * @param  array $record A record to format
+         * @return mixed The formatted record
+         */
+        public function format(array $record)
+        {
+            return json_encode($record);
+        }
+
+        /**
+         * Formats a set of log records.
+         *
+         * @param  array $records A set of records to format
+         * @return mixed The formatted set of records
+         */
+        public function formatBatch(array $records)
+        {
+            return array_map(array($this, 'format'), $records);
+        }
     }
 }