Skip to content

Commit d3498b8

Browse files
author
Yevhen Miroshnychenko
committed
MC-19421: Reduce q-ty of Reports Created in /app/*/var/report
1 parent e3bd5f2 commit d3498b8

File tree

6 files changed

+68
-50
lines changed

6 files changed

+68
-50
lines changed

‎dev/tests/integration/testsuite/Magento/Framework/Error/ProcessorTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ProcessorTest extends \PHPUnit\Framework\TestCase
1919
/**
2020
* @inheritdoc
2121
*/
22-
public function setUp()
22+
protected function setUp()
2323
{
2424
$this->processor = $this->createProcessor();
2525
}
@@ -28,7 +28,7 @@ public function setUp()
2828
* {@inheritdoc}
2929
* @throws \Exception
3030
*/
31-
public function tearDown()
31+
protected function tearDown()
3232
{
3333
$reportDir = $this->processor->_reportDir;
3434
$this->removeDirRecursively($reportDir);
@@ -45,7 +45,7 @@ public function testSaveAndLoadReport(
4545
int $logReportDirNestingLevelChanged,
4646
string $exceptionMessage
4747
) {
48-
$_ENV['MAGE_LOG_REPORT_DIR_NESTING_LEVEL'] = $logReportDirNestingLevel;
48+
$_ENV['MAGE_ERROR_REPORT_DIR_NESTING_LEVEL'] = $logReportDirNestingLevel;
4949
$reportData = [
5050
0 => $exceptionMessage,
5151
1 => 'exceptionTrace',
@@ -60,7 +60,7 @@ public function testSaveAndLoadReport(
6060
$this->fail("Failed to generate report id");
6161
}
6262
$this->assertEquals($expectedReportData, $processor->reportData);
63-
$_ENV['MAGE_LOG_REPORT_DIR_NESTING_LEVEL'] = $logReportDirNestingLevelChanged;
63+
$_ENV['MAGE_ERROR_REPORT_DIR_NESTING_LEVEL'] = $logReportDirNestingLevelChanged;
6464
$processor = $this->createProcessor();
6565
$processor->loadReport($reportId);
6666
$this->assertEquals($expectedReportData, $processor->reportData, "File contents of report don't match");

‎lib/internal/Magento/Framework/App/ExceptionHandler.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ExceptionHandler implements ExceptionHandlerInterface
2525
/**
2626
* @var Filesystem
2727
*/
28-
protected $_filesystem;
28+
private $filesystem;
2929

3030
/**
3131
* @var LoggerInterface
@@ -48,7 +48,7 @@ public function __construct(
4848
LoggerInterface $logger
4949
) {
5050
$this->encryptor = $encryptor;
51-
$this->_filesystem = $filesystem;
51+
$this->filesystem = $filesystem;
5252
$this->logger = $logger;
5353
}
5454

@@ -166,7 +166,7 @@ private function handleBootstrapErrors(
166166
$bootstrapCode = $bootstrap->getErrorCode();
167167
if (Bootstrap::ERR_MAINTENANCE == $bootstrapCode) {
168168
// phpcs:ignore Magento2.Security.IncludeFile
169-
require $this->_filesystem
169+
require $this->filesystem
170170
->getDirectoryRead(DirectoryList::PUB)
171171
->getAbsolutePath('errors/503.php');
172172
return true;
@@ -214,7 +214,7 @@ private function handleInitException(\Exception $exception): bool
214214
if ($exception instanceof InitException) {
215215
$this->logger->critical($exception);
216216
// phpcs:ignore Magento2.Security.IncludeFile
217-
require $this->_filesystem
217+
require $this->filesystem
218218
->getDirectoryRead(DirectoryList::PUB)
219219
->getAbsolutePath('errors/404.php');
220220
return true;
@@ -250,7 +250,7 @@ private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception
250250
$reportData['report_id'] = $this->encryptor->getHash(implode('', $reportData));
251251
$this->logger->critical($exception, ['report_id' => $reportData['report_id']]);
252252
// phpcs:ignore Magento2.Security.IncludeFile
253-
require $this->_filesystem
253+
require $this->filesystem
254254
->getDirectoryRead(DirectoryList::PUB)
255255
->getAbsolutePath('errors/report.php');
256256
return true;
@@ -268,7 +268,7 @@ private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception
268268
private function redirectToSetup(Bootstrap $bootstrap, \Exception $exception, ResponseHttp $response)
269269
{
270270
$setupInfo = new SetupInfo($bootstrap->getParams());
271-
$projectRoot = $this->_filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath();
271+
$projectRoot = $this->filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath();
272272
if ($setupInfo->isAvailable()) {
273273
$response->setRedirect($setupInfo->getUrl());
274274
$response->sendHeaders();

‎lib/internal/Magento/Framework/App/Http.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Framework\App\Response\Http as ResponseHttp;
1010
use Magento\Framework\App\Response\HttpInterface;
1111
use Magento\Framework\Controller\ResultInterface;
12-
use Magento\Framework\Event;
1312
use Magento\Framework\ObjectManager\ConfigLoaderInterface;
1413
use Magento\Framework\Exception\LocalizedException;
1514
use Magento\Framework\ObjectManagerInterface;
@@ -70,7 +69,7 @@ class Http implements \Magento\Framework\AppInterface
7069

7170
/**
7271
* @param ObjectManagerInterface $objectManager
73-
* @param Event\Manager $eventManager
72+
* @param Manager $eventManager
7473
* @param AreaList $areaList
7574
* @param RequestHttp $request
7675
* @param ResponseHttp $response
@@ -81,7 +80,7 @@ class Http implements \Magento\Framework\AppInterface
8180
*/
8281
public function __construct(
8382
ObjectManagerInterface $objectManager,
84-
Event\Manager $eventManager,
83+
Manager $eventManager,
8584
AreaList $areaList,
8685
RequestHttp $request,
8786
ResponseHttp $response,

‎lib/internal/Magento/Framework/App/Test/Unit/ExceptionHandlerTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ class ExceptionHandlerTest extends \PHPUnit\Framework\TestCase
4949
/**
5050
* @var LoggerInterface|MockObject
5151
*/
52-
protected $loggerMock;
52+
private $loggerMock;
5353

5454
/**
5555
* @var ResponseHttp|MockObject
5656
*/
57-
protected $responseMock;
57+
private $responseMock;
5858

5959
/**
6060
* @var RequestHttp|MockObject
6161
*/
62-
protected $requestMock;
62+
private $requestMock;
6363

6464
protected function setUp()
6565
{

‎lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php‎

Lines changed: 52 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,100 @@
55
*/
66
namespace Magento\Framework\App\Test\Unit;
77

8+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as HelperObjectManager;
9+
use PHPUnit_Framework_MockObject_MockObject as MockObject;
10+
use Magento\Framework\App\Request\Http as RequestHttp;
11+
use Magento\Framework\App\Response\Http as ResponseHttp;
12+
use Magento\Framework\App\Http as AppHttp;
13+
use Magento\Framework\App\FrontControllerInterface;
14+
use Magento\Framework\Event\Manager;
15+
use Magento\Framework\ObjectManagerInterface;
16+
use Magento\Framework\App\AreaList;
17+
use Magento\Framework\App\ObjectManager\ConfigLoader;
18+
use Magento\Framework\App\ExceptionHandlerInterface;
19+
use Magento\Framework\Stdlib\Cookie\CookieReaderInterface;
20+
use Magento\Framework\App\Route\ConfigInterface\Proxy;
21+
use Magento\Framework\App\Request\PathInfoProcessorInterface;
22+
use Magento\Framework\Stdlib\StringUtils;
23+
824
/**
925
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1026
*/
1127
class HttpTest extends \PHPUnit\Framework\TestCase
1228
{
1329
/**
14-
* @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
30+
* @var HelperObjectManager
1531
*/
16-
protected $objectManager;
32+
private $objectManager;
1733

1834
/**
19-
* @var \PHPUnit_Framework_MockObject_MockObject
35+
* @var ResponseHttp|MockObject
2036
*/
21-
protected $responseMock;
37+
private $responseMock;
2238

2339
/**
24-
* @var \Magento\Framework\App\Http
40+
* @var AppHttp
2541
*/
26-
protected $http;
42+
private $http;
2743

2844
/**
29-
* @var \PHPUnit_Framework_MockObject_MockObject
45+
* @var FrontControllerInterface|MockObject
3046
*/
31-
protected $frontControllerMock;
47+
private $frontControllerMock;
3248

3349
/**
34-
* @var \PHPUnit_Framework_MockObject_MockObject
50+
* @var Manager|MockObject
3551
*/
36-
protected $eventManagerMock;
52+
private $eventManagerMock;
3753

3854
/**
39-
* @var \PHPUnit_Framework_MockObject_MockObject
55+
* @var RequestHttp|MockObject
4056
*/
41-
protected $requestMock;
57+
private $requestMock;
4258

4359
/**
44-
* @var \PHPUnit_Framework_MockObject_MockObject
60+
* @var ObjectManagerInterface|MockObject
4561
*/
46-
protected $objectManagerMock;
62+
private $objectManagerMock;
4763

4864
/**
49-
* @var \PHPUnit_Framework_MockObject_MockObject
65+
* @var AreaList|MockObject
5066
*/
51-
protected $areaListMock;
67+
private $areaListMock;
5268

5369
/**
54-
* @var \PHPUnit_Framework_MockObject_MockObject
70+
* @var ConfigLoader|MockObject
5571
*/
56-
protected $configLoaderMock;
72+
private $configLoaderMock;
5773

5874
/**
59-
* @var \PHPUnit_Framework_MockObject_MockObject
75+
* @var ExceptionHandlerInterface|MockObject
6076
*/
61-
protected $exceptionHandlerMock;
77+
private $exceptionHandlerMock;
6278

79+
/**
80+
* @inheritdoc
81+
*/
6382
protected function setUp()
6483
{
65-
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
66-
$cookieReaderMock = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class)
84+
$this->objectManager = new HelperObjectManager($this);
85+
$cookieReaderMock = $this->getMockBuilder(CookieReaderInterface::class)
6786
->disableOriginalConstructor()
6887
->getMock();
69-
$routeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Route\ConfigInterface\Proxy::class)
88+
$routeConfigMock = $this->getMockBuilder(Proxy::class)
7089
->disableOriginalConstructor()
7190
->getMock();
72-
$pathInfoProcessorMock = $this->getMockBuilder(\Magento\Framework\App\Request\PathInfoProcessorInterface::class)
91+
$pathInfoProcessorMock = $this->getMockBuilder(PathInfoProcessorInterface::class)
7392
->disableOriginalConstructor()
7493
->getMock();
75-
$converterMock = $this->getMockBuilder(\Magento\Framework\Stdlib\StringUtils::class)
94+
$converterMock = $this->getMockBuilder(StringUtils::class)
7695
->disableOriginalConstructor()
7796
->setMethods(['cleanString'])
7897
->getMock();
79-
$objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
98+
$objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
8099
->disableOriginalConstructor()
81100
->getMock();
82-
$this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
101+
$this->requestMock = $this->getMockBuilder(RequestHttp::class)
83102
->setConstructorArgs(
84103
[
85104
'cookieReader' => $cookieReaderMock,
@@ -91,28 +110,28 @@ protected function setUp()
91110
)
92111
->setMethods(['getFrontName', 'isHead'])
93112
->getMock();
94-
$this->areaListMock = $this->getMockBuilder(\Magento\Framework\App\AreaList::class)
113+
$this->areaListMock = $this->getMockBuilder(AreaList::class)
95114
->disableOriginalConstructor()
96115
->setMethods(['getCodeByFrontName'])
97116
->getMock();
98117
$this->configLoaderMock = $this->getMockBuilder(\Magento\Framework\App\ObjectManager\ConfigLoader::class)
99118
->disableOriginalConstructor()
100119
->setMethods(['load'])
101120
->getMock();
102-
$this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
103-
$this->responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
121+
$this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
122+
$this->responseMock = $this->createMock(ResponseHttp::class);
104123
$this->frontControllerMock = $this->getMockBuilder(\Magento\Framework\App\FrontControllerInterface::class)
105124
->disableOriginalConstructor()
106125
->setMethods(['dispatch'])
107126
->getMock();
108-
$this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\Manager::class)
127+
$this->eventManagerMock = $this->getMockBuilder(Manager::class)
109128
->disableOriginalConstructor()
110129
->setMethods(['dispatch'])
111130
->getMock();
112-
$this->exceptionHandlerMock = $this->createMock(\Magento\Framework\App\ExceptionHandlerInterface::class);
131+
$this->exceptionHandlerMock = $this->createMock(ExceptionHandlerInterface::class);
113132

114133
$this->http = $this->objectManager->getObject(
115-
\Magento\Framework\App\Http::class,
134+
AppHttp::class,
116135
[
117136
'objectManager' => $this->objectManagerMock,
118137
'eventManager' => $this->eventManagerMock,

‎pub/errors/processor.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ private function getReportPath(int $reportDirNestingLevel, string $reportId): st
612612
*/
613613
private function getReportDirNestingLevel(string $reportId): int
614614
{
615-
$envName = 'MAGE_LOG_REPORT_DIR_NESTING_LEVEL';
615+
$envName = 'MAGE_ERROR_REPORT_DIR_NESTING_LEVEL';
616616
$value = $_ENV[$envName] ?? getenv($envName);
617617
if(false === $value && property_exists($this->_config, 'dir_nesting_level')) {
618618
$value = $this->_config->dir_nesting_level;

0 commit comments

Comments
 (0)