AC-1723: Revert changes added for temporary ignoring Deprecations in …

…PHP 8.1 - rollback E_DEPRECATE exclude - update composer dependencies
Knase · Dec 10, 2021 · 40ed4ec · 40ed4ec
1 parent 3add321
commit 40ed4ec
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 48 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 {