Skip to content

Commit a31dbfc

Browse files
committed
MQE-2429: [GitHub Issue # 810] MFTF 2.x incompatibility with PHP XDebug 3
CHANGELOG.md and composer.json updates for 2.6.6
1 parent 3343a82 commit a31dbfc

File tree

5 files changed

+95
-5
lines changed

5 files changed

+95
-5
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "2.6.5",
5+
"version": "2.6.6",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {

composer.lock

Lines changed: 87 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/functional/standalone_bootstrap.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,7 @@
7272
// add the debug flag here
7373
$debug_mode = $_ENV['MFTF_DEBUG'] ?? false;
7474
if (!(bool)$debug_mode && extension_loaded('xdebug')) {
75-
xdebug_disable();
75+
if (function_exists('xdebug_disable')) {
76+
xdebug_disable();
77+
}
7678
}

src/Magento/FunctionalTestingFramework/Config/MftfApplicationConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public function verboseEnabled()
194194
*/
195195
public function getDebugLevel()
196196
{
197-
return $this->debugLevel ?? getenv('MFTF_DEBUG');
197+
return $this->debugLevel;
198198
}
199199

200200
/**

src/Magento/FunctionalTestingFramework/_bootstrap.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,7 @@
7575
// add the debug flag here
7676
$debugMode = $_ENV['MFTF_DEBUG'] ?? false;
7777
if (!(bool)$debugMode && extension_loaded('xdebug')) {
78-
xdebug_disable();
78+
if (function_exists('xdebug_disable')) {
79+
xdebug_disable();
80+
}
7981
}

0 commit comments

Comments
 (0)