minor #33492 [MonologBridge] Bump min version for monolog ^1.25 and drop dead code (lyrixx)
This PR was merged into the 4.4 branch.
Discussion
----------
[MonologBridge] Bump min version for monolog ^1.25 and drop dead code
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
Commits
-------
1e19c65b67
[MonologBridge] Bump min version for monolog ^1.25 and drop dead code
This commit is contained in:
commit
654b8037f1
@ -109,7 +109,7 @@
|
|||||||
"doctrine/reflection": "~1.0",
|
"doctrine/reflection": "~1.0",
|
||||||
"doctrine/doctrine-bundle": "~1.4",
|
"doctrine/doctrine-bundle": "~1.4",
|
||||||
"masterminds/html5": "^2.6",
|
"masterminds/html5": "^2.6",
|
||||||
"monolog/monolog": "~1.11",
|
"monolog/monolog": "^1.25.1",
|
||||||
"nyholm/psr7": "^1.0",
|
"nyholm/psr7": "^1.0",
|
||||||
"ocramius/proxy-manager": "^2.1",
|
"ocramius/proxy-manager": "^2.1",
|
||||||
"php-http/httplug": "^1.0|^2.0",
|
"php-http/httplug": "^1.0|^2.0",
|
||||||
|
@ -14,6 +14,8 @@ namespace Symfony\Bridge\Monolog\Handler;
|
|||||||
use Monolog\Formatter\FormatterInterface;
|
use Monolog\Formatter\FormatterInterface;
|
||||||
use Monolog\Formatter\LogstashFormatter;
|
use Monolog\Formatter\LogstashFormatter;
|
||||||
use Monolog\Handler\AbstractHandler;
|
use Monolog\Handler\AbstractHandler;
|
||||||
|
use Monolog\Handler\FormattableHandlerTrait;
|
||||||
|
use Monolog\Handler\ProcessableHandlerTrait;
|
||||||
use Monolog\Logger;
|
use Monolog\Logger;
|
||||||
use Symfony\Component\HttpClient\HttpClient;
|
use Symfony\Component\HttpClient\HttpClient;
|
||||||
use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
|
use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
|
||||||
|
@ -1,73 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This file is part of the Symfony package.
|
|
||||||
*
|
|
||||||
* (c) Fabien Potencier <fabien@symfony.com>
|
|
||||||
*
|
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This file is part of the Monolog package.
|
|
||||||
*
|
|
||||||
* (c) Jordi Boggiano <j.boggiano@seld.be>
|
|
||||||
*
|
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Symfony\Bridge\Monolog\Handler;
|
|
||||||
|
|
||||||
use Monolog\Formatter\FormatterInterface;
|
|
||||||
use Monolog\Formatter\LineFormatter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper trait for implementing FormattableInterface.
|
|
||||||
*
|
|
||||||
* @author Jordi Boggiano <j.boggiano@seld.be>
|
|
||||||
*
|
|
||||||
* @internal
|
|
||||||
*/
|
|
||||||
trait FormattableHandlerTrait
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @var FormatterInterface
|
|
||||||
*/
|
|
||||||
protected $formatter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*
|
|
||||||
* @suppress PhanTypeMismatchReturn
|
|
||||||
*/
|
|
||||||
public function setFormatter(FormatterInterface $formatter): HandlerInterface
|
|
||||||
{
|
|
||||||
$this->formatter = $formatter;
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*/
|
|
||||||
public function getFormatter(): FormatterInterface
|
|
||||||
{
|
|
||||||
if (!$this->formatter) {
|
|
||||||
$this->formatter = $this->getDefaultFormatter();
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->formatter;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the default formatter.
|
|
||||||
*
|
|
||||||
* Overwrite this if the LineFormatter is not a good default for your handler.
|
|
||||||
*/
|
|
||||||
protected function getDefaultFormatter(): FormatterInterface
|
|
||||||
{
|
|
||||||
return new LineFormatter();
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,74 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This file is part of the Symfony package.
|
|
||||||
*
|
|
||||||
* (c) Fabien Potencier <fabien@symfony.com>
|
|
||||||
*
|
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Symfony\Bridge\Monolog\Handler;
|
|
||||||
|
|
||||||
use Monolog\ResettableInterface;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper trait for implementing ProcessableInterface.
|
|
||||||
*
|
|
||||||
* @author Jordi Boggiano <j.boggiano@seld.be>
|
|
||||||
*
|
|
||||||
* @internal
|
|
||||||
*/
|
|
||||||
trait ProcessableHandlerTrait
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @var callable[]
|
|
||||||
*/
|
|
||||||
protected $processors = [];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*
|
|
||||||
* @suppress PhanTypeMismatchReturn
|
|
||||||
*/
|
|
||||||
public function pushProcessor($callback): HandlerInterface
|
|
||||||
{
|
|
||||||
array_unshift($this->processors, $callback);
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*/
|
|
||||||
public function popProcessor(): callable
|
|
||||||
{
|
|
||||||
if (!$this->processors) {
|
|
||||||
throw new \LogicException('You tried to pop from an empty processor stack.');
|
|
||||||
}
|
|
||||||
|
|
||||||
return array_shift($this->processors);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes a record.
|
|
||||||
*/
|
|
||||||
protected function processRecord(array $record): array
|
|
||||||
{
|
|
||||||
foreach ($this->processors as $processor) {
|
|
||||||
$record = $processor($record);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $record;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function resetProcessors()
|
|
||||||
{
|
|
||||||
foreach ($this->processors as $processor) {
|
|
||||||
if ($processor instanceof ResettableInterface) {
|
|
||||||
$processor->reset();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -17,7 +17,7 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1.3",
|
"php": "^7.1.3",
|
||||||
"monolog/monolog": "~1.19",
|
"monolog/monolog": "^1.25.1",
|
||||||
"symfony/service-contracts": "^1.1",
|
"symfony/service-contracts": "^1.1",
|
||||||
"symfony/http-kernel": "^4.3"
|
"symfony/http-kernel": "^4.3"
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user