Skip to content

Commit 2f9a0a9

Browse files
author
Oleksii Korshenko
committed
MAGETWO-67591: Replace Zend_Log with Psr\Log\LoggerInterface magento#9285
- Merge Pull Request magento#9285 from tdgroot/magento2:develop-upgrade_zf_components_zend_log
2 parents b6fb045 + cea5471 commit 2f9a0a9

File tree

5 files changed

+88
-68
lines changed

5 files changed

+88
-68
lines changed

‎dev/tests/api-functional/framework/bootstrap.php

+71-56
Original file line numberDiff line numberDiff line change
@@ -14,70 +14,85 @@
1414
$integrationTestsDir = realpath("{$testsBaseDir}/../integration");
1515
$fixtureBaseDir = $integrationTestsDir . '/testsuite';
1616

17-
setCustomErrorHandler();
17+
try {
18+
setCustomErrorHandler();
1819

19-
$logWriter = new \Zend_Log_Writer_Stream('php://output');
20-
$logWriter->setFormatter(new \Zend_Log_Formatter_Simple('%message%' . PHP_EOL));
21-
$logger = new \Zend_Log($logWriter);
20+
/* Bootstrap the application */
21+
$settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
2222

23-
$testFrameworkDir = __DIR__;
24-
require_once __DIR__ . '/../../integration/framework/deployTestModules.php';
23+
if ($settings->get('TESTS_EXTRA_VERBOSE_LOG')) {
24+
$filesystem = new \Magento\Framework\Filesystem\Driver\File();
25+
$exceptionHandler = new \Magento\Framework\Logger\Handler\Exception($filesystem);
26+
$loggerHandlers = [
27+
'system' => new \Magento\Framework\Logger\Handler\System($filesystem, $exceptionHandler),
28+
'debug' => new \Magento\Framework\Logger\Handler\Debug($filesystem)
29+
];
30+
$shell = new \Magento\Framework\Shell(
31+
new \Magento\Framework\Shell\CommandRenderer(),
32+
new \Monolog\Logger('main', $loggerHandlers)
33+
);
34+
} else {
35+
$shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer());
36+
}
2537

26-
/* Bootstrap the application */
27-
$settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
28-
$shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer(), $logger);
38+
$testFrameworkDir = __DIR__;
39+
require_once __DIR__ . '/../../integration/framework/deployTestModules.php';
2940

30-
$installConfigFile = $settings->getAsConfigFile('TESTS_INSTALL_CONFIG_FILE');
31-
if (!file_exists($installConfigFile)) {
32-
$installConfigFile = $installConfigFile . '.dist';
33-
}
34-
$globalConfigFile = $settings->getAsConfigFile('TESTS_GLOBAL_CONFIG_FILE');
35-
if (!file_exists($installConfigFile)) {
36-
$installConfigFile = $installConfigFile . '.dist';
37-
}
38-
$dirList = new \Magento\Framework\App\Filesystem\DirectoryList(BP);
39-
$application = new \Magento\TestFramework\WebApiApplication(
40-
$shell,
41-
$dirList->getPath(DirectoryList::VAR_DIR),
42-
$installConfigFile,
43-
$globalConfigFile,
44-
BP . '/app/etc/',
45-
$settings->get('TESTS_MAGENTO_MODE'),
46-
AutoloaderRegistry::getAutoloader()
47-
);
41+
$installConfigFile = $settings->getAsConfigFile('TESTS_INSTALL_CONFIG_FILE');
42+
if (!file_exists($installConfigFile)) {
43+
$installConfigFile = $installConfigFile . '.dist';
44+
}
45+
$globalConfigFile = $settings->getAsConfigFile('TESTS_GLOBAL_CONFIG_FILE');
46+
if (!file_exists($installConfigFile)) {
47+
$installConfigFile = $installConfigFile . '.dist';
48+
}
49+
$dirList = new \Magento\Framework\App\Filesystem\DirectoryList(BP);
50+
$application = new \Magento\TestFramework\WebApiApplication(
51+
$shell,
52+
$dirList->getPath(DirectoryList::VAR_DIR),
53+
$installConfigFile,
54+
$globalConfigFile,
55+
BP . '/app/etc/',
56+
$settings->get('TESTS_MAGENTO_MODE'),
57+
AutoloaderRegistry::getAutoloader()
58+
);
4859

49-
if (defined('TESTS_MAGENTO_INSTALLATION') && TESTS_MAGENTO_INSTALLATION === 'enabled') {
50-
if (defined('TESTS_CLEANUP') && TESTS_CLEANUP === 'enabled') {
51-
$application->cleanup();
60+
if (defined('TESTS_MAGENTO_INSTALLATION') && TESTS_MAGENTO_INSTALLATION === 'enabled') {
61+
if (defined('TESTS_CLEANUP') && TESTS_CLEANUP === 'enabled') {
62+
$application->cleanup();
63+
}
64+
$application->install();
5265
}
53-
$application->install();
54-
}
5566

56-
$bootstrap = new \Magento\TestFramework\Bootstrap(
57-
$settings,
58-
new \Magento\TestFramework\Bootstrap\Environment(),
59-
new \Magento\TestFramework\Bootstrap\WebapiDocBlock("{$integrationTestsDir}/testsuite"),
60-
new \Magento\TestFramework\Bootstrap\Profiler(new \Magento\Framework\Profiler\Driver\Standard()),
61-
$shell,
62-
$application,
63-
new \Magento\TestFramework\Bootstrap\MemoryFactory($shell)
64-
);
65-
$bootstrap->runBootstrap();
66-
$application->initialize();
67+
$bootstrap = new \Magento\TestFramework\Bootstrap(
68+
$settings,
69+
new \Magento\TestFramework\Bootstrap\Environment(),
70+
new \Magento\TestFramework\Bootstrap\WebapiDocBlock("{$integrationTestsDir}/testsuite"),
71+
new \Magento\TestFramework\Bootstrap\Profiler(new \Magento\Framework\Profiler\Driver\Standard()),
72+
$shell,
73+
$application,
74+
new \Magento\TestFramework\Bootstrap\MemoryFactory($shell)
75+
);
76+
$bootstrap->runBootstrap();
77+
$application->initialize();
6778

68-
\Magento\TestFramework\Helper\Bootstrap::setInstance(new \Magento\TestFramework\Helper\Bootstrap($bootstrap));
69-
$dirSearch = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
70-
->create(\Magento\Framework\Component\DirSearch::class);
71-
$themePackageList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
72-
->create(\Magento\Framework\View\Design\Theme\ThemePackageList::class);
73-
\Magento\Framework\App\Utility\Files::setInstance(
74-
new \Magento\Framework\App\Utility\Files(
75-
new \Magento\Framework\Component\ComponentRegistrar(),
76-
$dirSearch,
77-
$themePackageList
78-
)
79-
);
80-
unset($bootstrap, $application, $settings, $shell);
79+
\Magento\TestFramework\Helper\Bootstrap::setInstance(new \Magento\TestFramework\Helper\Bootstrap($bootstrap));
80+
$dirSearch = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
81+
->create(\Magento\Framework\Component\DirSearch::class);
82+
$themePackageList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
83+
->create(\Magento\Framework\View\Design\Theme\ThemePackageList::class);
84+
\Magento\Framework\App\Utility\Files::setInstance(
85+
new \Magento\Framework\App\Utility\Files(
86+
new \Magento\Framework\Component\ComponentRegistrar(),
87+
$dirSearch,
88+
$themePackageList
89+
)
90+
);
91+
unset($bootstrap, $application, $settings, $shell);
92+
} catch (\Exception $e) {
93+
echo $e . PHP_EOL;
94+
exit(1);
95+
}
8196

8297
/**
8398
* Set custom error handler

‎dev/tests/integration/framework/bootstrap.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@
2525
$settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
2626

2727
if ($settings->get('TESTS_EXTRA_VERBOSE_LOG')) {
28-
$logWriter = new \Zend_Log_Writer_Stream('php://output');
29-
$logWriter->setFormatter(new \Zend_Log_Formatter_Simple('%message%' . PHP_EOL));
28+
$filesystem = new \Magento\Framework\Filesystem\Driver\File();
29+
$exceptionHandler = new \Magento\Framework\Logger\Handler\Exception($filesystem);
30+
$loggerHandlers = [
31+
'system' => new \Magento\Framework\Logger\Handler\System($filesystem, $exceptionHandler),
32+
'debug' => new \Magento\Framework\Logger\Handler\Debug($filesystem)
33+
];
3034
$shell = new \Magento\Framework\Shell(
3135
new \Magento\Framework\Shell\CommandRenderer(),
32-
new \Zend_Log($logWriter)
36+
new \Monolog\Logger('main', $loggerHandlers)
3337
);
3438
} else {
3539
$shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer());

‎dev/tests/integration/phpunit.xml.dist

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@
6161
<!--<const name="TESTS_BAMBOO_PROFILER_FILE" value="profiler.csv"/>-->
6262
<!-- Metrics for Bamboo Profiler Output in PHP file that returns array -->
6363
<!--<const name="TESTS_BAMBOO_PROFILER_METRICS_FILE" value="../../build/profiler_metrics.php"/>-->
64+
<!-- Whether to output all CLI commands executed by the bootstrap and tests -->
65+
<const name="TESTS_EXTRA_VERBOSE_LOG" value="1"/>
6466
<!-- Magento mode for tests execution. Possible values are "default", "developer" and "production". -->
6567
<const name="TESTS_MAGENTO_MODE" value="developer"/>
6668
<!-- Minimum error log level to listen for. Possible values: -1 ignore all errors, and level constants form http://tools.ietf.org/html/rfc5424 standard -->

‎lib/internal/Magento/Framework/Shell.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Shell implements ShellInterface
1515
/**
1616
* Logger instance
1717
*
18-
* @var \Zend_Log
18+
* @var \Psr\Log\LoggerInterface
1919
*/
2020
protected $logger;
2121

@@ -26,11 +26,11 @@ class Shell implements ShellInterface
2626

2727
/**
2828
* @param CommandRendererInterface $commandRenderer
29-
* @param \Zend_Log $logger Logger instance to be used to log commands and their output
29+
* @param \Psr\Log\LoggerInterface $logger Logger instance to be used to log commands and their output
3030
*/
3131
public function __construct(
3232
CommandRendererInterface $commandRenderer,
33-
\Zend_Log $logger = null
33+
\Psr\Log\LoggerInterface $logger = null
3434
) {
3535
$this->logger = $logger;
3636
$this->commandRenderer = $commandRenderer;
@@ -76,7 +76,7 @@ public function execute($command, array $arguments = [])
7676
protected function log($message)
7777
{
7878
if ($this->logger) {
79-
$this->logger->log($message, \Zend_Log::INFO);
79+
$this->logger->info($message);
8080
}
8181
}
8282
}

‎lib/internal/Magento/Framework/Test/Unit/ShellTest.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ class ShellTest extends \PHPUnit_Framework_TestCase
1414
protected $commandRenderer;
1515

1616
/**
17-
* @var \Zend_Log|\PHPUnit_Framework_MockObject_MockObject
17+
* @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
1818
*/
1919
protected $logger;
2020

2121
protected function setUp()
2222
{
23-
$this->logger = $this->getMockBuilder(\Zend_Log::class)
24-
->setMethods(['log'])
23+
$this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
2524
->disableOriginalConstructor()
2625
->getMock();
2726
$this->commandRenderer = new \Magento\Framework\Shell\CommandRenderer();
@@ -73,8 +72,8 @@ public function testExecuteLog($command, $commandArgs, $expectedResult, $expecte
7372
foreach ($expectedLogRecords as $logRecordIndex => $expectedLogMessage) {
7473
$expectedLogMessage = str_replace('`', $quoteChar, $expectedLogMessage);
7574
$this->logger->expects($this->at($logRecordIndex))
76-
->method('log')
77-
->with($expectedLogMessage, \Zend_Log::INFO);
75+
->method('info')
76+
->with($expectedLogMessage);
7877
}
7978
$this->_testExecuteCommand(
8079
new \Magento\Framework\Shell($this->commandRenderer, $this->logger),

0 commit comments

Comments
 (0)