Skip to content

Commit d04026f

Browse files
committed
Merge pull request #3584 from ostrolucky/rem-addlogger
Remove LoggerChain::addLogger
2 parents 72a5e9f + c244c4e commit d04026f

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

UPGRADE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ The `Doctrine\DBAL\Driver::getName()` has been removed.
5353
* Removed `Table::addUnnamedForeignKeyConstraint()` and `Table::addNamedForeignKeyConstraint()`.
5454
* Removed `Table::renameColumn()`.
5555
* Removed `SQLParserUtils::getPlaceholderPositions()`.
56+
* Removed `LoggerChain::addLogger`.
5657
* Removed `AbstractSchemaManager::getFilterSchemaAssetsExpression()`, `Configuration::getFilterSchemaAssetsExpression()`
5758
and `Configuration::getFilterSchemaAssetsExpression()`.
5859
* `SQLParserUtils::*_TOKEN` constants made private.

lib/Doctrine/DBAL/Logging/LoggerChain.php

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,17 @@
99
*/
1010
final class LoggerChain implements SQLLogger
1111
{
12-
/** @var SQLLogger[] */
12+
/** @var iterable<SQLLogger> */
1313
private $loggers = [];
1414

1515
/**
16-
* @param SQLLogger[] $loggers
16+
* @param iterable<SQLLogger> $loggers
1717
*/
18-
public function __construct(array $loggers = [])
18+
public function __construct(iterable $loggers = [])
1919
{
2020
$this->loggers = $loggers;
2121
}
2222

23-
/**
24-
* Adds a logger in the chain.
25-
*
26-
* @deprecated Inject list of loggers via constructor instead
27-
*/
28-
public function addLogger(SQLLogger $logger) : void
29-
{
30-
$this->loggers[] = $logger;
31-
}
32-
3323
/**
3424
* {@inheritdoc}
3525
*/

tests/Doctrine/Tests/DBAL/Logging/LoggerChainTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,10 @@ public function testStopQuery() : void
3232
*/
3333
private function createChain(string $method, ...$args) : LoggerChain
3434
{
35-
$chain = new LoggerChain([
35+
return new LoggerChain([
36+
$this->createLogger($method, ...$args),
3637
$this->createLogger($method, ...$args),
3738
]);
38-
39-
$chain->addLogger($this->createLogger($method, ...$args));
40-
41-
return $chain;
4239
}
4340

4441
/**

0 commit comments

Comments
 (0)