Skip to content

Commit 40ed4ec

Browse files
committed
AC-1723: Revert changes added for temporary ignoring Deprecations in PHP 8.1
- rollback E_DEPRECATE exclude - update composer dependencies
1 parent 3add321 commit 40ed4ec

File tree

10 files changed

+37
-48
lines changed

10 files changed

+37
-48
lines changed

app/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* Environment initialization
99
*/
10-
error_reporting(E_ALL & ~E_DEPRECATED);
10+
error_reporting(E_ALL);
1111
if (in_array('phar', \stream_get_wrappers())) {
1212
stream_wrapper_unregister('phar');
1313
}

app/code/Magento/Backend/Model/Menu/Filter/Iterator.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@
1212
*/
1313
class Iterator extends \FilterIterator
1414
{
15-
/**
16-
* Constructor
17-
*
18-
* @param \Iterator $iterator
19-
*/
20-
public function __construct(\Iterator $iterator) // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
21-
{
22-
parent::__construct($iterator);
23-
}
24-
2515
/**
2616
* Check whether the current element of the iterator is acceptable
2717
*

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"friendsofphp/php-cs-fixer": "~3.3.0",
8787
"lusitanian/oauth": "~0.8.10",
8888
"magento/magento-coding-standard": "*",
89-
"magento/magento2-functional-testing-framework": "dev-develop",
89+
"magento/magento2-functional-testing-framework": "^3.7",
9090
"pdepend/pdepend": "~2.10.0",
9191
"phpmd/phpmd": "^2.9.1",
9292
"phpstan/phpstan": "~1.2.0",

composer.lock

Lines changed: 28 additions & 30 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
require_once __DIR__ . '/../../../../app/bootstrap.php';
1111
require_once __DIR__ . '/autoload.php';
1212

13-
error_reporting(E_ALL & ~E_DEPRECATED);
13+
error_reporting(E_ALL);
1414
$testsBaseDir = dirname(__DIR__);
1515
$integrationTestsDir = realpath("{$testsBaseDir}/../integration");
1616
$fixtureBaseDir = $integrationTestsDir . '/testsuite';

dev/tests/integration/framework/bootstrap.php

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

16-
error_reporting(E_ALL & ~E_DEPRECATED);
16+
error_reporting(E_ALL);
1717
// phpcs:ignore Magento2.Functions.DiscouragedFunction
1818
$testsBaseDir = dirname(__DIR__);
1919
$fixtureBaseDir = $testsBaseDir. '/testsuite';

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

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

15-
error_reporting(E_ALL & ~E_DEPRECATED);
15+
error_reporting(E_ALL);
1616
$testsBaseDir = dirname(__DIR__);
1717
$integrationTestsDir = realpath("{$testsBaseDir}/../integration");
1818
$fixtureBaseDir = $integrationTestsDir . '/testsuite';

dev/tests/static/framework/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Magento\Framework\View\Design\Theme\ThemePackageFactory;
1616

1717
require __DIR__ . '/autoload.php';
18-
error_reporting(E_ALL & ~E_DEPRECATED);
18+
error_reporting(E_ALL);
1919
if (!defined('TESTS_TEMP_DIR')) {
2020
define('TESTS_TEMP_DIR', dirname(__DIR__) . '/tmp');
2121
}

dev/tests/unit/framework/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
\Magento\Framework\Phrase::setRenderer(new \Magento\Framework\Phrase\Renderer\Placeholder());
2828

29-
error_reporting(E_ALL & ~E_DEPRECATED);
29+
error_reporting(E_ALL);
3030
ini_set('display_errors', 1);
3131

3232
/* For data consistency between displaying (printing) and serialization a float number */

lib/internal/Magento/Framework/App/RouterList.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
*/
66
namespace Magento\Framework\App;
77

8-
/** * Used as a container for list of routers.
8+
/**
9+
* Used as a container for list of routers.
910
*/
1011
class RouterList implements RouterListInterface
1112
{

0 commit comments

Comments
 (0)