From 40ed4ec11d511b3c5f3e0594c6dbdc05f84c1c5c Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Thu, 9 Dec 2021 19:14:52 -0600 Subject: [PATCH] AC-1723: Revert changes added for temporary ignoring Deprecations in PHP 8.1 - rollback E_DEPRECATE exclude - update composer dependencies --- app/bootstrap.php | 2 +- .../Backend/Model/Menu/Filter/Iterator.php | 10 ---- composer.json | 2 +- composer.lock | 58 +++++++++---------- .../api-functional/framework/bootstrap.php | 2 +- dev/tests/integration/framework/bootstrap.php | 2 +- .../setup-integration/framework/bootstrap.php | 2 +- dev/tests/static/framework/bootstrap.php | 2 +- dev/tests/unit/framework/bootstrap.php | 2 +- .../Magento/Framework/App/RouterList.php | 3 +- 10 files changed, 37 insertions(+), 48 deletions(-) diff --git a/app/bootstrap.php b/app/bootstrap.php index 0dd2b7937d847..87ab01fe7dfb2 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -7,7 +7,7 @@ /** * Environment initialization */ -error_reporting(E_ALL & ~E_DEPRECATED); +error_reporting(E_ALL); if (in_array('phar', \stream_get_wrappers())) { stream_wrapper_unregister('phar'); } diff --git a/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php b/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php index 1655c89e5c299..6bff574af988d 100644 --- a/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php +++ b/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php @@ -12,16 +12,6 @@ */ class Iterator extends \FilterIterator { - /** - * Constructor - * - * @param \Iterator $iterator - */ - public function __construct(\Iterator $iterator) // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod - { - parent::__construct($iterator); - } - /** * Check whether the current element of the iterator is acceptable * diff --git a/composer.json b/composer.json index 3da4d003edb9c..29ac110e5c4ac 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,7 @@ "friendsofphp/php-cs-fixer": "~3.3.0", "lusitanian/oauth": "~0.8.10", "magento/magento-coding-standard": "*", - "magento/magento2-functional-testing-framework": "dev-develop", + "magento/magento2-functional-testing-framework": "^3.7", "pdepend/pdepend": "~2.10.0", "phpmd/phpmd": "^2.9.1", "phpstan/phpstan": "~1.2.0", diff --git a/composer.lock b/composer.lock index 28960e584b848..dc29171691e27 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a1faca3c1fbd49c6d9e4562f61e4ba6e", + "content-hash": "39a04e9b9116570e38fce5063c0a222c", "packages": [ { "name": "aws/aws-crt-php", @@ -58,16 +58,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.208.3", + "version": "3.208.4", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "c9ccf6705fe41e53f23dac7e0573e3f79d70bcde" + "reference": "46376c60570103b55d9440142356995bd6d37c39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c9ccf6705fe41e53f23dac7e0573e3f79d70bcde", - "reference": "c9ccf6705fe41e53f23dac7e0573e3f79d70bcde", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/46376c60570103b55d9440142356995bd6d37c39", + "reference": "46376c60570103b55d9440142356995bd6d37c39", "shasum": "" }, "require": { @@ -143,9 +143,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.208.3" + "source": "https://github.com/aws/aws-sdk-php/tree/3.208.4" }, - "time": "2021-12-08T19:30:07+00:00" + "time": "2021-12-09T19:19:02+00:00" }, { "name": "brick/math", @@ -1170,24 +1170,24 @@ }, { "name": "fgrosse/phpasn1", - "version": "v2.3.0", + "version": "v2.3.1", "source": { "type": "git", "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e" + "reference": "6edcecb4df8b6881e79080d5e363dc8b90d4558c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/20299033c35f4300eb656e7e8e88cf52d1d6694e", - "reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e", + "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/6edcecb4df8b6881e79080d5e363dc8b90d4558c", + "reference": "6edcecb4df8b6881e79080d5e363dc8b90d4558c", "shasum": "" }, "require": { "php": ">=7.0.0" }, "require-dev": { - "phpunit/phpunit": "~6.3", - "satooshi/php-coveralls": "~2.0" + "php-coveralls/php-coveralls": "~2.0", + "phpunit/phpunit": "^6.3 | ^7.0" }, "suggest": { "ext-bcmath": "BCmath is the fallback extension for big integer calculations", @@ -1239,9 +1239,9 @@ ], "support": { "issues": "https://github.com/fgrosse/PHPASN1/issues", - "source": "https://github.com/fgrosse/PHPASN1/tree/v2.3.0" + "source": "https://github.com/fgrosse/PHPASN1/tree/v2.3.1" }, - "time": "2021-04-24T19:01:55+00:00" + "time": "2021-12-09T20:59:31+00:00" }, { "name": "guzzlehttp/guzzle", @@ -9403,16 +9403,16 @@ }, { "name": "magento/magento2-functional-testing-framework", - "version": "dev-develop", + "version": "3.7.2", "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "929296d5924ec10feb41bd484c54ee54dfb17327" + "reference": "4488b6290bf6870be20c6823203c14a2e3b37cfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/929296d5924ec10feb41bd484c54ee54dfb17327", - "reference": "929296d5924ec10feb41bd484c54ee54dfb17327", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/4488b6290bf6870be20c6823203c14a2e3b37cfa", + "reference": "4488b6290bf6870be20c6823203c14a2e3b37cfa", "shasum": "" }, "require": { @@ -9456,7 +9456,6 @@ "suggest": { "hoa/console": "Enables action and interactive console functionality" }, - "default-branch": true, "bin": [ "bin/mftf" ], @@ -9488,9 +9487,9 @@ ], "support": { "issues": "https://github.com/magento/magento2-functional-testing-framework/issues", - "source": "https://github.com/magento/magento2-functional-testing-framework/tree/develop" + "source": "https://github.com/magento/magento2-functional-testing-framework/tree/3.7.2" }, - "time": "2021-12-07T21:38:14+00:00" + "time": "2021-12-07T21:41:48+00:00" }, { "name": "mustache/mustache", @@ -10842,16 +10841,16 @@ }, { "name": "rector/rector", - "version": "0.12.5", + "version": "0.12.7", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "e50e40e0fe73b88a46f27e086441e1998ceeca3c" + "reference": "d88fbe1bcde87e11cbdfa1bf2f51c990f33f426d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/e50e40e0fe73b88a46f27e086441e1998ceeca3c", - "reference": "e50e40e0fe73b88a46f27e086441e1998ceeca3c", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/d88fbe1bcde87e11cbdfa1bf2f51c990f33f426d", + "reference": "d88fbe1bcde87e11cbdfa1bf2f51c990f33f426d", "shasum": "" }, "require": { @@ -10890,7 +10889,7 @@ "description": "Prefixed and PHP 7.1 downgraded version of rector/rector", "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.12.5" + "source": "https://github.com/rectorphp/rector/tree/0.12.7" }, "funding": [ { @@ -10898,7 +10897,7 @@ "type": "github" } ], - "time": "2021-11-23T17:38:29+00:00" + "time": "2021-12-09T20:25:42+00:00" }, { "name": "sebastian/cli-parser", @@ -12772,8 +12771,7 @@ "minimum-stability": "stable", "stability-flags": { "magento/composer": 20, - "magento/zendframework1": 20, - "magento/magento2-functional-testing-framework": 20 + "magento/zendframework1": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/dev/tests/api-functional/framework/bootstrap.php b/dev/tests/api-functional/framework/bootstrap.php index 3748cfdb2ce0e..d36faa422e21d 100644 --- a/dev/tests/api-functional/framework/bootstrap.php +++ b/dev/tests/api-functional/framework/bootstrap.php @@ -10,7 +10,7 @@ require_once __DIR__ . '/../../../../app/bootstrap.php'; require_once __DIR__ . '/autoload.php'; -error_reporting(E_ALL & ~E_DEPRECATED); +error_reporting(E_ALL); $testsBaseDir = dirname(__DIR__); $integrationTestsDir = realpath("{$testsBaseDir}/../integration"); $fixtureBaseDir = $integrationTestsDir . '/testsuite'; diff --git a/dev/tests/integration/framework/bootstrap.php b/dev/tests/integration/framework/bootstrap.php index d36fa117492c3..2275729d3d9a2 100644 --- a/dev/tests/integration/framework/bootstrap.php +++ b/dev/tests/integration/framework/bootstrap.php @@ -13,7 +13,7 @@ require_once __DIR__ . '/../../../../app/bootstrap.php'; require_once __DIR__ . '/autoload.php'; -error_reporting(E_ALL & ~E_DEPRECATED); +error_reporting(E_ALL); // phpcs:ignore Magento2.Functions.DiscouragedFunction $testsBaseDir = dirname(__DIR__); $fixtureBaseDir = $testsBaseDir. '/testsuite'; diff --git a/dev/tests/setup-integration/framework/bootstrap.php b/dev/tests/setup-integration/framework/bootstrap.php index 12e1b5c40325c..580e7302431e0 100644 --- a/dev/tests/setup-integration/framework/bootstrap.php +++ b/dev/tests/setup-integration/framework/bootstrap.php @@ -12,7 +12,7 @@ //to handle different types of errors on CI require __DIR__ . '/../../error_handler.php'; -error_reporting(E_ALL & ~E_DEPRECATED); +error_reporting(E_ALL); $testsBaseDir = dirname(__DIR__); $integrationTestsDir = realpath("{$testsBaseDir}/../integration"); $fixtureBaseDir = $integrationTestsDir . '/testsuite'; diff --git a/dev/tests/static/framework/bootstrap.php b/dev/tests/static/framework/bootstrap.php index 173a6644706a8..41ba2880383f7 100644 --- a/dev/tests/static/framework/bootstrap.php +++ b/dev/tests/static/framework/bootstrap.php @@ -15,7 +15,7 @@ use Magento\Framework\View\Design\Theme\ThemePackageFactory; require __DIR__ . '/autoload.php'; -error_reporting(E_ALL & ~E_DEPRECATED); +error_reporting(E_ALL); if (!defined('TESTS_TEMP_DIR')) { define('TESTS_TEMP_DIR', dirname(__DIR__) . '/tmp'); } diff --git a/dev/tests/unit/framework/bootstrap.php b/dev/tests/unit/framework/bootstrap.php index 5334ce7cc88ae..ca2c32eef6874 100644 --- a/dev/tests/unit/framework/bootstrap.php +++ b/dev/tests/unit/framework/bootstrap.php @@ -26,7 +26,7 @@ \Magento\Framework\Phrase::setRenderer(new \Magento\Framework\Phrase\Renderer\Placeholder()); -error_reporting(E_ALL & ~E_DEPRECATED); +error_reporting(E_ALL); ini_set('display_errors', 1); /* For data consistency between displaying (printing) and serialization a float number */ diff --git a/lib/internal/Magento/Framework/App/RouterList.php b/lib/internal/Magento/Framework/App/RouterList.php index ec8da3864fef9..47089fe29754a 100644 --- a/lib/internal/Magento/Framework/App/RouterList.php +++ b/lib/internal/Magento/Framework/App/RouterList.php @@ -5,7 +5,8 @@ */ namespace Magento\Framework\App; -/** * Used as a container for list of routers. +/** + * Used as a container for list of routers. */ class RouterList implements RouterListInterface {