Merge branch 'sw-26772/resolve-deprecations' into '5.7'

SW-26772 - Revert "SW-26770 - Suppress deprecation warnings in installer/updater"

See merge request shopware/5/product/shopware!844

Author: mitelg

recovery/common/src/DumpIterator.php

@@ -102,6 +102,7 @@ public function seek($position)
     /**
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->count;
@@ -115,6 +116,7 @@ public function rewind()
         $this->position = 0;
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
@@ -123,6 +125,7 @@ public function current()
     /**
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
@@ -139,6 +142,7 @@ public function next()
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return !feof($this->stream);

recovery/install/check.php

@@ -22,7 +22,7 @@
  * our trademarks remain entirely with us.
  */
 
-error_reporting(E_ALL ^ E_DEPRECATED);
+error_reporting(-1);
 ini_set('display_errors', true);
 
 $tokenFile = __DIR__ . '/tmp/token';

recovery/install/index.php

@@ -42,7 +42,7 @@
 
 require_once __DIR__ . '/../common/autoload.php';
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED);
+error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
 ini_set('display_errors', 1);
 date_default_timezone_set('UTC');
 set_time_limit(0);

recovery/update/index.php

@@ -28,9 +28,9 @@
 $isManual = is_dir(SW_PATH . '/update-assets');
 if ($isManual) {
     \define('UPDATE_IS_MANUAL', true);
-    \define('UPDATE_FILES_PATH', null);
+    \define('UPDATE_FILES_PATH', '');
     \define('UPDATE_ASSET_PATH', SW_PATH . '/update-assets');
-    \define('UPDATE_META_FILE', null);
+    \define('UPDATE_META_FILE', '');
 } else {
     \define('UPDATE_IS_MANUAL', false);
     \define('UPDATE_FILES_PATH', SW_PATH . '/files/update/files');
@@ -41,9 +41,8 @@
 use Shopware\Recovery\Update\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED);
-
 if (PHP_SAPI === 'cli') {
+    error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
     ini_set('display_errors', 1);
 
     $input = new ArgvInput();

recovery/update/src/Console/Application.php

@@ -108,11 +108,11 @@ private function registerErrorHandler()
     {
         set_error_handler(function ($errno, $errstr, $errfile, $errline) {
             // error was suppressed with the @-operator
-            if (error_reporting() === 0) {
+            if (error_reporting() === 0 || $errno === E_USER_DEPRECATED) {
                 return false;
             }
 
             throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-        }, E_ALL ^ E_DEPRECATED ^ E_USER_DEPRECATED);
+        });
     }
 }

recovery/update/src/app.php

@@ -33,7 +33,7 @@
 
 date_default_timezone_set('Europe/Berlin');
 ini_set('display_errors', 1);
-error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED);
+error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
 
 $config = require __DIR__ . '/../config/config.php';
 $container = new Container(new PimpleContainer(), $config);