Implements v1.2 version

.gitattributes

@@ -0,0 +1,9 @@
+/.github                export-ignore
+/tests                  export-ignore
+/phpunit.xml.dist       export-ignore
+/.gitattributes         export-ignore
+/.gitignore             export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/psalm.xml              export-ignore
+
+*.php diff=php

.github/workflows/.editorconfig

@@ -0,0 +1,2 @@
+[{*.yaml,*.yml}]
+indent_size = 2

.github/workflows/ci.yaml

@@ -0,0 +1,48 @@
+name: Plugin CI
+on:
+  push:
+    branches: [ 'master' ]
+  pull_request:
+
+env:
+  PHP_CS_FIXER_IGNORE_ENV: 1
+  XDEBUG_MODE: coverage
+
+jobs:
+  tests:
+    name: "Tests ${{ matrix.php-version }} deps ${{ matrix.dependency-versions }}"
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # normal, highest, non-dev installs
+        php-version: [ '8.2' ]
+        dependency-versions: [ 'highest' ]
+        include:
+          # testing lowest PHP version with the lowest dependencies
+  #        - php-version: '8.2'
+  #          dependency-versions: 'lowest'
+
+          # testing dev versions with the highest PHP
+          - php-version: '8.2'
+            dependency-versions: 'highest'
+
+    steps:
+      - name: "Checkout code"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+
+      - name: "Composer install"
+        uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: "${{ matrix.dependency-versions }}"
+          composer-options: "--prefer-dist --no-progress"
+
+      - name: Run tests
+        run: composer run test

.gitignore

@@ -1,3 +1,9 @@
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
+.php-cs-fixer.cache
+test-coverage-report
+phpunit.xml
+.php-cs-fixer.php
+phpstan.neon

.php-cs-fixer.dist.php

@@ -0,0 +1,32 @@
+<?php
+
+if (!file_exists(__DIR__.'/src')) {
+    exit(0);
+}
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__.'/src')
+    ->in(__DIR__.'/tests')
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules(array(
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'strict_param' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'protected_to_private' => false,
+        'semicolon_after_instruction' => false,
+        'header_comment' => [
+            'header' => <<<EOF
+ This file is part of the Micro framework package.
+ 
+ (c) Stanislau Komar <[email protected]>
+ 
+ For the full copyright and license information, please view the LICENSE
+ file that was distributed with this source code.
+EOF
+        ]
+    ))
+    ->setRiskyAllowed(true)
+    ->setFinder($finder);

composer.json

@@ -1,22 +1,61 @@
 {
     "name": "micro/plugin-logger-monolog",
-    "description": "Micro Framework: Implements \"micro/plugin-logger-core\" based on Monolog.",
+    "description": "Micro Framework: Monolog logger adapter for  \"micro/plugin-logger-core\".",
+    "license": "MIT",
     "type": "library",
-    "version": "1.1",
+    "authors": [
+        {
+            "name": "Stanislau.Komar",
+            "email": "[email protected]"
+        }
+    ],
     "require": {
-        "monolog/monolog": "2.3.*",
-        "micro/plugin-logger-core": "^1"
+        "micro/kernel-boot-plugin-depended": "^1",
+        "micro/plugin-logger-core": "dev-master",
+        "monolog/monolog": "^3"
+    },
+    "require-dev": {
+        "ergebnis/composer-normalize": "^2.29",
+        "friendsofphp/php-cs-fixer": "^3.13",
+        "phpstan/phpstan": "^1.9",
+        "phpunit/php-code-coverage": "^9.2",
+        "phpunit/phpunit": "^9.5",
+        "vimeo/psalm": "^5.2"
     },
-    "license": "MIT",
     "autoload": {
         "psr-4": {
             "Micro\\Plugin\\Logger\\Monolog\\": "src/"
         }
     },
-    "authors": [
-        {
-            "name": "Stanislau.Komar",
-            "email": "[email protected]"
+    "autoload-dev": {
+        "psr-4": {
+            "Micro\\Plugin\\Logger\\Monolog\\Test\\Unit\\": "tests/Unit"
         }
-    ]
+    },
+    "config": {
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true
+        },
+        "sort-packages": true
+    },
+    "scripts": {
+        "coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-text",
+        "coverage-html": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html ./test-coverage-report",
+        "php-cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --using-cache=no",
+        "php-cs-try": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no",
+        "phpstan": "./vendor/bin/phpstan analyze --no-progress",
+        "phpunit": "./vendor/bin/phpunit",
+        "psalm": "./vendor/bin/psalm --no-progress --show-info=true",
+        "statics": [
+            "@phpstan",
+            "@psalm",
+            "@php-cs-try"
+        ],
+        "test": [
+            "@statics",
+            "composer validate --strict",
+            "composer normalize",
+            "@coverage"
+        ]
+    }
 }

phpstan.neon.dist

@@ -0,0 +1,4 @@
+parameters:
+    level: 7
+    paths:
+        - src

phpunit.xml.dist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://phpunit.readthedocs.io/en/9.5/configuration.html#the-phpunit-element -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         backupGlobals="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" force="true"/>
+    </php>
+    <testsuites>
+        <testsuite name="Unit tests">
+            <directory>tests/Unit</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+            <exclude>
+                <directory>src/Exception</directory>
+                <file>src/LoggerMonologPlugin.php</file>
+            </exclude>
+        </whitelist>
+    </filter>
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <report>
+            <html outputDirectory="test-coverage-report/" />
+        </report>
+    </coverage>
+</phpunit>

psalm.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<psalm
+        errorLevel="2"
+        resolveFromConfigFile="true"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="https://getpsalm.org/schema/config"
+        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+
+    </projectFiles>
+
+    <issueHandlers>
+
+        <UnnecessaryVarAnnotation>
+            <errorLevel type="suppress">
+                <file name="src/LoggerMonologPlugin.php"/>
+            </errorLevel>
+        </UnnecessaryVarAnnotation>
+
+        <MissingConstructor>
+            <errorLevel type="suppress">
+                <file name="src/LoggerMonologPlugin.php"/>
+            </errorLevel>
+        </MissingConstructor>
+
+        <ImplementedReturnTypeMismatch>
+            <errorLevel type="suppress">
+                <file name="src/LoggerMonologPlugin.php"/>
+            </errorLevel>
+        </ImplementedReturnTypeMismatch>
+    </issueHandlers>
+
+</psalm>

src/Business/Factory/LoggerFactory.php

@@ -1,37 +1,39 @@
 <?php
 
+/*
+ *  This file is part of the Micro framework package.
+ *
+ *  (c) Stanislau Komar <[email protected]>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
 namespace Micro\Plugin\Logger\Monolog\Business\Factory;
 
 use Micro\Plugin\Logger\Business\Factory\LoggerFactoryInterface;
+use Micro\Plugin\Logger\Configuration\LoggerProviderTypeConfigurationInterface;
 use Micro\Plugin\Logger\Monolog\Business\Handler\HandlerResolverFactoryInterface;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
 
-class LoggerFactory implements LoggerFactoryInterface
+readonly class LoggerFactory implements LoggerFactoryInterface
 {
-    /**
-     * @param HandlerResolverFactoryInterface $handlerResolverFactory
-     */
     public function __construct(
-    private HandlerResolverFactoryInterface $handlerResolverFactory
-    )
-    {
+        private HandlerResolverFactoryInterface $handlerResolverFactory
+    ) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function create(string $loggerName): LoggerInterface
+    public function create(LoggerProviderTypeConfigurationInterface $loggerProviderTypeConfiguration): LoggerInterface
     {
-        $logger                     = new Logger($loggerName);
+        $logger = new Logger($loggerProviderTypeConfiguration->getLoggerName());
         $handlerCollectionGenerator = $this->handlerResolverFactory
-            ->create($loggerName)
+            ->create($loggerProviderTypeConfiguration)
             ->resolve();
 
-
         $handlerCollection = iterator_to_array($handlerCollectionGenerator);
 
-        $logger->setHandlers($handlerCollection);
+        $logger->setHandlers(array_values($handlerCollection));
 
         return $logger;
     }

src/Business/Handler/HandlerFactory.php

@@ -1,31 +1,32 @@
 <?php
 
+/*
+ *  This file is part of the Micro framework package.
+ *
+ *  (c) Stanislau Komar <[email protected]>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
 namespace Micro\Plugin\Logger\Monolog\Business\Handler;
 
 use Micro\Component\DependencyInjection\Container;
 use Micro\Plugin\Logger\Monolog\Configuration\Handler\HandlerConfigurationFactoryInterface;
 use Monolog\Handler\HandlerInterface;
 
-class HandlerFactory implements HandlerFactoryInterface
+readonly class HandlerFactory implements HandlerFactoryInterface
 {
-    /**
-     * @param HandlerConfigurationFactoryInterface $handlerConfigurationFactory
-     */
     public function __construct(
-    private Container $container,
-    private HandlerConfigurationFactoryInterface $handlerConfigurationFactory
-    )
-    {
+        private Container $container,
+        private HandlerConfigurationFactoryInterface $handlerConfigurationFactory
+    ) {
     }
 
-    /**
-     * @param string $handlerName
-     * @return HandlerInterface
-     */
     public function create(string $handlerName): HandlerInterface
     {
         $handlerConfiguration = $this->handlerConfigurationFactory->create($handlerName);
-        $handlerClassName     = $handlerConfiguration->getHandlerClassName();
+        $handlerClassName = $handlerConfiguration->getHandlerClassName();
 
         return new $handlerClassName(
             $this->container,

src/Business/Handler/HandlerFactoryInterface.php

@@ -1,15 +1,19 @@
 <?php
 
+/*
+ *  This file is part of the Micro framework package.
+ *
+ *  (c) Stanislau Komar <[email protected]>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
 namespace Micro\Plugin\Logger\Monolog\Business\Handler;
 
 use Monolog\Handler\HandlerInterface;
 
 interface HandlerFactoryInterface
 {
-    /**
-     * @param string $handlerName
-     *
-     * @return HandlerInterface
-     */
     public function create(string $handlerName): HandlerInterface;
 }