Skip to content

Commit 255da62

Browse files
tdgroottdgroot
committed
Replace Zend_Log with Monolog\Logger in dev/tests bootstrap files
1 parent da7b598 commit 255da62

File tree

3 files changed

+78
-59
lines changed

3 files changed

+78
-59
lines changed

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

+70-56
Original file line numberDiff line numberDiff line change
@@ -14,70 +14,84 @@
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+
$loggerHandlers = [
26+
'system' => new \Magento\Framework\Logger\Handler\System($filesystem),
27+
'debug' => new \Magento\Framework\Logger\Handler\Debug($filesystem)
28+
];
29+
$shell = new \Magento\Framework\Shell(
30+
new \Magento\Framework\Shell\CommandRenderer(),
31+
new \Monolog\Logger('main', $loggerHandlers)
32+
);
33+
} else {
34+
$shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer());
35+
}
2536

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);
37+
$testFrameworkDir = __DIR__;
38+
require_once __DIR__ . '/../../integration/framework/deployTestModules.php';
2939

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-
);
40+
$installConfigFile = $settings->getAsConfigFile('TESTS_INSTALL_CONFIG_FILE');
41+
if ( ! file_exists($installConfigFile)) {
42+
$installConfigFile = $installConfigFile . '.dist';
43+
}
44+
$globalConfigFile = $settings->getAsConfigFile('TESTS_GLOBAL_CONFIG_FILE');
45+
if ( ! file_exists($installConfigFile)) {
46+
$installConfigFile = $installConfigFile . '.dist';
47+
}
48+
$dirList = new \Magento\Framework\App\Filesystem\DirectoryList(BP);
49+
$application = new \Magento\TestFramework\WebApiApplication(
50+
$shell,
51+
$dirList->getPath(DirectoryList::VAR_DIR),
52+
$installConfigFile,
53+
$globalConfigFile,
54+
BP . '/app/etc/',
55+
$settings->get('TESTS_MAGENTO_MODE'),
56+
AutoloaderRegistry::getAutoloader()
57+
);
4858

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

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();
66+
$bootstrap = new \Magento\TestFramework\Bootstrap(
67+
$settings,
68+
new \Magento\TestFramework\Bootstrap\Environment(),
69+
new \Magento\TestFramework\Bootstrap\WebapiDocBlock("{$integrationTestsDir}/testsuite"),
70+
new \Magento\TestFramework\Bootstrap\Profiler(new \Magento\Framework\Profiler\Driver\Standard()),
71+
$shell,
72+
$application,
73+
new \Magento\TestFramework\Bootstrap\MemoryFactory($shell)
74+
);
75+
$bootstrap->runBootstrap();
76+
$application->initialize();
6777

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);
78+
\Magento\TestFramework\Helper\Bootstrap::setInstance(new \Magento\TestFramework\Helper\Bootstrap($bootstrap));
79+
$dirSearch = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
80+
->create(\Magento\Framework\Component\DirSearch::class);
81+
$themePackageList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
82+
->create(\Magento\Framework\View\Design\Theme\ThemePackageList::class);
83+
\Magento\Framework\App\Utility\Files::setInstance(
84+
new \Magento\Framework\App\Utility\Files(
85+
new \Magento\Framework\Component\ComponentRegistrar(),
86+
$dirSearch,
87+
$themePackageList
88+
)
89+
);
90+
unset($bootstrap, $application, $settings, $shell);
91+
} catch (\Exception $e) {
92+
echo $e . PHP_EOL;
93+
exit(1);
94+
}
8195

8296
/**
8397
* Set custom error handler

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@
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+
$loggerHandlers = [
30+
'system' => new \Magento\Framework\Logger\Handler\System($filesystem),
31+
'debug' => new \Magento\Framework\Logger\Handler\Debug($filesystem)
32+
];
3033
$shell = new \Magento\Framework\Shell(
3134
new \Magento\Framework\Shell\CommandRenderer(),
32-
new \Zend_Log($logWriter)
35+
new \Monolog\Logger('main', $loggerHandlers)
3336
);
3437
} else {
3538
$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 -->

0 commit comments

Comments
 (0)