Commit 2d51d593 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Abandon de la bibliothèque laminas/laminas-log dépréciée (PHP 8.2 minimum).

parent 3dc5a3b1
Loading
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -3,4 +3,8 @@ CHANGELOG

1.0.0
-----
- 
 No newline at end of file
- Première version.

2.0.0
-----
- Abandon de la bibliothèque laminas/laminas-log dépréciée (PHP 8.2 minimum).
+5 −5
Original line number Diff line number Diff line
@@ -2,18 +2,18 @@
    "name": "unicaen/sql",
    "description": "Module Unicaen avec des trucs pour SQL dedans !",
    "require": {
        "php": "^8.0",
        "doctrine/dbal": "^3.0",
        "php": "^8.2",
        "doctrine/dbal": "^3.0 || ^4.0",
        "laminas/laminas-config": "^3.9",
        "laminas/laminas-log": "^2.10",
        "laminas/laminas-servicemanager": "^3.0",
        "laminas/laminas-stdlib": "^3.10",
        "monolog/monolog": "^3.9",
        "unicaen/console": "^6.0",
        "webmozart/assert": "^1.10"
    },
    "require-dev": {
        "laminas/laminas-test": "^3.2",
        "phpunit/phpunit": "^5.6"
        "laminas/laminas-test": "^4.0",
        "phpunit/phpunit": ">=9.0"
    },
    "autoload": {
        "psr-0": {
+10 −14
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@
namespace UnicaenSql\Controller;

use Doctrine\DBAL\Connection;
use Laminas\Log\Filter\Priority;
use Laminas\Log\Formatter\Simple;
use Laminas\Log\Logger;
use Laminas\Log\LoggerAwareTrait;
use Laminas\Log\Writer\Stream;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerAwareTrait;
use RuntimeException;
use Unicaen\Console\Controller\AbstractConsoleController;
use UnicaenSql\Service\SQL\RunSQLServiceAwareTrait;
@@ -102,17 +101,14 @@ class ConsoleController extends AbstractConsoleController

    private function createLogger(): void
    {
        $filter = new Priority(Logger::INFO);
        $format = '%message%'; // "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n"
        $formatter = new LineFormatter($format);

        $format = '%message%'; // '%timestamp% %priorityName% (%priority%): %message%' . PHP_EOL;
        $formatter = new Simple($format);
        $handler = new StreamHandler('php://output', Logger::INFO);
        $handler->setFormatter($formatter);

        $writer = new Stream('php://output');
        $writer->addFilter($filter);
        $writer->setFormatter($formatter);

        $this->logger = new Logger();
        $this->logger->addWriter($writer);
        $this->logger = new Logger('console_logger');
        $this->logger->pushHandler($handler);
    }

    /**
+5 −5
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@

namespace UnicaenSql\Controller;

use Laminas\Log\Logger;
use Laminas\Log\LoggerInterface;
use Laminas\Log\Writer\Noop;
use Laminas\ServiceManager\Factory\FactoryInterface;
use Monolog\Handler\NoopHandler;
use Monolog\Logger;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
use UnicaenSql\Service\SQL\RunSQLService;

class ConsoleControllerFactory implements FactoryInterface
@@ -26,8 +26,8 @@ class ConsoleControllerFactory implements FactoryInterface

    private function createLogger(): LoggerInterface
    {
        $logger = new Logger();
        $logger->addWriter(new Noop());
        $logger = new Logger('noop_logger');
        $logger->pushHandler(new NoopHandler());

        return $logger;
    }
+9 −10
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@
namespace UnicaenSql\Service\SQL;

use Exception;
use Laminas\Log\Formatter\Simple;
use Laminas\Log\Logger;
use Laminas\Log\LoggerInterface;
use Laminas\Log\Writer\Stream;
use Laminas\Log\Writer\WriterInterface;
use LogicException;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
use Psr\Log\LoggerInterface;
use RuntimeException;

/**
@@ -26,7 +25,7 @@ abstract class ProcessResult implements ProcessResultInterface
    private $logStream;

    /**
     * @var WriterInterface
     * @var \Monolog\Handler\HandlerInterface
     */
    private $logWriter;

@@ -52,12 +51,12 @@ abstract class ProcessResult implements ProcessResultInterface

    public function __construct()
    {
        $format = '%message%'; // '%timestamp% %priorityName% (%priority%): %message%' . PHP_EOL;
        $formatter = new Simple($format);
        $format = '%message%'; // "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n"
        $formatter = new LineFormatter($format);

        $this->logStream = fopen('php://memory','r+');

        $this->logWriter = new Stream($this->logStream);
        $this->logWriter = new StreamHandler($this->logStream, Logger::INFO);
        $this->logWriter->setFormatter($formatter);

        $this->setStartMicrotime();
@@ -86,7 +85,7 @@ abstract class ProcessResult implements ProcessResultInterface
            throw new LogicException("Logger spécifié non supporté, désolé!");
        }

        $logger->addWriter($this->logWriter);
        $logger->pushHandler($this->logWriter);

        return $this;
    }
Loading