Skip to content

Commit 25af55e

Browse files
Fix static tests failure and updated request changes
1 parent 9e31377 commit 25af55e

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

lib/internal/Magento/Framework/Session/SaveHandler.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\Framework\Session;
88

9+
use Magento\Framework\App\Area;
910
use Magento\Framework\App\ObjectManager;
1011
use Magento\Framework\App\State;
1112
use Magento\Framework\Exception\LocalizedException;
@@ -51,7 +52,10 @@ class SaveHandler implements SaveHandlerInterface
5152
*/
5253
private $sessionMaxSizeConfig;
5354

54-
private ?ManagerInterface $messageManager;
55+
/**
56+
* @var ManagerInterface
57+
*/
58+
private $messageManager;
5559

5660
/**
5761
* @var State|mixed
@@ -113,19 +117,17 @@ public function close()
113117
* @param string $sessionId
114118
* @return string
115119
*/
116-
public function read($sessionId)
120+
public function read($sessionId): string
117121
{
118122
$sessionData = $this->callSafely('read', $sessionId);
119123
$sessionMaxSize = $this->sessionMaxSizeConfig->getSessionMaxSize();
120124
$sessionSize = strlen($sessionData);
121125

122126
if ($sessionSize !== null && $sessionMaxSize < $sessionSize) {
123127
$sessionData = '';
124-
if ($this->appState->getAreaCode() == 'frontend') {
128+
if ($this->appState->getAreaCode() === Area::AREA_FRONTEND) {
125129
$this->messageManager->addErrorMessage(
126-
__(
127-
'There is an error. Please Contact store administrator.'
128-
)
130+
__('There is an error. Please Contact store administrator.')
129131
);
130132
}
131133
}
@@ -141,7 +143,7 @@ public function read($sessionId)
141143
* @return bool
142144
* @throws LocalizedException
143145
*/
144-
public function write($sessionId, $data)
146+
public function write($sessionId, $data): bool
145147
{
146148
$sessionMaxSize = $this->sessionMaxSizeConfig->getSessionMaxSize();
147149
$sessionSize = strlen($data);

lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerTest.php

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,35 @@ public function testWriteSessionMaxSizeNull()
119119
$this->assertTrue($this->saveHandler->write("test_session_id", "testdata"));
120120
}
121121

122-
public function testWriteMoreThanSessionMaxSize()
122+
/**
123+
* @throws \Magento\Framework\Exception\LocalizedException
124+
*/
125+
public function testWriteMoreThanSessionMaxSize(): void
123126
{
124127
$this->sessionMaxSizeConfigMock->expects($this->once())
125128
->method('getSessionMaxSize')
126129
->willReturn(1);
127130

128-
$this->saveHandlerAdapterMock->expects($this->any())
131+
$this->saveHandlerAdapterMock->expects($this->never())
132+
->method('read');
133+
134+
$this->assertTrue($this->saveHandler->write("test_session_id", "testdata"));
135+
}
136+
137+
/**
138+
* @return void
139+
*/
140+
public function testReadMoreThanSessionMaxSize(): void
141+
{
142+
$this->sessionMaxSizeConfigMock->expects($this->once())
143+
->method('getSessionMaxSize')
144+
->willReturn(1);
145+
146+
$this->saveHandlerAdapterMock->expects($this->once())
129147
->method('read')
130148
->with('test_session_id')
131149
->willReturn('test_session_data');
132150

133-
$this->assertTrue($this->saveHandler->write("test_session_id", "testdata"));
151+
$this->assertEquals(null, $this->saveHandler->read("test_session_id"));
134152
}
135153
}

0 commit comments

Comments
 (0)