Skip to content

Commit 8209744

Browse files
committed
getLogger() is now private so the internal logger is not exposed in LoggerProxy. Unit test modified accordingly.
1 parent f3a5a90 commit 8209744

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed

Diff for: lib/internal/Magento/Framework/DB/Logger/LoggerProxy.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ public function __construct(
108108
* Get logger object. Initialize if needed.
109109
* @return LoggerInterface
110110
*/
111-
public function getLogger()
111+
private function getLogger()
112112
{
113-
if($this->logger === null) {
113+
if ($this->logger === null) {
114114
switch ($this->loggerAlias) {
115115
case self::LOGGER_ALIAS_FILE:
116116
$this->logger = $this->fileFactory->create(

Diff for: lib/internal/Magento/Framework/DB/Test/Unit/DB/Logger/LoggerProxyTest.php

+34-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ public function testNewWithAliasFile()
4242
->disableOriginalConstructor()
4343
->getMock();
4444

45+
$fileLoggerMock->expects($this->once())
46+
->method('log');
47+
4548
$fileLoggerFactoryMock = $this->getMockBuilder(FileFactory::class)
4649
->disableOriginalConstructor()
4750
->setMethods(['create'])
@@ -51,26 +54,54 @@ public function testNewWithAliasFile()
5154
->method('create')
5255
->willReturn($fileLoggerMock);
5356

57+
$quietLoggerMock = $this->getMockBuilder(Quiet::class)
58+
->disableOriginalConstructor()
59+
->getMock();
60+
61+
$quietLoggerMock->expects($this->never())
62+
->method('log');
63+
64+
$quietLoggerFactoryMock = $this->getMockBuilder(QuietFactory::class)
65+
->disableOriginalConstructor()
66+
->setMethods(['create'])
67+
->getMock();
68+
5469
$this->loggerProxy = $this->objectManager->getObject(
5570
LoggerProxy::class,
5671
[
5772
'fileFactory' => $fileLoggerFactoryMock,
73+
'quietFactory' => $quietLoggerFactoryMock,
5874
'loggerAlias' => LoggerProxy::LOGGER_ALIAS_FILE,
5975
]
6076
);
6177

62-
$this->assertInstanceOf(File::class, $this->loggerProxy->getLogger());
78+
$this->loggerProxy->log('test');
6379
}
6480

6581
/**
6682
* Test new logger proxy with disabled alias
6783
*/
6884
public function testNewWithAliasDisabled()
6985
{
86+
$fileLoggerMock = $this->getMockBuilder(File::class)
87+
->disableOriginalConstructor()
88+
->getMock();
89+
90+
$fileLoggerMock->expects($this->never())
91+
->method('log');
92+
93+
$fileLoggerFactoryMock = $this->getMockBuilder(FileFactory::class)
94+
->disableOriginalConstructor()
95+
->setMethods(['create'])
96+
->getMock();
97+
7098
$quietLoggerMock = $this->getMockBuilder(Quiet::class)
7199
->disableOriginalConstructor()
72100
->getMock();
73101

102+
$quietLoggerMock->expects($this->once())
103+
->method('log');
104+
74105
$quietLoggerFactoryMock = $this->getMockBuilder(QuietFactory::class)
75106
->disableOriginalConstructor()
76107
->setMethods(['create'])
@@ -83,11 +114,12 @@ public function testNewWithAliasDisabled()
83114
$this->loggerProxy = $this->objectManager->getObject(
84115
LoggerProxy::class,
85116
[
117+
'fileFactory' => $fileLoggerFactoryMock,
86118
'quietFactory' => $quietLoggerFactoryMock,
87119
'loggerAlias' => LoggerProxy::LOGGER_ALIAS_DISABLED,
88120
]
89121
);
90122

91-
$this->assertInstanceOf(Quiet::class, $this->loggerProxy->getLogger());
123+
$this->loggerProxy->log('test');
92124
}
93125
}

0 commit comments

Comments
 (0)