Skip to content

Commit 1316744

Browse files
committed
Merge branch '2.4-develop' of https://github.com/magento/magento2ce into PR-2022-02-15-CE2
2 parents 2a71d91 + 03c75d8 commit 1316744

File tree

4 files changed

+44
-38
lines changed

4 files changed

+44
-38
lines changed

composer.lock

Lines changed: 41 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
require_once __DIR__ . '/../../../../app/bootstrap.php';
1111
require_once __DIR__ . '/autoload.php';
1212

13+
error_reporting(E_ALL);
1314
$testsBaseDir = dirname(__DIR__);
1415
$integrationTestsDir = realpath("{$testsBaseDir}/../integration");
1516
$fixtureBaseDir = $integrationTestsDir . '/testsuite';

dev/tests/integration/framework/bootstrap.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
require_once __DIR__ . '/../../../../app/bootstrap.php';
1414
require_once __DIR__ . '/autoload.php';
1515

16+
error_reporting(E_ALL);
1617
// phpcs:ignore Magento2.Functions.DiscouragedFunction
1718
$testsBaseDir = dirname(__DIR__);
1819
$fixtureBaseDir = $testsBaseDir. '/testsuite';

dev/tests/setup-integration/framework/bootstrap.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//to handle different types of errors on CI
1313
require __DIR__ . '/../../error_handler.php';
1414

15+
error_reporting(E_ALL);
1516
$testsBaseDir = dirname(__DIR__);
1617
$integrationTestsDir = realpath("{$testsBaseDir}/../integration");
1718
$fixtureBaseDir = $integrationTestsDir . '/testsuite';

0 commit comments

Comments
 (0)